knitkit 3.0.0 → 3.2.0

data/app/models/website_section.rb

@@ -2,10 +2,11 @@ class WebsiteSection < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   after_create :update_paths # must happen after has_roles so that after_create :save_secured_model fires first
-  before_save  :update_path, :check_internal_identifier
+  before_save :update_path, :check_internal_identifier
 
   extend FriendlyId
   friendly_id :title, :use => [:slugged, :scoped], :slug_column => :permalink, :scope => [:website_id, :parent_id]
+
   def should_generate_new_friendly_id?
     new_record?
   end
@@ -38,6 +39,35 @@ class WebsiteSection < ActiveRecord::Base
     end
   end
 
+  def copy(title=nil, copy_articles=false, copy_children=false)
+    new_section = WebsiteSection.new
+
+    new_section.title = title.nil? ? self.title : title
+    new_section.layout = self.layout
+    new_section.in_menu = self.in_menu
+    new_section.render_base_layout = self.render_base_layout
+    new_section.website_id = self.website_id
+
+    new_section.save!
+
+    # copy attached articles
+    if copy_articles
+      self.articles.readonly(false).each do |article|
+        article.website_sections << new_section
+        article.save
+      end
+    end
+
+    if copy_children
+      self.children.each do |child_section|
+        new_child_section = child_section.copy(nil, copy_articles, copy_children)
+        new_child_section.move_to_child_of(new_section)
+      end
+    end
+
+    new_section
+  end
+
   def is_blog?
     self.is_a?(Blog) || self.attributes['type'] == 'Blog'
   end
@@ -68,7 +98,11 @@ class WebsiteSection < ActiveRecord::Base
   end
 
   def positioned_children
-    children.sort_by{|child| [child.position]}
+    children.order('position')
+  end
+
+  def children_in_menu
+    positioned_children.where('in_menu = ?', true)
   end
 
   def paths
@@ -77,13 +111,13 @@ class WebsiteSection < ActiveRecord::Base
   end
 
   def child_by_path(path)
-    self.descendants.detect{|child| child.path == path}
+    self.descendants.detect { |child| child.path == path }
   end
 
   def type
     read_attribute(:type) || 'Page'
   end
-  
+
   def is_section?
     ['Page', 'Blog'].include? type
   end
@@ -91,7 +125,7 @@ class WebsiteSection < ActiveRecord::Base
   def display_in_menu?
     self.in_menu
   end
-  
+
   def is_secured?
     self.protected_with_capability?('view')
   end
@@ -101,17 +135,17 @@ class WebsiteSection < ActiveRecord::Base
   end
 
   def create_layout
-    self.layout = IO.read(File.join(WEBSITE_SECTIONS_TEMP_LAYOUT_PATH,"index.html.erb"))
+    self.layout = IO.read(File.join(WEBSITE_SECTIONS_TEMP_LAYOUT_PATH, "index.html.erb"))
     self.save
   end
 
   def get_published_layout(active_publication)
+    layout_content = nil
+
     published_website_id = active_publication.id
     published_element = PublishedElement.includes([:published_website]).where('published_websites.id = ? and published_element_record_id = ? and published_element_record_type = ?', published_website_id, self.id, 'WebsiteSection').first
     unless published_element.nil?
       layout_content = WebsiteSection::Version.where('version = ? and website_section_id = ?', published_element.version, published_element.published_element_record_id).first.layout
-    else
-      layout_content = IO.read(File.join(WEBSITE_SECTIONS_TEMP_LAYOUT_PATH,"index.html.erb"))
     end
     layout_content
   end
@@ -133,7 +167,7 @@ class WebsiteSection < ActiveRecord::Base
     #               ORDER BY tags.name ASC"
     # ActsAsTaggableOn::Tag.find_by_sql(sql)
 
-    self.contents.tag_counts_on(:tags).sort_by{|t| t.name }
+    self.contents.tag_counts_on(:tags).sort_by { |t| t.name }
   end
 
   def update_path!
@@ -141,39 +175,39 @@ class WebsiteSection < ActiveRecord::Base
     self.path = new_path unless self.path == new_path
     self.save
   end
