knitkit 2.1.15 → 3.0.0

data/app/models/website_inquiry.rb

@@ -2,18 +2,11 @@ class WebsiteInquiry < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   belongs_to :website
-  belongs_to :user
+  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by_id'
 
-  acts_as_dynamic_form_model
-  has_dynamic_forms
-	has_dynamic_data
+  validates :first_name, presence: true
+  validates :last_name, presence: true
+  validates :message, presence: true
+  validates :email, presence: true, format: {with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create}
 
-  def send_email(subject='')
-    begin
-      WebsiteInquiryMailer.inquiry(self, subject).deliver
-    rescue Exception => e
-      system_user = Party.find_by_description('Compass AE')
-      AuditLog.custom_application_log_message(system_user, e)
-    end
-  end
 end

data/app/models/website_section.rb

@@ -23,7 +23,7 @@ class WebsiteSection < ActiveRecord::Base
 
   validates :title, :presence => {:message => 'Title cannot be blank'}
   validates_uniqueness_of :permalink, :scope => [:website_id, :parent_id]
-  validates_uniqueness_of :internal_identifier, :scope => :website_id, :case_sensitive => false
+  validates_uniqueness_of :internal_identifier, :scope => [:website_id, :parent_id], :case_sensitive => false
 
   KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
   WEBSITE_SECTIONS_TEMP_LAYOUT_PATH = "#{Knitkit::Engine.root.to_s}/app/views/knitkit/website_sections"
@@ -38,6 +38,10 @@ class WebsiteSection < ActiveRecord::Base
     end
   end
 
+  def is_blog?
+    self.is_a?(Blog) || self.attributes['type'] == 'Blog'
+  end
+
   def secure
     capability = self.add_capability(:view)
     roles = ['admin', 'website_author', self.website.website_role_iid]
@@ -83,6 +87,10 @@ class WebsiteSection < ActiveRecord::Base
   def is_section?
     ['Page', 'Blog'].include? type
   end
+
+  def display_in_menu?
+    self.in_menu
+  end
   
   def is_secured?
     self.protected_with_capability?('view')

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

@@ -1,29 +1,50 @@
-<br/>
-<h1>Add Comment</h1>
-<div>
-  <div id="notice"></div>
-  <br/>
-
-  <%= form_tag "/comments/add/", :remote => true, :id => 'add_comment_form' do %>
-  <div class="form_settings">
-    <div>
-      <p>
-      <span>Comment</span>
-      <%= text_area_tag :comment, @comment, :rows => 8, :cols => 50 %>
-      </p>
-      <p style="padding-top: 15px">
-      <span>&nbsp;</span>
-      <%= submit_tag "Add Comment", :disable_with => "Please wait...", :class => "submit" %>
-      </p>
-      <input type="hidden" name="content_id" value="<%=@published_content.content.id%>" />
-    </div>
+<div class="container">
+  <div class="page-header">
+    <h2>Add Comment</h2>
   </div>
-  <% end %>
 
+  <div>
+    <div id="notice"></div>
+    <br/>
+
+    <%= form_tag "/comments/add/", :remote => true, :id => 'add_comment_form', :role => "form" do %>
+        <div class="form-group">
+          <label for="comment">Comment</label>
+
+          <textarea id="comment" name="comment" class="form-control" rows="3"></textarea>
+
+          <br/>
+          <%= submit_tag "Add Comment", :disable_with => "Please wait...", :class => "btn btn-primary" %>
+
+          <input type="hidden" name="content_id" value="<%= @published_content.content.id %>"/>
+
+        </div>
+    <% end %>
+
+  </div>
 </div>
 
 <script type="text/javascript">
-jQuery('#add_comment_form').bind('ajaxComplete', function(e, xhr, settings){
-  jQuery('#notice').html(xhr.responseText);
-});
+    jQuery('#add_comment_form').bind('ajax:success', function (e, response) {
+        var html = '';
+
+        if (response.success) {
+            html = [
+                '<div class="alert alert-success" >',
+                '<button type="button" class="close" data-dismiss="alert">&times;</button>',
+                response.message,
+                '</div>'
+            ].join('');
+        }
+        else {
+            html = [
+                '<div class="alert alert-danger" >',
+                '<button type="button" class="close" data-dismiss="alert">&times;</button>',
+                response.message,
+                '</div>'
+            ].join('');
+        }
+
+        jQuery('#notice').html(html);
+    });
 </script>

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

@@ -1,8 +1,6 @@
-<div id="commentDiv">
-  <div>
+<div class="panel panel-default">
+  <div class="panel-heading"><%=comment.commentor_name%> - <%=comment.created_at.strftime("Commented on %m/%d/%Y")%></div>
+  <div class="panel-body">
     <%=raw comment.comment %>
   </div>
