knitkit 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f3ceea0007821006cbca76128f3c66aea5eff0
-  data.tar.gz: 391fe91b89b348a7700d28f9764c959a8028d8d0
+  metadata.gz: a9519e8e75b013f60179c1b6e027d8256aae8657
+  data.tar.gz: 29965c46fb5fd3b235e17aa45c53d43082809f59
 SHA512:
-  metadata.gz: 21e28ca0baca8b9f90e040a47ffa9a68f6279b3b3970b3c50463894933aaa830b622140c7146175f5b9369aee14b526778b1e5fd9e6c2b8414d3316b04140ffc
-  data.tar.gz: 73a2a52a625f305e5382ed4131e471839e81ce5fd844e1cc7ea8aad4b9fbb5e5d0e3dea631f298e5f870f3e01231c4ddf9eb6457a9c3d5a54a3519090f5fc8f3
+  metadata.gz: 2b2d4d334fd89d292716c1f88e47ef81074a0949103de7ef7c8a8c6ac1a4b1d2ce31448ed20acb59a7517dd967c22649e1e754b681ddacb86b6ba27370efa523
+  data.tar.gz: 88b683d037a27785f13ebf4e5b117e5f843824c42c170b99e09f95081d66f4fc690b56991827037edf29c558db2a4f72ced52ec02feb15b9082d9dd18d2bd1f8

data/app/assets/javascripts/erp_app/desktop/applications/knitkit/app.js

@@ -0,0 +1,24 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require ./module
+//= require ./articles_grid_panel
+//= require ./center_region
+//= require ./comments_grid_panel
+//= require ./inquiries_grid_panel
+//= require ./publish_window
+//= require ./published_grid_panel
+//= require ./splash_screen
+//= require ./versions_grid_panel
+//= require_tree ./east_region
+//= require_tree ./top_menu
+//= require_tree ./west_region

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/articles_grid_panel.js