-  
+
   def build_section_hash
     section_hash = {
-      :name => self.title,
-      :has_layout => !self.layout.blank?,
-      :type => self.class.to_s,
-      :in_menu => self.in_menu,
-      :articles => [],
-      :roles => self.roles.collect(&:internal_identifier),
-      :path => self.path,
-      :permalink => self.permalink,
-      :internal_identifier => self.internal_identifier,
-      :render_base_layout => self.render_base_layout,
-      :position => self.position,
-      :sections => self.children.each.map{|child| child.build_section_hash}
+        :name => self.title,
+        :has_layout => !self.layout.blank?,
+        :type => self.class.to_s,
+        :in_menu => self.in_menu,
+        :articles => [],
+        :roles => self.roles.collect(&:internal_identifier),
+        :path => self.path,
+        :permalink => self.permalink,
+        :internal_identifier => self.internal_identifier,
+        :render_base_layout => self.render_base_layout,
+        :position => self.position,
+        :sections => self.children.each.map { |child| child.build_section_hash }
     }
 
     self.contents.each do |content|
       content_area = content.content_area_by_website_section(self)
       position = content.position_by_website_section(self)
       section_hash[:articles] << {
-        :name => content.title,
-        :tag_list => content.tag_list.join(', '),
-        :content_area => content_area,
-        :position => position,
-        :display_title => content.display_title,
-        :internal_identifier => content.internal_identifier
+          :name => content.title,
+          :tag_list => content.tag_list.join(', '),
+          :content_area => content_area,
+          :position => position,
+          :display_title => content.display_title,
+          :internal_identifier => content.internal_identifier
       }
     end
 
     section_hash
   end
-  
+
 
   protected
 
@@ -198,7 +232,7 @@ class WebsiteSection < ActiveRecord::Base
   def check_internal_identifier
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
-  
+
   private
 
   def self.get_published_version(active_publication, content)

data/app/views/knitkit/blogs/show.html.erb

@@ -1,6 +1,11 @@
+
 <div class="container">
+
+
   <div class="page-header">
 
+    <%= link_to "Back", @blog.path %>
+
     <h1><%= @blog.title %></h1>
 
     <h3><%= @published_content.title %></h3>
@@ -18,8 +23,6 @@
   <br/>
   <%= blog_recent_approved_comments %>
 
-  <p class="text-center"><%= link_to "Home", @blog.path %></p>
-
   <br/>
 </div>
 <hr/>

data/app/views/layouts/knitkit/base.html.erb

@@ -9,26 +9,22 @@
 
   <%= javascript_include_tag :application %>
 
-  <!-- bootstrap -->
-  <%= static_javascript_include_tag 'knitkit/bootstrap.min.js' %>
-  <%= static_javascript_include_tag 'knitkit/theme.js' %>
-  <%= static_javascript_include_tag 'knitkit/bootstrap-datepicker.js' %>
-  <%= static_javascript_include_tag 'knitkit/confirm-bootstrap.js' %>
-
-  <%= static_stylesheet_link_tag 'knitkit/bootstrap.min.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/bootstrap-responsive.min.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/datepicker.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/custom.css' %>
-  <!-- end bootstrap -->
-
-  <%= static_javascript_include_tag 'erp_app/utility.js' %>
-  <%= static_javascript_include_tag 'erp_app/jquery_support.js' %>
-  <%= static_javascript_include_tag 'erp_app/widgets.js' %>
-  <%= static_javascript_include_tag 'knitkit/inline_editing.js' %>
-  <%= static_javascript_include_tag 'knitkit/jquery.maskedinput.min.js' %>
+  <%= javascript_include_tag 'erp_app/utility' %>
+  <%= javascript_include_tag 'erp_app/jquery_support' %>
+  <%= javascript_include_tag 'erp_app/widgets' %>
 
+  <!-- Knitkit Helpers -->
+  <%= javascript_include_tag 'knitkit-web' %>
+  <%= stylesheet_link_tag 'knitkit-web' %>
+  <!-- end -->
+
+  <!-- Bootstrap theme helpers -->
+  <%= javascript_include_tag 'knitkit/theme' %>
+  <%= stylesheet_link_tag 'knitkit/custom' %>
+  <!-- end -->
+
+  <!-- code mirror -->
   <%= include_code_mirror_library %>