-  <br/>
-  <span><%=comment.commentor_name%> - <%=comment.created_at.strftime("Commented on %m/%d/%Y")%></span>
-</div>
-<br/>
+</div>

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

@@ -1,51 +1,65 @@
-<h2><%=h @website_section.title %></h2>
-
-<div class="blog_articles left">
-  <% @contents.each do |content| %>
-    <div class="blog_post" id="blog_<%=h content.id %>">
-      <h4><%=h content.title %></h4>
-      <p>
-        Posted: <%= content.created_at.to_s(:long) %> <%=published_content_created_by %><br />
-        Topics: <%=content.content.tag_list %>
-      </p>
-      <div class="blog_body">
-        <%= raw content.excerpt_html %>
+<div class="container">
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="page-header">
+        <h1><%= @website_section.title %></h1>
+      </div>
+    </div>
+
+    <div class="col-md-8">
+
+      <% @contents.each do |content| %>
+          <div id="blog_<%= h content.id %>">
+            <h4><%= content.title %></h4>
+
+            <p>
+              Posted: <%= content.created_at.to_s(:long) %> <%= published_content_created_by %><br/>
+              Topics: <%= content.content.pretty_tag_list %>
+            </p>
+
+            <p>
+              <%= raw content.excerpt_html %>
+            </p>
+
+            <div><%= link_to 'Read More...', main_app.blog_article_path(@website_section.id, content.permalink) %></div>
+
+          </div>
+      <% end %>
+
+      <%= blog_pagination 'blog_pagination', params %>
+
+    </div>
+
+    <div class="col-md-4">
+      <div>
+        <h4>Topics</h4>
+        <%= blog_topics 'tag_link' %>
+      </div>
+
+      <div>
+        <h4>Links</h4>
+        <%= blog_rss_links 'RSS Feed' %>
+      </div>
+
+      <div>
+        <% #Optional Parameters:
+           # content_type: Leave blank to search all section types, set to Blog to only search Blog articles
+           # section_unique_name: Leave blank to search all pages if passed will confine search to a particular
+           #  pages content
+           # search_url: Main search url, only needed if results are being redirected
+           # redirect_results: If true will redirect to search page to display results.  Used for inline search
+           #   boxes
+           # per_page: Number of results per page
+        %>
+        <%= render_widget :search,
+                          :params => set_widget_params({
+                                                               :content_type => 'Blog',
+                                                               :section_unique_name => @blog.internal_identifier,
+                                                               :per_page => 2
+                                                       }) %>
       </div>
-      <div><%= link_to 'Read More...', main_app.blog_article_path(@website_section.id, content.permalink) %></div>
     </div>
-  <% end %>
-  
-  <%= blog_pagination 'blog_pagination', params %>
-  
-</div>
-
-<div class="sidebar blog_tags">
-  <h4>Topics</h4>
-  <%=blog_topics 'tag_link' %>
-</div>
-
-<div class="sidebar rss">  
-  <h4>Links</h4>
-  <%=blog_rss_links 'RSS Feed' %>
-</div>
-
-<div class="sidebar blog_search">
-  <% #Optional Parameters:
-   # content_type: Leave blank to search all section types, set to Blog to only search Blog articles
-   # section_permalink: This is the permalink value for the section
-   #                    Useful if you only want to search articles within a single Blog section
-   # results_permalink: How do you want your results to display? via ajax? or on a new page?
-   #                    Leave blank if you want results to display via ajax on the same page as the search form
-   #                    Enter the permalink of results page if you want the search results to display on a new page
-   # per_page: Number of results per page 
-   # class: CSS class for the form %>
-  <%= render_widget :search,
-                    :action => get_widget_action,
-                    :params => set_widget_params({
-                                 :content_type => 'Blog',
-                                 :section_permalink => '',
-                                 :results_permalink => 'search',
-                                 :per_page => 20,
-                                 :class => ''
-                      }) %>
-</div>
+  </div>
+
+</div>

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

@@ -1,22 +1,27 @@
-<div class="blog_post">
+<div class="container">
+  <div class="page-header">
+
+    <h1><%= @blog.title %></h1>
+
+    <h3><%= @published_content.title %></h3>
+
+  </div>
 
-  <h2><%=h @blog.title %></h2>
-  <br/>
-  <h3><%=h @published_content.title %></h3>
   <p>
-    Posted: <%= @published_content.created_at.to_s(:long) %> <%=published_content_created_by %><br />
-    Topics: <%= @published_content.content.tag_list %>  
+    Posted: <%= @published_content.created_at.to_s(:long) %> <%= published_content_created_by %><br/>
+    Topics: <%= @published_content.content.pretty_tag_list %>
   </p>
