knitkit 2.1.2 → 2.1.3

data/app/widgets/signup/javascript/signup.js

@@ -1,6 +1,7 @@
 Compass.ErpApp.Widgets.Signup = {
+    template: new Ext.Template('<%= render_widget :signup, :params => {:login_url => "/login"}%>'),
     addSignup:function(){
-        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror('<%= render_widget :signup, :params => {:login_url => "/login"}%>');
+        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.Signup.template.apply());
     }
 }
 

data/config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
   get 'blogs/:section_id/:id' => 'knitkit/blogs#show', :as => 'blog_article'
   get 'blogs/:section_id/tag/:tag_id(.:format)' => 'knitkit/blogs#tag', :as => 'blog_tag'
   
-  match '/comments/add/:section_id/:content_id' => 'knitkit/comments#add', :as => 'comments'
+  match '/comments/add' => 'knitkit/comments#add', :as => 'comments'
   match '/unauthorized' => 'knitkit/unauthorized#index', :as => 'knitkit/unauthorized'
   match '/view_current_publication' => 'knitkit/base#view_current_publication'
   match '/online_document_sections/build_tree' => 'knitkit/online_document_sections#build_tree'

data/lib/knitkit/extensions/railties/action_view/helpers/blog_helper.rb

@@ -6,7 +6,7 @@ module Knitkit
           module BlogHelper
 
             def blog_add_comment_form
-              render :partial => 'add_comment' unless current_user.nil?
+              render :partial => 'add_comment' if current_user
             end
 
             def blog_topics(css_class='tag_link')
@@ -23,9 +23,9 @@ module Knitkit
 
             def blog_rss_links(link_title='RSS Feed')
               if params[:action] == 'tag'
-                return link_to link_title, main_app.blog_tag_url(params[:section_id], params[:tag_id], :rss)
+                return link_to link_title, main_app.blog_tag_url(params[:section_id], params[:tag_id], :rss), :target => '_blank'
               else
-                return link_to link_title, main_app.blogs_url(params[:section_id], :rss)
+                return link_to link_title, main_app.blogs_url(params[:section_id], :rss), :target => '_blank'
               end
             end
 

data/lib/knitkit/extensions/railties/action_view/helpers/knitkit_helper.rb

@@ -34,7 +34,6 @@ module Knitkit
             #section_unique_name
             # - sections permalink to start breadcrumbs at
             def build_crumbs(options={})
-              links = []
               if options[:menu]
                 menu = WebsiteNav.find_by_name(options[:menu])
                 raise "Menu with name #{options[:menu]} does not exist" if menu.nil?
@@ -48,7 +47,6 @@ module Knitkit
               else
                 links = @website_section.self_and_ancestors.collect{|child| {:url => child.path, :title => child.title}}
               end
-              links
 
               render :partial => 'shared/knitkit/bread_crumb', :locals => {:links => links}
             end

data/lib/knitkit/version.rb

@@ -2,7 +2,7 @@ module Knitkit
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/erp_app/desktop/applications/knitkit/center_region.js

@@ -17,7 +17,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         ['Link', 'Unlink', 'Anchor'],
         ['HorizontalRule', 'SpecialChar', 'PageBreak'],
         ['ShowBlocks', 'RemoveFormat'],
-        ['Styles', 'Format', 'Font', 'FontSize' ],
+        ['KnitkitThemes', 'Format', 'Font', 'FontSize' ],
         ['Maximize', '-', 'About']
     ],
 
@@ -235,7 +235,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 autoHeight:true,
                 value:content,
                 ckEditorConfig:{
-                    extraPlugins:'jwplayer',
+                    extraPlugins:'jwplayer,knitkitthemes',
                     toolbar:self.ckEditorToolbar
                 },
                 listeners:{
@@ -408,7 +408,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 autoHeight:true,
                 //value:content,
                 ckEditorConfig:{
-                    extraPlugins:'jwplayer',
+                    extraPlugins:'jwplayer,knitkitthemes',
                     toolbar:self.ckEditorToolbar
                 },
                 listeners:{
@@ -542,8 +542,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         var item = this.workArea.query('#' + itemId).first();
 
         if (Compass.ErpApp.Utility.isBlank(item)) {
-            item = {
-                xtype:'panel',
+            item = Ext.create("Ext.panel.Panel", {
                 layout:'border',
                 title:title + " Inquiries",
                 itemId:itemId,
@@ -571,7 +570,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         Ext.getCmp('knitkitWestRegion').selectWebsite(websiteId);
                     }
                 }
-            };
+            });
 
             this.workArea.add(item);
         }