-  <%= static_stylesheet_link_tag 'knitkit/inline_editing.css' %>
 
   <%= setup_js_authentication %>
 
@@ -36,48 +32,55 @@
 </head>
 <body>
 
-<div id="wrap">
+  <div id="wrap">
 
-  <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="navbar-header pull-left">
-      <a class="navbar-brand" href="/home"><img src="/images/knitkit/logo.png" alt="Logo"/></a>
-    </div>
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="navbar-header pull-left">
+        <a class="navbar-brand" href="/home"><img src="/assets/knitkit/logo.png" alt="Logo"/></a>
+      </div>
 
-    <div class="navbar-header pull-right">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
+      <div class="navbar-header pull-right">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+      </div>
+
+      <%= render_widget :search,
+      :action => :index,
+      :params => {:redirect_results => true, :results_permalink => '/search-results'} %>
 
-    <%= render_widget :login,
-                      :action => :login_header,
-                      :params => {:login_url => '/login', :signup_url => '/sign-up'} %>
 
-    <div class="container">
-      <div class="navbar-collapse collapse">
-        <ul class="nav navbar-nav">
-          <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
-        </ul>
+      <%= render_widget :login,
+      :action => :login_header,
+      :params => {:login_url => '/login', :signup_url => '/sign-up'} %>
+
+      <div class="container-fluid">
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
+          </ul>
+        </div>
       </div>
-    </div>
-  </nav>
 
-  <!-- Wrap all page content here -->
+    </nav>
+
+    <div class="content-area">
+      <%= content_for?(:sub_menu) ? yield(:sub_menu) : render_sub_menu(@contents) %>  
+
+      <%= yield %>
+    </div>
 
-  <div class="content-area">
-    <%= yield %>
   </div>
 
-</div>
+  <div class="footer">
+    <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
+    <%= yield :foot %>
+  </div>
+  <%= set_authenticity_token %>
+  <%= set_session_timeout %>
+  <%= setup_inline_editing %>
 
-<div class="footer">
-  <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
-  <%= yield :foot %>
-</div>
-<%= set_authenticity_token %>
-<%= set_session_timeout %>
-<%= setup_inline_editing %>
 </body>
 </html>

data/app/views/menus/knitkit/_default_menu.html.erb

@@ -1,18 +1,18 @@
 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
   <ul class="nav navbar-nav">
-   <% selected_menu_item = nil
+   <%- selected_menu_item = nil
       menu_items.each do |menu_item| 
         if menu_item.allow_access?(current_user, :view)
-        if menu_item_selected(menu_item)
-          selected_menu_item = menu_item %>
-        <li class="selected">
-        <% else %>
-        <li>
-        <% end %>
-        <a href="<%= menu_item.path %>"><%= menu_item.title %></a>
-      </li>
-    <% end %>
-  <% end %>
+          if menu_item_selected(menu_item)
+            selected_menu_item = menu_item %>
+              <li class="active">
+      <%- else %>
+              <li>
+      <%- end %>
+                <a href="<%= menu_item.path %>"><%= menu_item.title %></a>
+              </li>
+    <%- end %>
+  <%- end %>
   </ul>
 </div>
 

data/app/views/menus/knitkit/_default_section_menu.html.erb

@@ -7,7 +7,7 @@
         <% @website_sections.each do |section|
           if section.display_in_menu?
             if section.allow_access?(current_user, :view)
-              if (!@website_section.nil? && section.id == @website_section.id) or (!selected_section_parent.nil? and selected_section_parent.id == section.id) %>
+              if menu_active?(section, selected_section_parent) %>
                         <li class="active">
                     <%
                        selected_section_parent = section
@@ -21,6 +21,6 @@
             <% end %>
         <% end %>
       </ul>
-      </div>
   <% end %>
+</div>
 

data/app/views/menus/knitkit/_default_sub_menu.erb