-  <p><%= raw @published_content.excerpt_html %></p>
+
   <%= raw @published_content.body_html %>
 
   <h3>Comments</h3>
   <br/>
   <%= blog_recent_approved_comments %>
-  <br/>
-  <br/>
 
-  <hr/>
-  <%=blog_add_comment_form %>
+  <p class="text-center"><%= link_to "Home", @blog.path %></p>
+
+  <br/>
+</div>
+<hr/>
+<%= blog_add_comment_form %>
 
-</div>

data/app/views/knitkit/mobile/index.html.erb

@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title><%= @website.title %></title>
+  <%= include_sencha_touch :debug => (Rails.env != 'production') %>
+  <%= static_javascript_include_tag('erp_app/utility.js') %>
+  <%= static_javascript_include_tag('erp_app/mobile/mobile_base.js') %>
+
+  <script type="text/javascript">
+      Ext.Loader.setPath({
+          'KnitkitMobile': 'javascripts/knitkit/mobile/app',
+          'Ext.ux': 'javascripts/knitkit/mobile/ux'
+      });
+
+      Ext.define("KnitkitMobile.view.Main", {
+          extend: 'Ext.ux.slidenavigation.View',
+          itemId: 'slideContainer',
+
+          requires: [
+              'Ext.Container',
+              'Ext.MessageBox',
+              'Ext.Panel',
+              'Ext.Toolbar',
+              'Ext.event.publisher.Dom'
+          ],
+
+          config: {
+              style: 'font-size:14px;',
+
+              fullscreen: true,
+
+              /**
+               *  Any component within the container with an 'x-toolbar' class
+               *  will be draggable.  To disable draggin all together, set this
+               *  to false.
+               */
+              slideSelector: 'x-container',
+
+              /**
+               *  Time in milliseconds to animate the closing of the container
+               *  after an item has been clicked on in the list.
+               */
+              selectSlideDuration: 200,
+
+              /**
+               *  Enable content masking when container is open.
+               *
+               *  @since 0.2.0
+               */
+              itemMask: true,
+
+              /**
+               *  Define the default slide button config.  Any item that has
+               *  a `slideButton` value that is either `true` or a button config
+               *  will use these values at the default.
+               */
+              slideButtonDefaults: {
+                  selector: 'toolbar'
+              },
+
+              /**
+               *  This allows us to configure how the actual list container
+               *  looks.  Here we've added a custom search field and have
+               *  modified the width.
+               */
+              list: {
+                  maxDrag: 400,
+                  //width: (Ext.os.is.iOS ? 300 : 250),
+                  items: [
+                      {
+                          xtype: 'toolbar',
+                          docked: 'top',
+                          ui: 'light',
+                          title: {
+                              title: 'Menu',
+                              centered: true,
+                              width: 200,
+                              left: 0
+                          }
+                      }
+                  ]
+
+              },
+
+              /**
+               *  Example of how to re-order the groups.
+               */
+              /*groups: {
+               'Pages': 1,
+               'Account': 2
+               },*/
+
+              /**
+               *  These are the default values to apply to the items within the
+               *  container.
+               */
+              defaults: {
+                  style: 'background: #fff',
+                  xtype: 'container'
+              },
+
+              items: [
+                  <% @website.sections.each do |section| %>
+                  <% if section.in_menu && section.allow_access?(current_user, :view) %>
+                  {
+                      title: '<%= section.title %>',
+                      slideButton: true,
+                      items: [
+                          {
+                              xtype: 'toolbar',
+                              title: '<%= section.title %>',
+                              docked: 'top'
+                          },
+                          {
+                              xtype: 'panel',
+                              scrollable: true,
+                              bodyPadding: '5px',
+                              listeners: {
+                                  painted: function (comp) {
+                                      var me = this;
+
+                                      Ext.Ajax.request({
+                                          method: 'GET',
+                                          timeout: 60000,
+                                          params: {
+                                              is_mobile: true
+                                          },
+                                          url: '/<%= section.internal_identifier %>',
+                                          success: function (response) {
+                                              me.setHtml(response.responseText);
+                                          },
+                                          failure: function (response) {
+                                              Ext.Msg.alert('Info', 'Could not load page');
+                                          }
+                                      });
+                                  }
+                              }
+                          }
+                      ]
+                  },
+                  <% end %>
+                  <% end %>
+              ]
+          }
+      });
+
+      Ext.application({
+          name: 'KnitkitMobile',
+
+          views: ['Main'],
+
+          launch: function () {
+              this.main = Ext.create('KnitkitMobile.view.Main');
+              Ext.Viewport.add(this.main);
+              Ext.Viewport.setActiveItem(this.main);
+          }
+      });
+  </script>
+</head>
+<body>
+</body>
+</html>