@@ -680,6 +679,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         }
         return false;
     },
+
     saveCurrent:function () {
         var activeTab = this.workArea.getActiveTab();
         if (!Ext.isEmpty(activeTab) && !Ext.isEmpty(activeTab.initialConfig.save)) {
@@ -687,7 +687,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         }
     },
 
-
     saveAll:function () {
         this.workArea.items.each(function (comp) {
             if (!Ext.isEmpty(comp) && !Ext.isEmpty(comp.initialConfig.save)) {

data/public/javascripts/erp_app/desktop/applications/knitkit/publish_window.js

@@ -6,14 +6,14 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow",{
     this.addEvents(
       /**
          * @event publish_success
-         * Fired after success response is recieved from server
+         * Fired after success response is received from server
          * @param {Compass.ErpApp.Applications.Desktop.PublishWindow} this Object
          * @param {Object} Server Response
          */
       "publish_success",
       /**
          * @event publish_failure
-         * Fired after response is recieved from server with error
+         * Fired after response is received from server with error
          * @param {Compass.ErpApp.Applications.Desktop.PublishWindow} this Object
          * @param {Object} Server Response
          */
@@ -33,7 +33,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow",{
       height:300,
       buttonAlign:'center',
       plain: true,
-      items: new Ext.form.FormPanel({
+      items: Ext.create('widget.form',{
         timeout: 130000,
         baseParams:config['baseParams'],
         autoHeight:true,

data/public/javascripts/erp_app/desktop/applications/knitkit/select_roles_window.js

@@ -0,0 +1,103 @@
+Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SelectRolesWindow",{
+    extend:"Ext.window.Window",
+    alias:'widget.knikit_selectroleswindow',
+    initComponent : function() {
+
+        this.addEvents(
+            /**
+             * @event success
+             * Fired after success response is received from server
+             * @param {Compass.ErpApp.Applications.Desktop.PublishWindow} this Object
+             * @param {Object} Server Response
+             */
+            "success",
+            /**
+             * @event failure
+             * Fired after response is received from server with error
+             * @param {Compass.ErpApp.Applications.Desktop.PublishWindow} this Object
+             * @param {Object} Server Response
+             */
+            "failure"
+        );
+
+        this.callParent(arguments);
+    },
+
+    constructor : function(config) {
+        var currentRoles = config['currentRoles'],
+            availableRoles = config['availableRoles'],
+            checkBoxes = [];
+
+        Ext.each(availableRoles, function(role){
+            checkBoxes.push({
+                name:role['internal_identifier'],
+                boxLabel:role['description'],
+                checked:currentRoles.contains(role['internal_identifier'])
+            })
+        });
+
+        config = Ext.apply({
+            layout:'fit',
+            title:'Secure',
+            iconCls:'icon-document_lock',
+            width:250,
+            height:300,
+            buttonAlign:'center',
+            plain: true,
+            items: Ext.create('widget.form',{
+                timeout: 130000,
+                baseParams:config['baseParams'],
+                autoHeight:true,
+                labelWidth:110,
+                bodyPadding:'5px',
+                frame:false,
+                layout:'fit',
+                url:config['url'],
+                defaults: {
+                    width: 225
+                },
+                items: [{
+                    xtype: 'fieldset',
+                    autoScroll:true,
+                    title:'Select Roles',
+                    defaultType: 'checkbox',
+                    items:checkBoxes
+                }]
+            }),
+            buttons: [{
+                text:'Submit',
+                listeners:{
+                    'click':function(button){
+                        var win = button.up('knikit_selectroleswindow');
+                        var formPanel = win.down('form');
+                        formPanel.getForm().submit({
+                            method:'POST',
+                            waitMsg:'Updating Security...',
+                            success:function(form, action){
+                                var response =  Ext.decode(action.response.responseText);
+                                win.fireEvent('success', win, response);
+                                win.close();
+                            },
+                            failure:function(form, action){
+                                var response =  Ext.decode(action.response.responseText);
+                                win.fireEvent('failure', win, response);
+                            }
+                        });
+                    }
+                }
+            },
+                {
+                    text: 'Cancel',
+                    listeners:{
+                        'click':function(button){
+                            var win = button.up('knikit_selectroleswindow');
+                            win.close();
+                        }
+                    }
+                }]
+        }, config);
+
+        this.callParent([config]);
+    }
+
+});

data/public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/section.js

@@ -12,11 +12,11 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
     if (record.data.isSecured) {
         if (currentUser.hasCapability('unsecure','WebsiteSection')) {
             items.push({
-                text:'Unsecure',
-                iconCls:'icon-document',
+                text:'Security',
+                iconCls:'icon-document_lock',
                 listeners:{
                     'click':function () {
-                        self.changeSecurityOnSection(record, false);
+                        self.changeSecurityOnSection(record, true);
                     }
                 }
             });
@@ -25,7 +25,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
     else {
         if (currentUser.hasCapability('secure','WebsiteSection')) {
             items.push({
-                text:'Secure',
+                text:'Security',
                 iconCls:'icon-document_lock',
                 listeners:{
                     'click':function () {

data/public/javascripts/erp_app/desktop/applications/knitkit/west_region/west_region.js

@@ -147,37 +147,45 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
         });
     },
 
-    changeSecurityOnSection:function (node, secure) {
-        var self = this;
-        self.setWindowStatus('Updating section...');
+    changeSecurityOnSection:function (node) {
         Ext.Ajax.request({
-            url:'/knitkit/erp_app/desktop/section/update_security',
+            url:'/knitkit/erp_app/desktop/available_roles',
             method:'POST',
-            params:{
-                id:node.data.id.split('_')[1],
-                site_id:node.data.siteId,
-                secure:secure
-            },
             success:function (response) {
                 var obj = Ext.decode(response.responseText);
                 if (obj.success) {
-                    self.clearWindowStatus();
-                    if (secure) {
-                        node.set('iconCls', 'icon-document_lock');
-                    }
-                    else {
-                        node.set('iconCls', 'icon-document');
-                    }
-                    node.set('isSecured', secure);
-                    node.commit();
+                    Ext.create('widget.knikit_selectroleswindow',{
+                        baseParams:{
+                            id:node.data.id.split('_')[1],
+                            site_id:node.get('siteId')
+                        },
+                        url:'/knitkit/erp_app/desktop/section/update_security',
+                        currentRoles:node.get('roles'),
+                        availableRoles:obj.availableRoles,
+                        listeners:{
+                            success:function(window, response){
+                                node.set('roles', response.roles);
+                                if (response.secured) {
+                                    node.set('iconCls', 'icon-document_lock');
+                                }
+                                else {
+                                    node.set('iconCls', 'icon-document');
+                                }
+                                node.set('isSecured', response.secured);
+                                node.commit();
+                            },
+                            failure:function(){
+                                Ext.Msg.alert('Error', 'Could not update security');
+                            }
+                        }
+                    }).show();
                 }
                 else {
-                    Ext.Msg.alert('Error', 'Error securing section');
+                    Ext.Msg.alert('Error', 'Could not load available roles');
                 }
             },
             failure:function (response) {
-                self.clearWindowStatus();
-                Ext.Msg.alert('Error', 'Error securing section.');
+                Ext.Msg.alert('Error', 'Could not load available roles');
             }
         });
     },
@@ -383,6 +391,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
                 },
                 {
                     name:'publication_comments_enabled'
+                },
+                {
+                    name:'roles'
                 }
             ],
             listeners:{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knitkit
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_forms
@@ -145,6 +145,7 @@ files:
 - public/javascripts/erp_app/desktop/applications/knitkit/publish_window.js
 - public/javascripts/erp_app/desktop/applications/knitkit/published_grid_panel.js
 - public/javascripts/erp_app/desktop/applications/knitkit/section_articles_grid_panel.js
+- public/javascripts/erp_app/desktop/applications/knitkit/select_roles_window.js
 - public/javascripts/erp_app/desktop/applications/knitkit/themes_tree_panel.js
 - public/javascripts/erp_app/desktop/applications/knitkit/versions_grid_panel.js
 - public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/document.js