knitkit 2.1.2 → 2.1.3

data/app/controllers/knitkit/comments_controller.rb

@@ -7,7 +7,7 @@ module Knitkit
 
       @comment = content.add_comment({:commentor_name => user.party.description, :email => user.email, :comment => comment})
 
-      render :text => (@comment.valid? ? '<div class="sexysuccess">Comment pending approval.</span>' : '<div class="sexyerror">Error. Comment cannot be blank.</span>')
+      render :text => (@comment.valid? ? '<div class="sexynotice">Comment pending approval.</div>' : '<div class="sexynotice">Error. Comment cannot be blank.</div>')
     end
 
     #no section to set

data/app/controllers/knitkit/erp_app/desktop/app_controller.rb

@@ -4,6 +4,10 @@ module Knitkit
       class AppController < ::ErpApp::Desktop::BaseController
         KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
 
+        def available_roles
+          render :json => {:success => true, :availableRoles => SecurityRole.all.collect{|role| role.to_hash(:only => [:internal_identifier, :description])}}
+        end
+
         def websites
           websites = Website.order('name ASC').all
 
@@ -107,6 +111,7 @@ module Knitkit
             :siteId => website.id,
             :type => website_section.type,
             :isSecured => website_section.is_secured?,
+            :roles => website_section.roles.collect{|item| item.internal_identifier},
             :isSection => website_section.is_section?,
             :isDocument => website_section.is_document_section?,
             :inMenu => website_section.in_menu,

data/app/controllers/knitkit/erp_app/desktop/articles_controller.rb

@@ -5,7 +5,6 @@ module Knitkit
         @@datetime_format = "%m/%d/%Y %l:%M%P"
 
         def new
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('create', 'Content') do
               result = {}
@@ -38,7 +37,6 @@ module Knitkit
         end
 
         def update
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('edit', 'Content') do
               result = {}
@@ -70,7 +68,6 @@ module Knitkit
         end
 
         def delete
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('delete', 'Content') do
               render :json => Article.destroy(params[:id]) ? {:success => true} : {:success => false}
@@ -81,7 +78,6 @@ module Knitkit
         end
 
         def add_existing
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('add_existing', 'Content') do
               website_section = WebsiteSection.find(params[:section_id])

data/app/controllers/knitkit/erp_app/desktop/content_controller.rb

@@ -5,7 +5,6 @@ module Knitkit
       class ContentController < Knitkit::ErpApp::Desktop::AppController
         def update
           result = {:success => true}
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('edit_html', 'Content') do
               id      = params[:id]
@@ -33,7 +32,6 @@ module Knitkit
 
         def save_excerpt
           result = {:success => true}
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability('edit_excerpt', 'Content') do
               id      = params[:id]

data/app/controllers/knitkit/erp_app/desktop/theme_controller.rb

@@ -274,6 +274,19 @@ module Knitkit
           end
         end
 
+        def get_ckeditor_selectable_themes
+          themes = []
+          Theme.where('active = ?', 1).all.each do |theme|
+            theme_hash = {:name => theme.name, :theme_id => theme.theme_id, :stylesheets => []}
+            theme.stylesheets.each do |stylesheet|
+              theme_hash[:stylesheets] << {:name => stylesheet.name, :url => stylesheet.data.url}
+            end
+            themes << theme_hash
+          end
+
+          render :json => {:success => true, :themes => themes}
+        end
+
         protected
 
         def get_theme(path)

data/app/controllers/knitkit/erp_app/desktop/website_section_controller.rb

@@ -27,12 +27,12 @@ module Knitkit
                     parent_website_section = WebsiteSection.find(params[:website_section_id])
                     website_section.move_to_child_of(parent_website_section)
                   end
-                  
+
                   if params[:type] == "OnlineDocumentSection"
                     documented_content = DocumentedContent.create(:title => website_section.title, :created_by => current_user, :body_html => website_section.title)
                     DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => website_section.id)
                   end
-                  
+
                   website_section.update_path!
                   result = {:success => true, :node => build_section_hash(website_section, website_section.website)}
                 else
@@ -48,7 +48,7 @@ module Knitkit
 
               render :json => result
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -58,7 +58,7 @@ module Knitkit
             current_user.with_capability('delete', 'WebsiteSection') do
               render :json => WebsiteSection.destroy(params[:id]) ? {:success => true} : {:success => false}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -70,19 +70,27 @@ module Knitkit
 
         def update_security
           if current_user.has_capability?('secure', 'WebsiteSection') or current_user.has_capability?('unsecure', 'WebsiteSection')
+            roles = []
+
+            #get roles
+            params.each do |k, v|
+              if v == 'on'
+                roles.push(k)
+              end
+            end
 