@@ -0,0 +1,27 @@
+<% if menu_items.count > 0 %>
+
+<!-- Sidebar -->
+<div id="sidebar-wrapper" class="expanded">
+	<ul class="sidebar-nav">
+		<%- menu_items.each do |child_menu_item|
+			if child_menu_item.allow_access?(current_user, :view)
+              if menu_item_selected(child_menu_item) %>
+              	<li class="active">
+              <%- else  %>
+              	<li>
+              <%- end %>
+
+                <a href="<%= child_menu_item.path %>"><%= child_menu_item.title %></a>
+			  </li>
+
+            <%- end %>  
+		<%- end %>
+
+	</ul>
+</div>
+
+<script type='text/javascript'>
+  $('.content-area').addClass('side-bar-content-wrapper');
+</script>
+
+<% end %>

data/app/views/menus/knitkit/_default_sub_section_menu.html.erb

@@ -0,0 +1,30 @@
+<% if @website_section.children_in_menu.count > 0 || !@website_section.parent.nil? %>
+
+<!-- Sidebar -->
+<div id="sidebar-wrapper" class="expanded">
+	<ul class="sidebar-nav">
+		<%- section = @website_section.parent ? @website_section.parent : @website_section %>
+
+		<%- section.children_in_menu.each do |child_section|
+			if child_section.allow_access?(current_user, :view)
+              if menu_active?(child_section, @website_section) %>
+              	<li class="active">
+              <%- else  %>
+              	<li>
+              <%- end %>
+
+                <a href="<%= child_section.path %>"><%= child_section.title %></a>
+			  </li>
+
+            <%- end %>  
+		<%- end %>
+
+	</ul>
+</div>
+
+<script type='text/javascript'>
+  $('.content-area').addClass('side-bar-content-wrapper');
+</script>
+
+<% end %>
+

data/app/views/website_inquiry_mailer/inquiry.html.erb

