knitkit 2.1.3 → 2.1.4

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

@@ -68,7 +68,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
                         self.clearWindowStatus();
                         var obj = Ext.decode(response.responseText);
                         if (obj.success) {
-                            node.remove(true);
+                            node.removeAll();
+							node.remove();
                         }
                         else {
                             Ext.Msg.alert('Error', 'Error deleting Website');
@@ -147,7 +148,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
         });
     },
 
-    changeSecurityOnSection:function (node) {
+    changeSecurity:function (node, updateUrl, id) {
         Ext.Ajax.request({
             url:'/knitkit/erp_app/desktop/available_roles',
             method:'POST',
@@ -156,10 +157,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
                 if (obj.success) {
                     Ext.create('widget.knikit_selectroleswindow',{
                         baseParams:{
-                            id:node.data.id.split('_')[1],
+                            id:id,
                             site_id:node.get('siteId')
                         },
-                        url:'/knitkit/erp_app/desktop/section/update_security',
+                        url: updateUrl,
                         currentRoles:node.get('roles'),
                         availableRoles:obj.availableRoles,
                         listeners:{
@@ -190,41 +191,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
         });
     },
 
-    changeSecurityOnMenuItem:function (node, secure) {
-        var self = this;
-        self.setWindowStatus('Updating menu item security...');
-        Ext.Ajax.request({
-            url:'/knitkit/erp_app/desktop/website_nav/update_security',
-            method:'POST',
-            params:{
-                id:node.data.websiteNavItemId,
-                site_id:node.data.websiteId,
-                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();
-                }
-                else {
-                    Ext.Msg.alert('Error', 'Error securing menu item');
-                }
-            },
-            failure:function (response) {
-                self.clearWindowStatus();
-                Ext.Msg.alert('Error', 'Error securing menu item');
-            }
-        });
-    },
-
     selectWebsite:function (websiteId) {
         var node = this.sitesTree.getStore().getNodeById("website_" + websiteId);
         if (node.data.iconCls != 'icon-globe') {
@@ -394,13 +360,18 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
                 },
                 {
                     name:'roles'
+                },
+                {
+                    name:'useMarkdown'
                 }
             ],
             listeners:{
                 'load':function(store, node, records){
-                  var websiteId = records[0].id.split('_')[1];
-                  var westRegion = Ext.ComponentQuery.query('#knitkitWestRegion').first();
-                  westRegion.selectWebsite(websiteId);
+                  if(records.length > 0){
+					var websiteId = records[0].id.split('_')[1];
+                  		westRegion = Ext.ComponentQuery.query('#knitkitWestRegion').first();
+                  	westRegion.selectWebsite(websiteId);
+				  }	
                 }
             }
         });
@@ -500,7 +471,26 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion", {
                         webNavigator.createWindow(record.data['url']);
                     }
                     else if (record.data['isDocument']) {
-                        self.initialConfig['centerRegion'].editContent(record.data['contentInfo'].title, record.data['contentInfo'].id, record.data['contentInfo'].body_html, record.data['siteId'], 'article');
+                        var contentInfo = record.data['contentInfo'];
+                        if(record.data['useMarkdown']){
+                            self.initialConfig['centerRegion'].editDocumentationMarkdown(
+                                contentInfo.title,
+                                record.data['siteId'],
+                                contentInfo.id,
+                                contentInfo.body_html,
+                                []
+                            );
+                        }
+                        else{
+                            self.initialConfig['centerRegion'].editContent(
+                                record.data['contentInfo'].title,
+                                record.data['contentInfo'].id,
+                                record.data['contentInfo'].body_html,
+                                record.data['siteId'],
+                                'article'
+                            );
+                        }
+
                     }
                 },
                 'itemcontextmenu':function (view, record, htmlItem, index, e) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knitkit
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_forms
@@ -107,6 +107,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.3.3
+- !ruby/object:Gem::Dependency
+  name: github-markdown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: Knitkit is CompassAE's content and digital asset management application.
   It is based on ideas and code adapted from Mephisto and adva_cms, with significant
   changes to integrate with the CompassAE object-relational layer and to harmonize
@@ -161,7 +177,6 @@ files:
 - public/stylesheets/datepicker.css
 - public/stylesheets/erp_app/desktop/applications/knitkit/knitkit.css
 - public/stylesheets/extjs/resources/css/knitkit_extjs_4.css
-- public/stylesheets/knitkit/documentation.css
 - public/stylesheets/knitkit/inline_editing.css
 - public/stylesheets/knitkit/style.css
 - app/assets/javascripts/knitkit/application.js
@@ -301,6 +316,7 @@ files:
 - db/data_migrations/20120809020508_update_website_and_configuration.rb
 - db/data_migrations/20121129185611_upgrade_website_role_iid.rb
 - db/migrate/20110211002317_setup_knitkit.rb
+- db/migrate/20130405184234_add_use_markdown_to_section.rb
 - lib/knitkit/config.rb
 - lib/knitkit/engine.rb
 - lib/knitkit/extensions/action_controller/theme_support/acts_as_themed_controller.rb

data/public/stylesheets/knitkit/documentation.css

@@ -1,50 +0,0 @@
-html, body { height: 100%; }
-
-#main{
-	min-height: 100%;
-}
-
-#document_content{ 
-	margin: 0 auto 0 auto;
-	width: 897px;
-	padding: 10px 22px 62px 22px;
-	background: #FFF url(../../images/knitkit/content.png) repeat-y;*/
-}
-
-#footer{
-	position: relative;
-	margin-top: -62px;
-	clear: both;
-	height: 62px;
-}
-
-/*Opera Fix*/
-body:before {
-	content: "";
-	height: 100%;
-	float: left;
-	width: 0;
-	margin-top: -32767px;/
-}
-
-/* this corrects a rendering issue */
-#menubar ul li a
-{
-	-moz-box-sizing:content-box;
-	-ms-box-sizing:content-box;
-	-webkit-box-sizing:content-box;
-	box-sizing:content-box;
-}
-
-::-webkit-scrollbar {  
-    height: 1ex;
-		width: 6px;
-		-webkit-border-radius: 1ex; 
-		background: #FFF;
-}
-  
-::-webkit-scrollbar-thumb:vertical{  
-    background: rgba(0, 0, 0, .2);
-		-webkit-border-radius: 1ex;  
-}
-