-            if params[:secure] == 'true'
-              c = @website_section.add_capability(:view)
-              roles = ['admin', 'website_author', @website_section.website.website_role_iid]
+            if roles.empty?
+              @website_section.remove_capability(:view)
+            else
+              capability = @website_section.add_capability(:view)
+              capability.remove_all_roles
               roles.each do |r|
                 role = SecurityRole.find_by_internal_identifier(r)
-                role.add_capability(c)
+                role.add_capability(capability)
               end
-            else
-              @website_section.remove_capability(:view)
             end
 
-            render :json => {:success => true}
+            render :json => {:success => true, :secured => @website_section.is_secured?, :roles => @website_section.roles.collect{|item| item.internal_identifier}}
           else
             render :json => {:success => false, :message => "User does not have capability."}
           end
@@ -105,7 +113,7 @@ module Knitkit
                 render :json => {:success => false}
               end
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -116,7 +124,7 @@ module Knitkit
               @website_section.create_layout
               render :json => {:success => true}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -126,15 +134,15 @@ module Knitkit
             current_user.with_capability('edit', 'WebsiteSectionLayout') do
               render :text => @website_section.layout
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
-  
+
         def save_layout
           begin
             current_user.with_capability('edit', 'WebsiteSectionLayout') do
-		          result = Knitkit::SyntaxValidator.validate_content(:erb, params[:content])
+              result = Knitkit::SyntaxValidator.validate_content(:erb, params[:content])
               unless result
                 website = @website_section.website
                 @website_section.layout = params[:content]
@@ -145,7 +153,7 @@ module Knitkit
                 render :json => {:success => false, :message => result}
               end
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -155,10 +163,10 @@ module Knitkit
           websites = Website.all
           all_articles = [{:name => 'All Articles', :id => 0}]
           orphaned_articles = [{:name => 'Orphaned Articles Only', :id => -1}]
-          
+
           websites_array = []
-          websites.each do |w| 
-            websites_array << { :name => "Website: #{w.name}", :id => w.id } 
+          websites.each do |w|
+            websites_array << {:name => "Website: #{w.name}", :id => w.id}
           end
 
           menu = all_articles + orphaned_articles + websites_array
@@ -175,7 +183,7 @@ module Knitkit
 
           # Orphaned Articles
           if !website_id.blank? and website_id.to_i == -1
-            available_articles = available_articles.includes(:website_section_contents).where( :website_section_contents => { :content_id => nil } )     
+            available_articles = available_articles.includes(:website_section_contents).where(:website_section_contents => {:content_id => nil})
           end
 
           # Website Articles
@@ -187,7 +195,7 @@ module Knitkit
 
           render :inline => "{\"articles\":#{available_articles.to_json(:only => [:title, :internal_identifier, :id], :methods => [:combobox_display_value])}}"
         end
-  
+
         def existing_sections
           website = Website.find(params[:website_id])
           WebsiteSection.class_eval do
@@ -197,14 +205,14 @@ module Knitkit
           end
           render :inline => website.sections.to_json(:only => [:id], :methods => [:title_permalink])
         end
-  
+
         protected
-  
+
         def set_website_section
           @website_section = WebsiteSection.find(params[:id])
         end
-  
-      end#WebsiteSectionController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+      end #WebsiteSectionController
+    end #Desktop
+  end #ErpApp
+end #Knitkit

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -22,7 +22,7 @@ module Knitkit
     def find_root
       @root = OnlineDocumentSection.find(params[:section_id])
       if @root.documented_item_published_content(@active_publication)
-        @root_content = @root.documented_item_published_content(@active_publication).body_html 
+        @root_content = @root.documented_item_published_content(@active_publication).body_html.gsub(/\n/, '<br/>')
       else
         @root_content = ""
       end

data/app/models/website_section.rb

@@ -2,7 +2,7 @@ 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_indentifier
+  before_save  :update_path, :check_internal_identifier
 
   extend FriendlyId
   friendly_id :title, :use => [:slugged, :scoped], :slug_column => :permalink, :scope => [:website_id, :parent_id]
@@ -98,7 +98,6 @@ class WebsiteSection < ActiveRecord::Base
   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?
@@ -188,7 +187,7 @@ class WebsiteSection < ActiveRecord::Base
     end
   end
 
-  def check_internal_indentifier
+  def check_internal_identifier
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
   

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

@@ -4,7 +4,7 @@
   <div id="notice"></div>
   <br/>
 
