knitkit 2.0.5 → 2.0.6

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

@@ -39,11 +39,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.EastRegion",{
   
     constructor : function(config) {
         config = Ext.apply({
-            id:'knitkitEastRegion',
+            itemId:'knitkitEastRegion',
             region:'east',
             width:300,
             split:true,
-            autoDestroy:true,
             collapsible:true
         }, config);
 

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

@@ -39,13 +39,16 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
   };
 
   this.sharedFileAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
+    loadMask: true,
+    collapsible:false,
     title:'Shared',
+    rootText:'Shared Files',    
     allowDownload:false,
     addViewContentsToContextMenu:false,
     rootVisible:true,
+    multiSelect:true,
     controllerPath:'/knitkit/erp_app/desktop/file_assets/shared',
     standardUploadUrl:'/knitkit/erp_app/desktop/file_assets/shared/upload_file',
-    xhrUploadUrl:'/knitkit/erp_app/desktop/file_assets/shared/upload_file',
     url:'/knitkit/erp_app/desktop/file_assets/shared/expand_directory',
     containerScroll: true,
     additionalContextMenuItems:[{
@@ -56,7 +59,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
         scope:self,
         'click':function(){
           var node = this.sharedFileAssetsTreePanel.selectedNode;
-          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+          Ext.Msg.alert('Details', 'Filename: '+node.data.text +
+                                   '<br /> URL: '+node.data.url +
+                                   '<br /> Size: ' + node.data.size + ' bytes'
+                        );
         }
       }
     },
@@ -70,7 +76,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.sharedFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
             }
           });
         }
@@ -86,7 +92,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.sharedFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
             }
           });
         }
@@ -102,7 +108,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.sharedFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
             }
           });
         }
@@ -147,14 +153,16 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
   });
 
   this.websiteFileAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
+    loadMask: true,
+    collapsible:false,
     autoLoadRoot:false,
     title:'Website',
     allowDownload:false,
     addViewContentsToContextMenu:false,
     rootVisible:true,
+    multiSelect:true,
     controllerPath:'/knitkit/erp_app/desktop/file_assets/website',
     standardUploadUrl:'/knitkit/erp_app/desktop/file_assets/website/upload_file',
-    xhrUploadUrl:'/knitkit/erp_app/desktop/file_assets/website/upload_file',
     url:'/knitkit/erp_app/desktop/file_assets/website/expand_directory',
     containerScroll: true,
     additionalContextMenuItems:[{
@@ -165,7 +173,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
         scope:self,
         'click':function(){
           var node = this.websiteFileAssetsTreePanel.selectedNode;
-          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+          Ext.Msg.alert('Details', 'Filename: '+node.data.text +
+                                   '<br /> URL: '+node.data.url +
+                                   '<br /> Size: ' + node.data.size + ' bytes'
+                        );
         }
       }
     },
@@ -179,7 +190,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.websiteFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
             }
           });
         }
@@ -195,7 +206,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.websiteFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
             }
           });
         }
@@ -211,7 +222,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.websiteFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
             }
           });
         }
@@ -231,6 +242,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
     }],
     listeners:{
       scope:self,
+      'load':function(store, node, records){
+        store.getRootNode().data.text = self.websiteName;
+        self.websiteFileAssetsTreePanel.view.refresh();
+      },        
       'show': function(){
         self.reloadWebsiteFileAssetsTreePanel(self.websiteId);
       },
@@ -275,15 +290,14 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
     })
   });
 
-  this.selectWebsite = function(websiteId){
+  this.selectWebsite = function(websiteId, websiteName){
     this.websiteId = websiteId;
-    this.reloadWebsiteFileAssetsTreePanel(websiteId);
+    this.websiteName = websiteName;
   }
 
   this.reloadWebsiteFileAssetsTreePanel = function(websiteId){
     this.websiteFileAssetsTreePanel.extraPostData = {
-      website_id:websiteId,
-      websiteid:websiteId // for xhrFileUpload to work
+      website_id:websiteId
     };
     this.websiteFileAssetsTreePanel.getStore().setProxy({
       type: 'ajax',
@@ -292,6 +306,16 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
         website_id:websiteId
       }
     });
-    this.websiteFileAssetsTreePanel.getStore().load();
+
+    if (websiteId){
+      while (delNode = this.websiteFileAssetsTreePanel.getRootNode().childNodes[0]) {
+        this.websiteFileAssetsTreePanel.getRootNode().removeChild(delNode);
+      }
+      this.websiteFileAssetsTreePanel.getRootNode().expand();
+
+      if (!this.websiteFileAssetsTreePanel.getStore().isLoading()){
+        this.websiteFileAssetsTreePanel.getStore().load();
+      }
+    }
   }
 }

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