@@ -29,11 +29,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
 
     editArticle: function (record) {
         var self = this;
-        var itemId = 'editArticle-' + record.get('id');
+        var itemId = 'editArticle-' + record.get('recordId');
         var editArticleWindow = Ext.ComponentQuery.query('#' + itemId).first();
 
         if (Compass.ErpApp.Utility.isBlank(editArticleWindow)) {
-            var editArticleWindow = Ext.create("Ext.window.Window", {
+            editArticleWindow = Ext.create("Ext.window.Window", {
                 layout: 'fit',
                 width: 375,
                 title: 'Edit Article',
@@ -110,7 +110,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                             allowBlank: false,
                             name: 'id',
                             itemId: 'record_id',
-                            value: record.data.id
+                            value: record.get('recordId')
                         }
                     ]
                 },
@@ -233,7 +233,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                     flex: 1,
                     items: [
                         {
-                            icon: '/images/icons/edit/edit_16x16.png',
+                            icon: '/assets/icons/edit/edit_16x16.png',
                             iconCls: 'actioncolumn_hover',
                             tooltip: 'Edit',
                             handler: function (grid, rowIndex, colIndex) {
@@ -255,7 +255,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                 flex: 1,
                 items: [
                     {
-                        icon: '/images/icons/document_text/document_text_16x16.png',
+                        icon: '/assets/icons/document/document_16x16.png',
                         iconCls: 'actioncolumn_hover',
                         tooltip: 'Comments',
                         handler: function (grid, rowIndex, colIndex) {
@@ -278,7 +278,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                     flex: 1,
                     items: [
                         {
-                            icon: '/images/icons/edit/edit_16x16.png',
+                            icon: '/assets/icons/edit/edit_16x16.png',
                             iconCls: 'actioncolumn_hover',
                             tooltip: 'Edit Excerpt',
                             handler: function (grid, rowIndex, colIndex) {
@@ -301,7 +301,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                 flex: 1,
                 items: [
                     {
-                        icon: '/images/icons/edit/edit_16x16.png',
+                        icon: '/assets/icons/edit/edit_16x16.png',
                         iconCls: 'actioncolumn_hover',
                         tooltip: 'Edit Content',
                         handler: function (grid, rowIndex, colIndex) {
@@ -324,7 +324,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                     flex: 1,
                     items: [
                         {
-                            icon: '/images/icons/delete/delete_16x16.png',
+                            icon: '/assets/icons/delete/delete_16x16.png',
                             iconCls: 'actioncolumn_hover',
                             tooltip: 'Delete',
                             handler: function (grid, rowIndex, colIndex) {
@@ -353,10 +353,12 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                     text: 'New Article',
                     iconCls: 'icon-add',
                     handler: function () {
-                        Ext.create('widget.window', {
+                        var addArticleWindow = Ext.create('widget.window', {
+                            modal: true,
                             title: 'New Article',
                             buttonAlign: 'center',
-                            items: new Ext.FormPanel({
+                            items: {
+                                xtype: 'form',
                                 labelWidth: 110,
                                 frame: false,
                                 bodyStyle: 'padding:5px 5px 0',
@@ -404,7 +406,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
                                         // id: 'tag_list'
                                     }
                                 ]
-                            }),
+                            },
                             buttons: [
                                 {
                                     text: 'Submit',
@@ -707,4 +709,5 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
 
         this.callParent([config]);
     }
-});
+})
+;

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/center_region.js

@@ -47,8 +47,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
 
     /* sections */
 
-    saveSectionLayout: function (id, comp, content) {
-        jcomp = comp;
+    saveSectionLayout: function (id, codeMirrorComp, content) {
         var self = this;
         this.setWindowStatus('Saving...');
         Ext.Ajax.request({
@@ -71,7 +70,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 else {
                     Ext.Msg.alert('Error', obj.message);
                 }
-                comp.codeMirrorInstance.focus();
+
+                codeMirrorComp.focus();
             },
             failure: function (response) {
                 self.clearWindowStatus();
@@ -90,8 +90,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 layout: 'border',
                 title: sectionName,
                 save: function (comp) {
-                    var content = comp.down('codemirror').getValue();
-                    self.saveSectionLayout(websiteSectionId, comp, content);
+                    var codeMirrorComp = comp.down('codemirror');
+                    var content = codeMirrorComp.getValue();
+                    self.saveSectionLayout(websiteSectionId, codeMirrorComp, content);
                 },
                 closable: true,
                 itemId: itemId,
@@ -101,8 +102,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         tbarItems: tbarItems,
                         disableSave: true,
                         listeners: {
-                            save: function (comp, content) {
-                                self.saveSectionLayout(websiteSectionId, comp, content);
+                            save: function (codeMirrorComp, content) {
+                                self.saveSectionLayout(websiteSectionId, codeMirrorComp, content);
                             }
                         },
                         xtype: 'codemirror',
@@ -230,7 +231,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 if (!obj.success) {
                     Ext.Msg.alert('Error', obj.message);
                 }
-                comp.codeMirrorInstance.focus();
+
+                comp.focus();
             },
             failure: function (response) {
                 self.clearWindowStatus();
@@ -266,8 +268,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 itemId: itemId,
                 layout: 'fit',
                 save: function (comp) {
-                    var content = comp.down('codemirror').getValue();
-                    self.saveTemplateFile(node.data.id, comp, content);
+                    var codeMirrorComp = comp.down('codemirror');
+                    var content = codeMirrorComp.getValue();
+                    self.saveTemplateFile(node.data.id, codeMirrorComp, content);
                 },
                 items: [
                     {
@@ -275,8 +278,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         disableSave: true,
                         xtype: 'codemirror',
                         listeners: {
-                            save: function (comp, content) {
-                                self.saveTemplateFile(node.data.id, comp, content);
+                            save: function (codeMirrorComp, content) {
+                                self.saveTemplateFile(node.data.id, codeMirrorComp, content);
                             }
                         },
                         mode: mode,
@@ -342,7 +345,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         if (Compass.ErpApp.Utility.isBlank(item)) {
             var ckEditor = Ext.create("Compass.ErpApp.Shared.CKeditor", {
                 autoHeight: true,
-                //value:content,
                 ckEditorConfig: {
                     extraPlugins: self.ckEditorExtraPlugins,
                     toolbar: self.ckEditorToolbar
@@ -356,7 +358,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         var dataTransfer = dropEvent.dataTransfer;
                         var files = dataTransfer.files;
                         for (var i = 0; i < files.length; i++) {
-                            var loadMask = new Ext.LoadMask(ckeditorPanel, {msg:"Please wait..."});
+                            var loadMask = new Ext.LoadMask(ckeditorPanel, {msg: "Please wait..."});
                             loadMask.show();
 
                             var file = files[i];
@@ -369,35 +371,35 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                                     headers: {'Content-Type': file.type},
                                     url: '/knitkit/erp_app/desktop/image_assets/shared/upload_file',
                                     jsonData: bin,
-                                    params:{
+                                    params: {
                                         name: file.name,
                                         directory: 'root_node',
                                         is_drag_drop: true
                                     },
-                                    success: function(result){
+                                    success: function (result) {
                                         loadMask.hide();
                                         resultObj = Ext.JSON.decode(result.responseText);
-                                        if(resultObj.success){
-                                            ckeditorPanel.insertHtml('<img src='+resultObj.url+' height="200" width="200" />');
+                                        if (resultObj.success) {
+                                            ckeditorPanel.insertHtml('<img src=' + resultObj.url + ' height="200" width="200" />');
                                             var sharedImageAssetsDataView = self.up('#knitkit').down('knitkit_ImageAssetsPanel').sharedImageAssetsDataView,
                                                 sharedImageAssetsTreePanel = self.up('#knitkit').down('knitkit_ImageAssetsPanel').sharedImageAssetsTreePanel;
 
                                             sharedImageAssetsDataView.getStore().load({
-                                                params:{
+                                                params: {
                                                     directory: sharedImageAssetsDataView.directory
                                                 }
                                             });
                                             sharedImageAssetsTreePanel.getStore().load({
-                                                callback:function(){
+                                                callback: function () {
                                                     sharedImageAssetsTreePanel.getView().refresh();
                                                 }
                                             });
                                         }
-                                        else{
+                                        else {
                                             Ext.Msg.alert('Error', 'Could not upload image');
                                         }
                                     },
-                                    failure: function(result){
+                                    failure: function (result) {
                                         loadMask.hide();
                                         Ext.Msg.alert('Error', 'Could not upload image');
                                     }
@@ -468,6 +470,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         }
 
         this.workArea.setActiveTab(item);
+
     },
 
     /* image */
@@ -476,7 +479,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         var self = this;
         var fileName = node.data.id.split('/').pop().split('.')[0];
         var fileType = node.data.id.split('.').pop();
-        var itemId = fileName + themeId;
+        var itemId = Compass.ErpApp.Utility.Encryption.MD5(node.data.id);
         var item = this.workArea.query('#' + itemId).first();
 
         if (Compass.ErpApp.Utility.isBlank(item)) {
@@ -488,10 +491,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 html: '<img src="' + node.data.url + '" />'
             });
 
-            this.workArea.add(item);
+            self.workArea.add(item);
         }
 
-        this.workArea.setActiveTab(item);
+        self.workArea.setActiveTab(item);
         return false;
     },
 
@@ -561,14 +564,14 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         this.workArea.setActiveTab(item);
     },
 
-    openIframeInTab : function( title, url ) {
+    openIframeInTab: function (title, url) {
 
         var item = Ext.create('Ext.panel.Panel', {
-            iframeId:'themes_iframe',
+            iframeId: 'themes_iframe',
             closable: true,
             layout: 'fit',
             title: title,
-            html:'<iframe height="100%" width="100%" frameBorder="0" src="'+url+'"></iframe>'
+            html: '<iframe height="100%" width="100%" frameBorder="0" src="' + url + '"></iframe>'
         });
 
         this.workArea.add(item);
@@ -597,7 +600,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         var dataTransfer = dropEvent.dataTransfer;
                         var files = dataTransfer.files;
                         for (var i = 0; i < files.length; i++) {
-                            var loadMask = new Ext.LoadMask(ckeditorPanel, {msg:"Please wait..."});
+                            var loadMask = new Ext.LoadMask(ckeditorPanel, {msg: "Please wait..."});
                             loadMask.show();
 
                             var file = files[i];
@@ -610,35 +613,35 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                                     headers: {'Content-Type': file.type},
                                     url: '/knitkit/erp_app/desktop/image_assets/shared/upload_file',
                                     jsonData: bin,
-                                    params:{
+                                    params: {
                                         name: file.name,
                                         directory: 'root_node',
                                         is_drag_drop: true
                                     },
-                                    success: function(result){
+                                    success: function (result) {
                                         loadMask.hide();
                                         resultObj = Ext.JSON.decode(result.responseText);
-                                        if(resultObj.success){
-                                            ckeditorPanel.insertHtml('<img src='+resultObj.url+' height="200" width="200" />');
+                                        if (resultObj.success) {
+                                            ckeditorPanel.insertHtml('<img src=' + resultObj.url + ' height="200" width="200" />');
                                             var sharedImageAssetsDataView = self.up('#knitkit').down('knitkit_ImageAssetsPanel').sharedImageAssetsDataView,
                                                 sharedImageAssetsTreePanel = self.up('#knitkit').down('knitkit_ImageAssetsPanel').sharedImageAssetsTreePanel;
 
                                             sharedImageAssetsDataView.getStore().load({
-                                                params:{
+                                                params: {
                                                     directory: sharedImageAssetsDataView.directory
                                                 }
                                             });
                                             sharedImageAssetsTreePanel.getStore().load({
-                                                callback:function(){
+                                                callback: function () {
                                                     sharedImageAssetsTreePanel.getView().refresh();
                                                 }
                                             });
                                         }
-                                        else{
+                                        else {
                                             Ext.Msg.alert('Error', 'Could not upload image');
                                         }
                                     },
-                                    failure: function(result){
+                                    failure: function (result) {
                                         loadMask.hide();
                                         Ext.Msg.alert('Error', 'Could not upload image');
                                     }
@@ -719,7 +722,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         cardPanel.removeAll(true);
         cardPanel.add({
             xtype: 'panel',
-            html: comment
+            html: '<div style="padding:10px;">'+comment+'</div>'
         });
         cardPanel.getLayout().setActiveItem(0);
     },
@@ -858,10 +861,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 activeTab.query('codemirror')[0].insertContent(content);
             }
         }
-        return false;
-        this.workArea.add(item);
-
-        this.workArea.setActiveTab(item);
     },
 
     insertHtmlIntoActiveCkEditorOrCodemirror: function (html) {
@@ -913,16 +912,29 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         handler: function (item) {
                             currentItem.tab.setClosable(item.checked);
                         }
+                    },
+                    '-',
+                    {
+                        text: 'Enabled',
+                        checked: true,
+                        hideOnClick: true,
+                        handler: function (item) {
+                            currentItem.tab.setDisabled(!item.checked);
+                        }
                     }
                 ],
                 listeners: {
-                    aftermenu: function () {
-                        currentItem = null;
-                    },
                     beforemenu: function (menu, item) {
-                        var menuitem = menu.child('*[text="Closable"]');
+                        var enabled = menu.child('[text="Enabled"]');
+                        menu.child('[text="Closable"]').setChecked(item.closable);
+                        if (item.tab.active) {
+                            enabled.disable();
+                        } else {
+                            enabled.enable();
+                            enabled.setChecked(!item.tab.isDisabled());
+                        }
+
                         currentItem = item;
-                        menuitem.setChecked(item.closable);
                     }
                 }
             }),
@@ -932,6 +944,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 },
                 remove: function () {
                     this.smartRenameTabs();
+                },
+                tabchange: function (tabPanel, newPanel, oldPanel, eOpts) {
+                    // check if the panel has ckEditor
+                    var ckEditor = newPanel.down('ckeditor');
+                    if (ckEditor) {
+                        CKEDITOR.domReady(function () {
+                            ckEditor.ckEditorInstance.focus();
+                        });
+                    }
                 }
             },
 
@@ -996,4 +1017,4 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
 
         this.callParent([config]);
     }
-});
+});