-  <%= form_tag "/comments/add/#{@website_section.id}/#{@published_content.content.id}", :remote => true, :id => 'add_comment_form' do %>
+  <%= form_tag "/comments/add/", :remote => true, :id => 'add_comment_form' do %>
   <div class="form_settings">
     <div>
       <p>
@@ -15,6 +15,7 @@
       <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>
   <% end %>

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

@@ -3,147 +3,154 @@
 
 <script type="text/javascript" charset="utf-8">
 
-	Ext.onReady(function() {
-		var index = 0;
-		var currentItem;
-		
-		var tree = Ext.create('Ext.tree.Panel', {
-			region: 'west',
-			cls: 'tree_styles',
-    	store: new Ext.data.TreeStore({
-				proxy:{
-	     		type: 'ajax',
-			 		url: 'online_document_sections/build_tree',
-					extraParams:{ section_id: <%= params[:section_id] %> },
-					format: 'json'
-	     	},
-				root: {
-	      	text: '<%= @root.title %>',
-	        id: '0',
-	        expanded: true
-	      },
-				fields:[ { name:'id' }, { name:'title' }, { name:'documented_item_published_content_html' }, { name:'leaf' }]
-			}),
-			collapsible: true,
-			tbar: {
-				items: [
-					new Ext.form.TextField({
-									id:"search",
-									disabled: true,
-									cls: 'document_search',
-									emptyText: 'Search',
-									allowBlank:true,
-								})
-				]
-			},
-			header: false,
-			autoScroll: true,
-			bodyBorder: false,
-    	rootVisible: false,
-    	width: 170,
-			displayField: 'title',
-			valueField: 'id',
-    	title: '<%= @root.title %>',
-			listeners:{
-      	'itemclick':function(view, record, htmlItem, index, e){
-					var tab_panel = Ext.getCmp('tabs_root')
-					var tab = Ext.getCmp("tab_" + record.data['id'])
-					if (tab){
-						tab_panel.setActiveTab(tab.id);
-					}
-					else{
-						addTab(record);
-					}
-				}
-			}
-    });
-		
-		var tabs = Ext.createWidget('tabpanel', {
-				id: 'tabs_root',
-				region: 'center',
-				plain: true,
-				bodyBorder: true,
-        resizeTabs: true,
-        enableTabScroll: true,
-        width: 640,
-				collapsible: false,
-        defaults: {
+    Ext.onReady(function () {
+        var index = 0;
+        var currentItem;
+
+        var tree = Ext.create('Ext.tree.Panel', {
+            region: 'west',
+            cls: 'tree_styles',
+            store: Ext.create('Ext.data.TreeStore',{
+                proxy: {
+                    type: 'ajax',
+                    url: 'online_document_sections/build_tree',
+                    extraParams: { section_id: <%= params[:section_id] %> },
+                    format: 'json'
+                },
+                root: {
+                    text: '<%= @root.title %>',
+                    id: '0',
+                    expanded: true
+                },
+                fields: [
+                    { name: 'id' },
+                    { name: 'title' },
+                    { name: 'documented_item_published_content_html' },
+                    { name: 'leaf' }
+                ]
+            }),
+            collapsible: true,
+            tbar: {
+                items: [
+                    new Ext.form.TextField({
+                        id: "search",
+                        disabled: true,
+                        cls: 'document_search',
+                        emptyText: 'Search',
+                        allowBlank: true,
+                    })
+                ]
+            },
+            header: false,
             autoScroll: true,
-						bodyPadding: 10,
-        },
-        items: [{
-						id: "tab_" + <%= @root.id.to_s %>,
+            bodyBorder: false,
+            rootVisible: false,
+            width: 170,
+            displayField: 'title',
+            valueField: 'id',
             title: '<%= @root.title %>',
-            html: "<%= raw @root_content.gsub(/\n/, '<br/>') %>",
-            closable: false,
-						autoScroll: true
-        }],
-        plugins: Ext.create('Ext.ux.TabCloseMenu', {
-            extraItemsTail: [
-                '-',
-                {
-                    text: 'Closable',
-                    checked: true,
-                    hideOnClick: true,
-                    handler: function (item) {
-                        currentItem.tab.setClosable(item.checked);
+            listeners: {
+                'itemclick': function (view, record, htmlItem, index, e) {
+                    var tab_panel = Ext.getCmp('tabs_root')
+                    var tab = Ext.getCmp("tab_" + record.data['id'])
+                    if (tab) {
+                        tab_panel.setActiveTab(tab.id);
                     }
+                    else {
+                        addTab(record);
+                    }
+                }
+            }
+        });
+
+        var tabs = Ext.createWidget('tabpanel', {
+            id: 'tabs_root',
+            region: 'center',
+            plain: true,
+            bodyBorder: true,
+            resizeTabs: true,
+            enableTabScroll: true,
+            width: 640,
+            collapsible: false,
+            defaults: {
+                autoScroll: true,
+                bodyPadding: 10,
+            },
+            items: [
+                {
+                    id: "tab_" + <%= @root.id.to_s %>,
+                    title: '<%= @root.title %>',
+                    html: "<%= raw @root_content.gsub(/\n/, '<br/>') %>",
+                    closable: false,
+                    autoScroll: true
                 }
             ],
-            listeners: {
-                aftermenu: function () {
-                    currentItem = null;
-                },
-                beforemenu: function (menu, item) {
-                    var menuitem = menu.child('*[text="Closable"]');
-                    currentItem = item;
-                    menuitem.setChecked(item.closable);
+            plugins: Ext.create('Ext.ux.TabCloseMenu', {
+                extraItemsTail: [
+                    '-',
+                    {
+                        text: 'Closable',
+                        checked: true,
+                        hideOnClick: true,
+                        handler: function (item) {
+                            currentItem.tab.setClosable(item.checked);
+                        }
+                    }
+                ],
+                listeners: {
+                    aftermenu: function () {
+                        currentItem = null;
+                    },
+                    beforemenu: function (menu, item) {
+                        var menuitem = menu.child('*[text="Closable"]');
+                        currentItem = item;
+                        menuitem.setChecked(item.closable);
+                    }
                 }
-            }
-        })
+            })
+        });
+
+        function addTab(record) {
+            ++index;
+            tabs.add({
+                id: "tab_" + record.data['id'],
+                title: record.data['title'],
+                html: record.data['documented_item_published_content_html'],
+                closable: true
+            }).show();
+        }
+
+        var fitted_panel = Ext.createWidget('panel', {
+            id: 'fitted_panel',
+            layout: 'border',
+            header: false,
+            defaults: {
+                collapsible: true,
+                split: true,
+            },
+            renderTo: 'document_content',
+            autoScroll: true,
+            items: [
+                tree,
+                tabs
+            ]
+        });
+
+        resize_windows();
+
     });
-		
-		function addTab(record){
-			++index;
-      tabs.add({
-					id: "tab_" + record.data['id'],
-          title: record.data['title'],
-          html: record.data['documented_item_published_content_html'],
-          closable: true
-      }).show();
-		}
-		
-		var fitted_panel = Ext.createWidget('panel', {
-			id: 'fitted_panel',
-			layout: 'border',
-			header: false,
-			defaults: {
-			    collapsible: true,
-			    split: true,
-			},
-			renderTo: 'document_content',
-			autoScroll: true,
-			items: [
-				tree,
-				tabs
-			]
-		});
-		
-		resize_windows();
-			
-	});
-	
-	function resize_windows(){
-		window_height = Ext.getBody().getViewSize().height;
-		header_height = Ext.get("header").getHeight();
-		footer_height = Ext.get("footer").getHeight();
-		document_content_height = window_height - header_height - footer_height;
-		Ext.get("document_content").setHeight(document_content_height);
-		Ext.getCmp("fitted_panel").setHeight(document_content_height - 20);
-	}
-	
-	window.onresize = function(){
-		resize_windows();
-	}
-	
+
+    function resize_windows() {
+        window_height = Ext.getBody().getViewSize().height;
+        header_height = Ext.get("header").getHeight();
+        footer_height = Ext.get("footer").getHeight();
+        document_content_height = window_height - header_height - footer_height;
+        Ext.get("document_content").setHeight(document_content_height);
+        Ext.getCmp("fitted_panel").setHeight(document_content_height - 20);
+    }
+
+    window.onresize = function () {
+        resize_windows();
+    }
+
 </script>

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

@@ -12,8 +12,8 @@
     
     <title><%= @website.title %></title>
     <%= javascript_include_tag :application %>
-    <%= include_extjs %>
-		<%= add_authenticity_token_to_extjs %>
+    <%= include_extjs :theme => 'extjs:ext-all-gray' %>
+    <%= add_authenticity_token_to_extjs %>
     <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
     <%= static_javascript_include_tag('datepicker.js') %>
     <%= static_stylesheet_link_tag('datepicker.css') %>

data/app/widgets/contact_us/javascript/contact_us.js

@@ -1,6 +1,8 @@
 Compass.ErpApp.Widgets.ContactUs = {
+    template: new Ext.Template('<%= render_widget :contact_us, :params => {:use_dynamic_form => false} %>'),
+
     addContactUs:function(){
-        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror('<%= render_widget :contact_us, :params => {:use_dynamic_form => false} %>');
+        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.ContactUs.template.apply());
     }
 }