@@ -21,7 +21,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView",{
       tpl: new Ext.XTemplate(
         '<tpl for=".">',
         '<div class="thumb-wrap" id="{name}">',
-        '<div class="thumb"><img src="{url}" alt="{name}" class="thumb-img"></div>',
+        '<div class="thumb"><img src="{url}" title="{name}" alt="{name}" class="thumb-img"></div>',
         '<span>{shortName}</span></div>',
         '</tpl>')
     }, config);

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

@@ -12,90 +12,49 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
 
   this.sharedImageAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
     region:'north',
-    rootText:'Images',
-    collapsible:true,
+    rootText:'Shared Images',
+    collapsible:false,
     allowDownload:false,
     addViewContentsToContextMenu:false,
     rootVisible:true,
+    multiSelect:true,
     controllerPath:'/knitkit/erp_app/desktop/image_assets/shared',
     standardUploadUrl:'/knitkit/erp_app/desktop/image_assets/shared/upload_file',
-    xhrUploadUrl:'/knitkit/erp_app/desktop/image_assets/shared/upload_file',
     url:'/knitkit/erp_app/desktop/image_assets/shared/expand_directory',
     containerScroll: true,
     height:200,
-    additionalContextMenuItems:[{
-      nodeType:'leaf',
-      text:'View Details',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.sharedImageAssetsTreePanel.selectedNode;
-          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
-        }
-      }
-    },
+    additionalContextMenuItems:[
     {
       nodeType:'leaf',
-      text:'Insert link at cursor',
+      text:'Insert image at cursor',
       iconCls:'icon-add',
       listeners:{
         scope:self,
         'click':function(){
           var node = this.sharedImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
-            }
-          });
+          var imgTagHtml = '<img';
+		  if(!Ext.isEmpty(node.data.width) && !Ext.isEmpty(node.data.height)){
+		    imgTagHtml += (' width="'+node.data.width+'" height="'+node.data.height+'"');
+		  }
+		  imgTagHtml += ' alt="'+node.data.text+'" src="/download/'+node.data.text+'?path='+node.data.downloadPath+'" />'
+		  self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror(imgTagHtml);
         }
       }
-    },
-    {
-      nodeType:'leaf',
-      text:'Insert link at cursor (inline)',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.sharedImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
-            }
+    }
+    ],
+    listeners:{
+     'allowdelete':function(){
+          return currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'GlobalImageAsset'
           });
-        }
-      }
-    },
-    {
-      nodeType:'leaf',
-      text:'Insert link at cursor (prompt)',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.sharedImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
-            }
+      },
+      'allowupload':function(){
+          return currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'upload',
+              resource:'GlobalImageAsset'
           });