@@ -0,0 +1,266 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
+  <title>Website Inquiry</title>
+  <style type="text/css">
+    .ReadMsgBody {
+      width: 100%;
+      background-color: #ffffff;
+    }
+
+    .ExternalClass {
+      width: 100%;
+      background-color: #ffffff;
+    }
+
+    html {
+      width: 100%;
+    }
+
+    body {
+      -webkit-text-size-adjust: none;
+      -ms-text-size-adjust: none;
+      margin: 0;
+      padding: 0;
+    }
+
+    table {
+      border-spacing: 0;
+      border-collapse: collapse;
+    }
+
+    img {
+      display: block !important;
+    }
+
+    table td {
+      border-collapse: collapse;
+    }
+
+    .top-margin {
+      height: 50px;
+    }
+
+    .main-header {
+      padding: 50px 100px;
+      background: rgba(0, 0, 0, 0.5);
+      font-weight: 300;
+    }
+
+    .footer {
+      margin-top: 20px;
+    }
+
+    /* ----------- media queries (responsive) ----------- */
+
+    @media only screen and (max-width: 640px) {
+      body .show {
+        display: block !important;
+      }
+
+      body .hide {
+        display: none !important;
+      }
+
+      body .container590 {
+        width: 440px !important;
+      }
+    }
+
+    @media only screen and (max-width: 480px) {
+      body .show {
+        display: block !important;
+      }
+
+      body .hide {
+        display: none !important;
+      }
+
+      body .container590 {
+        width: 280px !important;
+      }
+    }
+
+  </style>
+</head>
+
+<body>
+
+<div class="top-margin"></div>
+
+<table border="0" width="100%" cellpadding="0" cellspacing="0">
+  <tr>
+    <td align="center" bgcolor="323232"
+        style="background-image: url('https://truenorthtechnology.com/download/life3.jpg?path=&disposition=inline'); background-size: cover; background-position: top center; background-repeat: repeat;">
+
+      <table border="0" align="center" cellpadding="0" cellspacing="0" class="container590">
+
+        <tr>
+          <td height="25" style="font-size: 25px; line-height: 25px;">&nbsp;</td>
+        </tr>
+
+
+        <tr>
+          <td height="30" style="font-size: 30px; line-height: 30px;">&nbsp;</td>
+        </tr>
+        <tr>
+          <td height="50" style="font-size: 50px; line-height: 50px;">&nbsp;</td>
+        </tr>
+
+        <tr>
+          <td class="main-header" align="center" height="42"
+              style="color: #ffffff; font-size: 32px; font-family: 'Open Sans', Calibri, sans-serif; mso-line-height-rule: exactly; line-height: 40px;">
+
+            <!-- ============ title header ============ -->
+
+            <div style="line-height: 34px;">
+                <span>
+                    <multiline>
+                      <strong><%= @website_inquiry.website.title %> has had an Inquiry</strong>
+                    </multiline>
+                </span>
+            </div>
+          </td>
+        </tr>
+
+        <tr>
+          <td height="10" style="font-size: 10px; line-height: 10px;">&nbsp;</td>
+        </tr>
+
+
+        <tr>
+          <td height="50" style="font-size: 50px; line-height: 50px;">&nbsp;</td>
+        </tr>
+
+        <tr>
+          <td align="center">
+
+            <table class="cta-button" border="0" align="center" width="163" cellpadding="0" cellspacing="0"
+                   style="border: none">
+              <tr>
+                <td height="10" style="font-size: 10px; line-height: 10px;">&nbsp;</td>
+              </tr>
+
+              <tr>
+                <td>
+                  <table border="0" align="center" cellpadding="0" cellspacing="0">
+                    <tr>
+                      <td align="center"
+                          style="color: #ffffff; font-size: 13px; font-family: 'Open Sans', Calibri, sans-serif; font-weight: 600; line-height: 24px;">
+                        <!-- ============ headline button ============ -->
+                      </td>
+
+                      <td width="14" align="right" valign="middle">
+
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+              <tr>
+                <td height="10" style="font-size: 10px; line-height: 10px;">&nbsp;</td>
+              </tr>
+
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td height="115" style="font-size: 115px; line-height: 115px;">&nbsp;</td>
+        </tr>
+
+      </table>
+    </td>
+  </tr>
+
+</table>
+
+
+<table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
+  <tr>
+    <td height="50">&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td>
+      <table class="container590" border="0" align="center" width="590" cellpadding="0" cellspacing="0">
+        <tr>
+          <td>
+            <p class="instructions" style="color: #555; font-size: 24px; font-family: 'Open Sans', Calibri, sans-serif; mso-line-height-rule: exactly; line-height: 42px;">
+              <span>First Name: </span><span><%= @website_inquiry.first_name %></span>
+              <br/>
+              <span>Last Name: </span><span><%= @website_inquiry.last_name %></span>
+              <br/>
+              <span>Email: </span><span><%= @website_inquiry.email %></span>
+              <% if @website_inquiry.created_by %>
+                <br/>
+                <span>Username: </span><span><%= @website_inquiry.created_by.username %></span>
+              <% end %>
+              <br/>
+            <p style="color: #555; font-size: 24px; font-family: 'Open Sans', Calibri, sans-serif; mso-line-height-rule: exactly; line-height: 42px;"><%= @website_inquiry.message %></p>
+            </p>
+          </td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+
+  <tr>
+    <td height="100" style="font-size: 100px; line-height: 100px;">&nbsp;</td>
+  </tr>
+
+</table>
+
+
+<table class="footer" border="0" width="100%" cellpadding="0" cellspacing="0" bgcolor="2d2d2d">
+
+  <tr>
+    <td height="20" style="font-size: 20px; line-height: 20px;">&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td align="center">
+
+      <table border="0" align="center" width="590" class="container590" cellpadding="0" cellspacing="0">
+
+        <tr>
+          <td align="center">
+
+            <table border="0" class="container590" align="center" cellpadding="0" cellspacing="0">
+              <tr>
+                <td align="center"
+                    style="color: #717171; font-size: 14px; font-family: 'Open Sans', Calibri, sans-serif; line-height: 25px;">
+                  <div style=" line-height: 25px;">
+                              <span>
+                              <multiline>
+                                © <%= Time.now.year %> Copyright. All Rights Reserved.
+                              </multiline>
+                              </span>
+                  </div>
+                </td>
+              </tr>
+
+            </table>
+
+          </td>
+        </tr>
+
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td height="20" style="font-size: 20px; line-height: 20px;">&nbsp;</td>
+  </tr>
+
+</table>
+
+
+</body>
+</html>
+