-        }
-      }
-    }],
-    listeners:{
-           'allowdelete':function(){
-                return currentUser.hasApplicationCapability('knitkit', {
-                    capability_type_iid:'delete',
-                    resource:'GlobalImageAsset'
-                });
-            },
-            'allowupload':function(){
-                return currentUser.hasApplicationCapability('knitkit', {
-                    capability_type_iid:'upload',
-                    resource:'GlobalImageAsset'
-                });
-            },
+      },
       'itemclick':function(view, record, item, index, e){
         e.stopEvent();
         if(!record.data["leaf"]){
@@ -112,11 +71,19 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
       },
       'fileDeleted':function(fileTreePanel, node){
         var store = self.sharedImageAssetsDataView.getStore();
-        store.load();
+        store.load({
+          params:{
+            directory:node.data.downloadPath
+          }
+        });
       },
       'fileUploaded':function(fileTreePanel, node){
         var store = self.sharedImageAssetsDataView.getStore();
-        store.load();
+        store.load({
+          params:{
+            directory:node.data.id
+          }
+        });
       },
       'downloadfile':function(fileTreePanel, node){
         window.open("/download/"+node.data.text+"?path=" + node.data.downloadPath+'&disposition=attachment','mywindow','width=400,height=200');
@@ -129,77 +96,40 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
     autoLoadRoot:false,
     region:'north',
     rootText:'Images',
-    collapsible:true,
+    collapsible:false,
     allowDownload:false,
     addViewContentsToContextMenu:false,
     rootVisible:true,
+    multiSelect:true,
     controllerPath:'/knitkit/erp_app/desktop/image_assets/website',
     standardUploadUrl:'/knitkit/erp_app/desktop/image_assets/website/upload_file',
-    xhrUploadUrl:'/knitkit/erp_app/desktop/image_assets/website/upload_file',
     url:'/knitkit/erp_app/desktop/image_assets/website/expand_directory',
     containerScroll: true,
     height:200,
-    additionalContextMenuItems:[{
-      nodeType:'leaf',
-      text:'View Details',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.websiteImageAssetsTreePanel.selectedNode;
-          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
-        }
-      }
-    },
-    {
-      nodeType:'leaf',
-      text:'Insert link at cursor',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.websiteImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
-            }
-          });
-        }
-      }
-    },
+    additionalContextMenuItems:[
     {
       nodeType:'leaf',
-      text:'Insert link at cursor (inline)',
+      text:'Insert image at cursor',
       iconCls:'icon-add',
       listeners:{
         scope:self,
         'click':function(){
           var node = this.websiteImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
-            }
-          });
-        }
-      }
-    },
-    {
-      nodeType:'leaf',
-      text:'Insert link at cursor (prompt)',
-      iconCls:'icon-add',
-      listeners:{
-        scope:self,
-        'click':function(){
-          var node = this.websiteImageAssetsTreePanel.selectedNode;
-          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
-            if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
-            }
-          });
+          var imgTagHtml = '<img';
+		  if(!Ext.isEmpty(node.data.width) && !Ext.isEmpty(node.data.height)){
+		    imgTagHtml += (' width="'+node.data.width+'" height="'+node.data.height+'"');
+		  }
+		  imgTagHtml += ' alt="'+node.data.text+'" src="/download/'+node.data.text+'?path='+node.data.downloadPath+'" />'
+		  self.module.centerRegion.insertHtmlIntoActiveCkEditorOrCodemirror(imgTagHtml);
         }
       }
-    }],
+    }
+    ],
     listeners:{
+      'load':function(store, node, records){
+        store.getRootNode().data.text = self.websiteName;
+        self.websiteImageAssetsTreePanel.view.refresh();
+      },        
       'itemclick':function(view, record, item, index, e){
         if(self.websiteId != null){
           e.stopEvent();
@@ -220,7 +150,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
       'fileDeleted':function(fileTreePanel, node){
         self.websiteImageAssetsDataView.getStore().load({
           params:{
-            directory:node.data.id,
+            directory:node.data.downloadPath,
             website_id:self.websiteId
           }
         });
@@ -301,14 +231,14 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
     })
   });
 
-  this.selectWebsite = function(websiteId){
+  this.selectWebsite = function(websiteId, websiteName){
     this.websiteId = websiteId;
+    this.websiteName = websiteName;
   }
 
   this.reloadWebsiteImageAssetsTreePanel = function(websiteId){
     this.websiteImageAssetsTreePanel.extraPostData = {
-      website_id:websiteId,
-      websiteid:websiteId // for xhrFileUpload to work      
+      website_id:websiteId
     };
     this.websiteImageAssetsTreePanel.getStore().setProxy({
       type: 'ajax',
@@ -317,7 +247,16 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module)
         website_id:websiteId
       }
     });
-    this.websiteImageAssetsTreePanel.getStore().load();
-    this.websiteImageAssetsDataView.getStore().removeAll();
+
+    if (websiteId){
+      while (delNode = this.websiteImageAssetsTreePanel.getRootNode().childNodes[0]) {
+        this.websiteImageAssetsTreePanel.getRootNode().removeChild(delNode);
+      }
+      this.websiteImageAssetsTreePanel.getRootNode().expand();
+
+      if (!this.websiteImageAssetsTreePanel.getStore().isLoading()){
+        this.websiteImageAssetsTreePanel.getStore().load();
+      }      
+    }
   }
 }