knitkit 2.1.15 → 3.0.0

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

@@ -1,68 +1,57 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.addHostOptions = function (self, items, record) {
-    if (currentUser.hasCapability('edit','WebsiteHost')) {
+    if (currentUser.hasCapability('edit', 'WebsiteHost')) {
         items.push({
-            text:'Update',
-            iconCls:'icon-edit',
-            listeners:{
-                'click':function () {
-                    var updateHostWindow = Ext.create("Ext.window.Window", {
-                        layout:'fit',
-                        width:310,
-                        title:'Update Host',
-                        height:100,
-                        plain:true,
-                        buttonAlign:'center',
-                        items:Ext.create("Ext.form.Panel", {
-                            labelWidth:50,
-                            frame:false,
-                            bodyStyle:'padding:5px 5px 0',
-                            width:425,
-                            url:'/knitkit/erp_app/desktop/site/update_host',
-                            defaults:{
-                                width:225
+            text: 'Update',
+            iconCls: 'icon-edit',
+            listeners: {
+                'click': function () {
+                    Ext.create("Ext.window.Window", {
+                        title: 'Update Host',
+                        modal: true,
+                        buttonAlign: 'center',
+                        items: Ext.create("Ext.form.Panel", {
+                            labelWidth: 50,
+                            frame: false,
+                            bodyStyle: 'padding:5px 5px 0',
+                            url: '/knitkit/erp_app/desktop/website_host/' + record.data.websiteHostId,
+                            defaults: {
+                                width: 300
                             },
-                            items:[
+                            items: [
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Host',
-                                    id:'knitkitUpdateWebsiteHostHost',
-                                    name:'host',
-                                    value:record.data.host,
-                                    allowBlank:false
-                                },
-                                {
-                                    xtype:'hidden',
-                                    name:'id',
-                                    value:record.data.websiteHostId
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Host',
+                                    id: 'knitkitUpdateWebsiteHostHost',
+                                    name: 'host',
+                                    value: record.data.host,
+                                    allowBlank: false
                                 }
                             ]
                         }),
-                        buttons:[
+                        buttons: [
                             {
-                                text:'Submit',
-                                listeners:{
-                                    'click':function (button) {
+                                text: 'Submit',
+                                listeners: {
+                                    'click': function (button) {
                                         var window = button.findParentByType('window');
                                         var formPanel = window.query('form')[0];
-                                        self.setWindowStatus('Updating Host...');
+
                                         formPanel.getForm().submit({
-                                            reset:false,
-                                            success:function (form, action) {
-                                                self.clearWindowStatus();
+                                            method: 'PUT',
+                                            waitMsg: 'Please wait...',
+                                            success: function (form, action) {
                                                 var obj = Ext.decode(action.response.responseText);
                                                 if (obj.success) {
                                                     var newHost = Ext.getCmp('knitkitUpdateWebsiteHostHost').getValue();
                                                     record.set('host', newHost);
                                                     record.set('text', newHost);
-                                                    record.commit();
-                                                    updateHostWindow.close();
+                                                    window.close();
                                                 }
                                                 else {
                                                     Ext.Msg.alert("Error", obj.msg);
                                                 }
                                             },
-                                            failure:function (form, action) {
-                                                self.clearWindowStatus();
+                                            failure: function (form, action) {
                                                 Ext.Msg.alert("Error", "Error updating Host");
                                             }
                                         });
@@ -70,49 +59,43 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addHostOptions = function (self, ite
                                 }
                             },
                             {
-                                text:'Close',
-                                handler:function () {
-                                    updateHostWindow.close();
+                                text: 'Close',
+                                handler: function (btn) {
+                                    btn.up('window').close();
                                 }
                             }
                         ]
-                    });
-                    updateHostWindow.show();
+                    }).show();
                 }
             }
         });
     }
 
-    if (currentUser.hasCapability('delete','WebsiteHost')) {
+    if (currentUser.hasCapability('delete', 'WebsiteHost')) {
         items.push({
-            text:'Delete',
-            iconCls:'icon-delete',
-            listeners:{
-                'click':function () {
+            text: 'Delete',
+            iconCls: 'icon-delete',
+            listeners: {
+                'click': function () {
                     Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this Host?', function (btn) {
                         if (btn == 'no') {
                             return false;
                         }
                         else if (btn == 'yes') {
-                            self.setWindowStatus('Deleting Host...');
+
                             Ext.Ajax.request({
-                                url:'/knitkit/erp_app/desktop/site/delete_host',
-                                method:'POST',
-                                params:{
-                                    id:record.data.websiteHostId
-                                },
-                                success:function (response) {
-                                    self.clearWindowStatus();
+                                url: '/knitkit/erp_app/desktop/website_host/' + record.data.websiteHostId,
+                                method: 'DELETE',
+                                success: function (response) {
                                     var obj = Ext.decode(response.responseText);
                                     if (obj.success) {
-                                        record.remove(true);
+                                        record.remove();
                                     }
                                     else {
                                         Ext.Msg.alert('Error', 'Error deleting Host');
                                     }
                                 },
-                                failure:function (response) {
-                                    self.clearWindowStatus();
+                                failure: function (response) {
                                     Ext.Msg.alert('Error', 'Error deleting Host');
                                 }
                             });

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

@@ -1,51 +1,53 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.addMenuOptions = function (self, items, record) {
+    var websiteId = compassDesktop.getModule('knitkit-win').currentWebsite.id;
+
     if (record.data['canAddMenuItems']) {
-        if (currentUser.hasCapability('create','WebsiteNavItem')) {
+        if (currentUser.hasCapability('create', 'WebsiteNavItem')) {
+
             items.push({
-                text:'Add Menu Item',
-                iconCls:'icon-add',
-                handler:function (btn) {
-                    var addMenuItemWindow = Ext.create("Ext.window.Window", {
-                        layout:'fit',
-                        width:375,
-                        title:'New Menu Item',
-                        height:175,
-                        plain:true,
-                        buttonAlign:'center',
-                        items:Ext.create('Ext.form.Panel', {
-                            labelWidth:50,
-                            frame:false,
-                            bodyStyle:'padding:5px 5px 0',
-                            url:'/knitkit/erp_app/desktop/website_nav/add_menu_item',
-                            defaults:{
-                                width:225
+                text: 'Add Menu Item',
+                iconCls: 'icon-add',
+                handler: function (btn) {
+                    Ext.create("Ext.window.Window", {
+                        title: 'New Menu Item',
+                        modal: true,
+                        buttonAlign: 'center',
+                        items: Ext.create('Ext.form.Panel', {
+                            labelWidth: 50,
+                            frame: false,
+                            bodyStyle: 'padding:5px 5px 0',
+                            url: '/knitkit/erp_app/desktop/website_nav_item',
+                            defaults: {
+                                width: 375
                             },
-                            items:[
+                            items: [
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Title',
-                                    allowBlank:false,
-                                    name:'title'
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Title',
+                                    width: 320,
+                                    allowBlank: false,
+                                    name: 'title'
                                 },
                                 {
-                                    xtype:'combo',
-                                    fieldLabel:'Link to',
-                                    name:'link_to',
-                                    id:'knitkit_nav_item_link_to',
-                                    allowBlank:false,
-                                    forceSelection:true,
-                                    editable:false,
-                                    autoSelect:true,
-                                    typeAhead:false,
-                                    mode:'local',
-                                    triggerAction:'all',
-                                    store:[
+                                    xtype: 'combo',
+                                    fieldLabel: 'Link to',
+                                    width: 320,
+                                    name: 'link_to',
+                                    id: 'knitkit_nav_item_link_to',
+                                    allowBlank: false,
+                                    forceSelection: true,
+                                    editable: false,
+                                    autoSelect: true,
+                                    typeAhead: false,
+                                    mode: 'local',
+                                    triggerAction: 'all',
+                                    store: [
                                         ['website_section', 'Section'],
                                         ['url', 'Url']
                                     ],
-                                    value:'website_section',
-                                    listeners:{
-                                        'change':function (combo, newValue, oldValue) {
+                                    value: 'website_section',
+                                    listeners: {
+                                        'change': function (combo, newValue, oldValue) {
                                             switch (newValue) {
                                                 case 'website_section':
                                                     Ext.getCmp('knitkit_create_website_nav_item_section').show();
@@ -60,87 +62,85 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addMenuOptions = function (self, ite
                                     }
                                 },
                                 {
-                                    xtype:'combo',
-                                    id:'knitkit_create_website_nav_item_section',
-                                    hiddenName:'website_section_id',
-                                    name:'website_section_id',
-                                    width:300,
-                                    loadingText:'Retrieving Sections...',
-                                    store:Ext.create("Ext.data.Store", {
-                                        proxy:{
-                                            type:'ajax',
-                                            url:'/knitkit/erp_app/desktop/section/existing_sections',
-                                            reader:{
-                                                type:'json'
+                                    xtype: 'combo',
+                                    id: 'knitkit_create_website_nav_item_section',
+                                    hiddenName: 'website_section_id',
+                                    name: 'website_section_id',
+                                    width: 320,
+                                    loadingText: 'Retrieving Sections...',
+                                    store: Ext.create("Ext.data.Store", {
+                                        proxy: {
+                                            type: 'ajax',
+                                            url: '/knitkit/erp_app/desktop/section/existing_sections',
+                                            reader: {
+                                                type: 'json'
                                             },
-                                            extraParams:{
-                                                website_id:record.data.websiteId
+                                            extraParams: {
+                                                website_id: websiteId
                                             }
                                         },
-                                        autoLoad:true,
-                                        fields:[
+                                        autoLoad: true,
+                                        fields: [
                                             {
-                                                name:'id'
+                                                name: 'id'
                                             },
                                             {
-                                                name:'title_permalink'
+                                                name: 'title_permalink'
 
                                             }
                                         ]
                                     }),
-                                    forceSelection:true,
-                                    editable:false,
-                                    fieldLabel:'Section',
-                                    autoSelect:true,
-                                    typeAhead:false,
-                                    mode:'local',
-                                    displayField:'title_permalink',
-                                    valueField:'id',
-
-                                    triggerAction:'all'
+                                    forceSelection: true,
+                                    editable: false,
+                                    fieldLabel: 'Section',
+                                    autoSelect: true,
+                                    typeAhead: false,
+                                    mode: 'local',
+                                    displayField: 'title_permalink',
+                                    valueField: 'id',
+                                    triggerAction: 'all'
                                 },
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Url',
-                                    id:'knitkit_create_website_nav_item_url',
-                                    hidden:true,
-                                    name:'url'
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Url',
+                                    id: 'knitkit_create_website_nav_item_url',
+                                    hidden: true,
+                                    name: 'url'
                                 },
                                 {
-                                    xtype:'hidden',
-                                    name:'klass',
-                                    value:((record.data['websiteNavId']) ? 'WebsiteNav' : 'WebsiteNavItem')
+                                    xtype: 'hidden',
+                                    name: 'klass',
+                                    value: ((record.data['isWebsiteNav']) ? 'WebsiteNav' : 'WebsiteNavItem')
                                 },
                                 {
-                                    xtype:'hidden',
-                                    name:'id',
-                                    value:record.data['websiteNavId'] || record.data['websiteNavItemId']
+                                    xtype: 'hidden',
+                                    name: 'parent_id',
+                                    value: ((record.data['isWebsiteNav']) ? record.data['websiteNavId'] : record.data['websiteNavItemId'])
                                 }
                             ]
                         }),
-                        buttons:[
+                        buttons: [
                             {
-                                text:'Submit',
-                                listeners:{
-                                    'click':function (button) {
+                                text: 'Submit',
+                                listeners: {
+                                    'click': function (button) {
                                         var window = button.findParentByType('window'),
-                                        	formPanel = window.query('form')[0];
-                                        self.setWindowStatus('Creating menu item...');
+                                            formPanel = window.query('form')[0];
+
                                         formPanel.getForm().submit({
-                                            reset:true,
-                                            success:function (form, action) {
-                                                self.clearWindowStatus();
+                                            waitMsg: 'Please wait...',
+                                            success: function (form, action) {
                                                 var obj = Ext.decode(action.response.responseText);
                                                 if (obj.success) {
                                                     record.appendChild(obj.node);
+                                                    record.expand();
+                                                    window.close();
                                                 }
                                                 else {
                                                     Ext.Msg.alert("Error", obj.msg);
                                                 }
-												window.close();
                                             },
-                                            failure:function (form, action) {
-                                                self.clearWindowStatus();
+                                            failure: function (form, action) {
                                                 if (action.response === null) {
                                                     Ext.Msg.alert("Error", 'Could not create menu item');
                                                 }
@@ -155,14 +155,13 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addMenuOptions = function (self, ite
                                 }
                             },
                             {
-                                text:'Close',
-                                handler:function () {
-                                    addMenuItemWindow.close();
+                                text: 'Close',
+                                handler: function (btn) {
+                                    btn.up('window').close();
                                 }
                             }
                         ]
-                    });
-                    addMenuItemWindow.show();
+                    }).show();
                 }
             });
         }

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

@@ -1,146 +1,438 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self, items, record) {
+    var sectionId = record.data.id.split('_')[1];
+
     items.push({
-        text:'View Articles',
-        iconCls:'icon-document',
-        listeners:{
-            'click':function () {
-                self.getArticles(record);
+        text: 'Add Article',
+        iconCls: 'icon-document',
+        listeners: {
+            'click': function () {
+
+                var addFormItems = [
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Title',
+                        allowBlank: false,
+                        name: 'title'
+                    },
+                    {
+                        xtype: 'radiogroup',
+                        fieldLabel: 'Display title?',
+                        name: 'display_title',
+                        columns: 2,
+                        items: [
+                            {
+                                boxLabel: 'Yes',
+                                name: 'display_title',
+                                inputValue: 'yes',
+                                checked: true
+                            },
+
+                            {
+                                boxLabel: 'No',
+                                name: 'display_title',
+                                inputValue: 'no'
+                            }
+                        ]
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Content Area',
+                        allowBlank: true,
+                        name: 'content_area'
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Tags',
+                        allowBlank: true,
+                        name: 'tags'
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Internal ID',
+                        allowBlank: true,
+                        name: 'internal_identifier'
+                    }
+                ];
+
+                Ext.widget('window', {
+                    layout: 'fit',
+                    modal: true,
+                    width: 375,
+                    title: 'Create New Article',
+                    plain: true,
+                    buttonAlign: 'center',
+                    items: {
+                        xtype: 'form',
+                        labelWidth: 110,
+                        frame: false,
+                        bodyStyle: 'padding:5px 5px 0',
+                        width: 425,
+                        url: '/knitkit/erp_app/desktop/articles/new/' + sectionId,
+                        defaults: {
+                            width: 300
+                        },
+                        items: addFormItems
+                    },
+                    buttons: [
+                        {
+                            text: 'Submit',
+                            listeners: {
+                                'click': function (button) {
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('form')[0];
+
+                                    formPanel.getForm().submit({
+                                        reset: true,
+                                        success: function (form, action) {
+                                            var obj = Ext.decode(action.response.responseText);
+                                            if (obj.success) {
+                                                obj.node.createdAt = obj.node.created_at;
+                                                obj.node.updatedAt = obj.node.updated_at;
+                                                record.appendChild(Ext.create('SiteContentsModel', obj.node));
+                                            }
+                                            else {
+                                                Ext.Msg.alert("Error", obj.msg);
+                                            }
+                                            window.close();
+                                        },
+                                        failure: function (form, action) {
+                                            Ext.Msg.alert("Error", "Error creating article");
+                                        }
+                                    });
+                                }
+                            }
+                        },
+                        {
+                            text: 'Close',
+                            handler: function (btn) {
+                                btn.up('window').close();
+                            }
+                        }
+                    ]
+                }).show();
+            }
+        }
+    })
+    ;
+
+    items.push({
+        text: 'Attach Article',
+        iconCls: 'icon-copy',
+        listeners: {
+            'click': function () {
+                Ext.widget('window', {
+                    layout: 'fit',
+                    width: 375,
+                    title: 'Attach Existing Article',
+                    plain: true,
+                    buttonAlign: 'center',
+                    items: {
+                        xtype: 'form',
+                        labelWidth: 75,
+                        frame: false,
+                        bodyStyle: 'padding:5px 5px 0',
+                        width: 425,
+                        url: '/knitkit/erp_app/desktop/articles/add_existing/' + sectionId,
+                        items: [
+                            {
+                                itemId: 'available_articles_filter_combobox',
+                                xtype: 'combo',
+                                hiddenName: 'website_id',
+                                name: 'website_id',
+                                labelWidth: 50,
+                                width: 350,
+                                loadingText: 'Retrieving Websites...',
+                                store: Ext.create('Ext.data.Store', {
+                                    autoLoad: true,
+                                    proxy: {
+                                        type: 'ajax',
+                                        reader: {
+                                            type: 'json',
+                                            root: 'websites'
+                                        },
+                                        extraParams: {
+                                            section_id: sectionId
+                                        },
+                                        url: '/knitkit/erp_app/desktop/section/available_articles_filter'
+                                    },
+                                    fields: [
+                                        {
+                                            name: 'id'
+                                        },
+                                        {
+                                            name: 'internal_identifier'
+
+                                        },
+                                        {
+                                            name: 'name'
+
+                                        }
+                                    ],
+                                    listeners: {
+                                        'load': function (store) {
+                                            available_articles_filter_combobox = Ext.ComponentQuery.query('#available_articles_filter_combobox')[0];
+                                            available_articles_filter_combobox.select(0);
+                                            available_articles_filter_combobox.fireEvent('select');
+                                        }
+                                    }
+                                }),
+                                forceSelection: true,
+                                fieldLabel: 'Filter By',
+                                queryMode: 'local',
+                                autoSelect: true,
+                                typeAhead: true,
+                                displayField: 'name',
+                                valueField: 'id',
+                                triggerAction: 'all',
+                                allowBlank: false,
+                                listeners: {
+                                    'select': function (combo, records) {
+                                        available_articles_combobox = Ext.ComponentQuery.query('#available_articles_combobox')[0];
+                                        available_articles_combobox.getPicker().setLoading(false);
+                                        available_articles_combobox.getStore().load({
+                                            params: {
+                                                section_id: sectionId,
+                                                website_id: Ext.ComponentQuery.query('#available_articles_filter_combobox')[0].getValue()
+                                            }
+                                        });
+                                    }
+                                }
+                            },
+                            {
+                                xtype: 'combo',
+                                itemId: 'available_articles_combobox',
+                                hiddenName: 'article_id',
+                                name: 'article_id',
+                                labelWidth: 50,
+                                width: 350,
+                                loadingText: 'Retrieving Articles...',
+                                store: Ext.create('Ext.data.Store', {
+                                    autoLoad: false,
+                                    remoteFilter: true,
+                                    proxy: {
+                                        type: 'ajax',
+                                        reader: {
+                                            type: 'json',
+                                            root: 'articles'
+                                        },
+                                        extraParams: {
+                                            section_id: sectionId
+                                        },
+                                        url: '/knitkit/erp_app/desktop/section/available_articles'
+                                    },
+                                    fields: [
+                                        {
+                                            name: 'id'
+                                        },
+                                        {
+                                            name: 'internal_identifier'
+
+                                        },
+                                        {
+                                            name: 'combobox_display_value'
+                                        }
+                                    ],
+                                    listeners: {
+                                        'beforeload': function (store) {
+                                            Ext.apply(store.getProxy().extraParams, {
+                                                website_id: Ext.ComponentQuery.query('#available_articles_filter_combobox')[0].getValue()
+                                            });
+                                        },
+                                        'load': function (store, records) {
+                                            available_articles_combobox = Ext.ComponentQuery.query('#available_articles_combobox')[0];
+                                            available_articles_combobox.setValue(store.getAt(0).data.id);
+                                        }
+                                    }
+                                }),
+                                queryMode: 'local',
+                                forceSelection: true,
+                                fieldLabel: 'Article',
+                                autoSelect: true,
+                                typeAhead: true,
+                                displayField: 'combobox_display_value',
+                                valueField: 'id',
+                                triggerAction: 'all',
+                                allowBlank: false,
+                                loadMask: false
+                            }
+                        ]
+                    },
+                    buttons: [
+                        {
+                            text: 'Submit',
+                            listeners: {
+                                'click': function (button) {
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('form')[0];
+                                    formPanel.getForm().submit({
+                                        reset: true,
+                                        success: function (form, action) {
+                                            var obj = Ext.decode(action.response.responseText);
+                                            if (obj.success) {
+                                                obj.article.createdAt = obj.article.created_at;
+                                                obj.article.updatedAt = obj.article.updated_at;
+
+                                                record.appendChild(Ext.create('SiteContentsModel', obj.article));
+
+                                                window.close();
+                                            } else {
+                                                Ext.Msg.alert("Error", "Error Attaching article");
+                                            }
+                                        },
+                                        failure: function (form, action) {
+                                            Ext.Msg.alert("Error", "Error Attaching article");
+                                        }
+                                    });
+                                }
+                            }
+                        },
+                        {
+                            text: 'Close',
+                            handler: function (btn) {
+                                btn.up('window').close();
+                            }
+                        }
+                    ]
+                }).show();
             }
         }
     });
 
-    if (currentUser.hasCapability('unsecure','WebsiteSection') || currentUser.hasCapability('secure','WebsiteSection')) {
+    if (currentUser.hasCapability('unsecure', 'WebsiteSection') || currentUser.hasCapability('secure', 'WebsiteSection')) {
         items.push({
-            text:'Security',
-            iconCls:'icon-document_lock',
-            listeners:{
-                'click':function () {
-                    self.changeSecurity(record, '/knitkit/erp_app/desktop/section/update_security', record.data.id.split('_')[1]);
+            text: 'Security',
+            iconCls: 'icon-document_lock',
+            listeners: {
+                'click': function () {
+                    var westRegion = Ext.getCmp('knitkitWestRegion');
+                    westRegion.changeSecurity(record, '/knitkit/erp_app/desktop/section/update_security', sectionId);
                 }
             }
         });
     }
 
-    if (currentUser.hasCapability('create','WebsiteSection')) {
+    if (currentUser.hasCapability('create', 'WebsiteSection') && !record.get('isBlog')) {
         items.push({
-            text:'Add Section',
-            iconCls:'icon-add',
-            listeners:{
-                'click':function () {
-                    var addSectionWindow = Ext.create("Ext.window.Window", {
-                        layout:'fit',
-                        width:375,
-                        title:'New Section',
-                        plain:true,
-                        buttonAlign:'center',
-                        items:new Ext.FormPanel({
-                            labelWidth:110,
-                            frame:false,
-                            bodyStyle:'padding:5px 5px 0',
-                            url:'/knitkit/erp_app/desktop/section/new',
-                            defaults:{
-                                width:225
+            text: 'Add Section',
+            iconCls: 'icon-add',
+            listeners: {
+                'click': function () {
+                    Ext.widget("window", {
+                        modal: true,
+                        layout: 'fit',
+                        width: 375,
+                        title: 'New Section',
+                        plain: true,
+                        buttonAlign: 'center',
+                        items: {
+                            xtype: 'form',
+                            labelWidth: 110,
+                            frame: false,
+                            bodyStyle: 'padding:5px 5px 0',
+                            url: '/knitkit/erp_app/desktop/section/new',
+                            defaults: {
+                                width: 225
                             },
-                            items:[
+                            items: [
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Title',
-                                    allowBlank:false,
-                                    name:'title'
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Title',
+                                    allowBlank: false,
+                                    name: 'title'
                                 },
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Internal ID',
-                                    allowBlank:true,
-                                    name:'internal_identifier'
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Internal ID',
+                                    allowBlank: true,
+                                    name: 'internal_identifier'
                                 },
                                 {
-                                    xtype:'combo',
-                                    forceSelection:true,
-                                    store:[
+                                    xtype: 'combo',
+                                    forceSelection: true,
+                                    store: [
                                         ['Page', 'Page'],
                                         ['Blog', 'Blog']
                                     ],
-                                    value:'Page',
-                                    fieldLabel:'Type',
-                                    name:'type',
-                                    allowBlank:false,
-                                    triggerAction:'all'
+                                    value: 'Page',
+                                    fieldLabel: 'Type',
+                                    name: 'type',
+                                    allowBlank: false,
+                                    triggerAction: 'all'
                                 },
                                 {
-                                    xtype:'radiogroup',
-                                    fieldLabel:'Display in menu?',
-                                    name:'in_menu',
-                                    columns:2,
-                                    items:[
+                                    xtype: 'radiogroup',
+                                    fieldLabel: 'Display in menu?',
+                                    name: 'in_menu',
+                                    columns: 2,
+                                    items: [
                                         {
-                                            boxLabel:'Yes',
-                                            name:'in_menu',
-                                            inputValue:'yes',
-                                            checked:true
+                                            boxLabel: 'Yes',
+                                            name: 'in_menu',
+                                            inputValue: 'yes',
+                                            checked: true
                                         },
 
                                         {
-                                            boxLabel:'No',
-                                            name:'in_menu',
-                                            inputValue:'no'
+                                            boxLabel: 'No',
+                                            name: 'in_menu',
+                                            inputValue: 'no'
                                         }
                                     ]
                                 },
                                 {
-                                    xtype:'radiogroup',
-                                    fieldLabel:'Render with Base Layout?',
-                                    name:'render_with_base_layout',
-                                    columns:2,
-                                    items:[
+                                    xtype: 'radiogroup',
+                                    fieldLabel: 'Render with Base Layout?',
+                                    name: 'render_with_base_layout',
+                                    columns: 2,
+                                    items: [
                                         {
-                                            boxLabel:'Yes',
-                                            name:'render_with_base_layout',
-                                            inputValue:'yes',
-                                            checked:true
+                                            boxLabel: 'Yes',
+                                            name: 'render_with_base_layout',
+                                            inputValue: 'yes',
+                                            checked: true
                                         },
 
                                         {
-                                            boxLabel:'No',
-                                            name:'render_with_base_layout',
-                                            inputValue:'no'
+                                            boxLabel: 'No',
+                                            name: 'render_with_base_layout',
+                                            inputValue: 'no'
                                         }
                                     ]
                                 },
                                 {
-                                    xtype:'hidden',
-                                    name:'website_section_id',
-                                    value:record.data.id.split('_')[1]
+                                    xtype: 'hidden',
+                                    name: 'website_section_id',
+                                    value: sectionId
                                 },
                                 {
-                                    xtype:'hidden',
-                                    name:'website_id',
-                                    value:record.data.siteId
+                                    xtype: 'hidden',
+                                    name: 'website_id',
+                                    value: record.data.siteId
                                 }
                             ]
-                        }),
-                        buttons:[
+                        },
+                        buttons: [
                             {
-                                text:'Submit',
-                                listeners:{
-                                    'click':function (button) {
+                                text: 'Submit',
+                                listeners: {
+                                    'click': function (button) {
                                         var window = button.findParentByType('window');
                                         var formPanel = window.query('.form')[0];
-                                        self.setWindowStatus('Creating section...');
+
                                         formPanel.getForm().submit({
-                                            reset:true,
-                                            success:function (form, action) {
-                                                self.clearWindowStatus();
+                                            reset: true,
+                                            success: function (form, action) {
                                                 var obj = Ext.decode(action.response.responseText);
                                                 if (obj.success) {
                                                     record.appendChild(obj.node);
+                                                    window.close();
                                                 }
                                                 else {
                                                     Ext.Msg.alert("Error", obj.message);
                                                 }
                                             },
-                                            failure:function (form, action) {
-                                                self.clearWindowStatus();
+                                            failure: function (form, action) {
+                                                //self.clearWindowStatus();
                                                 var obj = Ext.decode(action.response.responseText);
                                                 if (obj.message) {
                                                     Ext.Msg.alert("Error", obj.message);
@@ -154,119 +446,125 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
                                 }
                             },
                             {
-                                text:'Close',
-                                handler:function () {
-                                    addSectionWindow.close();
+                                text: 'Close',
+                                handler: function (btn) {
+                                    btn.up('window').close();
                                 }
                             }
                         ]
-                    });
-                    addSectionWindow.show();
+                    }).show();
                 }
             }
         });
     }
 
-    if (currentUser.hasCapability('edit','WebsiteSection')) {
+    if (currentUser.hasCapability('edit', 'WebsiteSection')) {
         items.push({
-            text:'Update Section',
-            iconCls:'icon-edit',
-            listeners:{
-                'click':function () {
-                    var updateSectionWindow = Ext.create("Ext.window.Window", {
-                        layout:'fit',
-                        width:375,
-                        title:'Update Section',
-                        plain:true,
-                        buttonAlign:'center',
-                        items:new Ext.FormPanel({
-                            labelWidth:110,
-                            frame:false,
-                            bodyStyle:'padding:5px 5px 0',
-                            url:'/knitkit/erp_app/desktop/section/update',
-                            defaults:{
-                                width:225
+            text: 'Update ' + record.data["type"],
+            iconCls: 'icon-edit',
+            listeners: {
+                'click': function () {
+                    Ext.widget("window", {
+                        layout: 'fit',
+                        modal: true,
+                        width: 375,
+                        title: 'Update Section',
+                        plain: true,
+                        buttonAlign: 'center',
+                        items: {
+                            xtype: 'form',
+                            labelWidth: 110,
+                            frame: false,
+                            bodyStyle: 'padding:5px 5px 0',
+                            url: '/knitkit/erp_app/desktop/section/update',
+                            defaults: {
+                                width: 375
                             },
-                            items:[
+                            items: [
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Title',
-                                    value:record.data.text,
-                                    name:'title'
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Title',
+                                    width: 320,
+                                    value: record.data.text,
+                                    name: 'title'
                                 },
                                 {
-                                    xtype:'textfield',
-                                    fieldLabel:'Internal ID',
-                                    allowBlank:true,
-                                    name:'internal_identifier',
-                                    value:record.data.internal_identifier
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Internal ID',
+                                    width: 320,
+                                    allowBlank: true,
+                                    name: 'internal_identifier',
+                                    value: record.data.internal_identifier
                                 },
                                 {
-                                    xtype:'radiogroup',
-                                    fieldLabel:'Display in menu?',
-                                    name:'in_menu',
-                                    columns:2,
-                                    items:[
+                                    xtype: 'radiogroup',
+                                    fieldLabel: 'Display in menu?',
+                                    width: 220,
+                                    name: 'in_menu',
+                                    columns: 2,
+                                    items: [
                                         {
-                                            boxLabel:'Yes',
-                                            name:'in_menu',
-                                            inputValue:'yes',
-                                            checked:record.data.inMenu
+                                            boxLabel: 'Yes',
+                                            name: 'in_menu',
+                                            inputValue: 'yes',
+                                            checked: record.data.inMenu
                                         },
 
                                         {
-                                            boxLabel:'No',
-                                            name:'in_menu',
-                                            inputValue:'no',
-                                            checked:!record.data.inMenu
+                                            boxLabel: 'No',
+                                            name: 'in_menu',
+                                            inputValue: 'no',
+                                            checked: !record.data.inMenu
                                         }
                                     ]
                                 },
                                 {
-                                    xtype:'radiogroup',
-                                    fieldLabel:'Render with Base Layout?',
-                                    name:'render_with_base_layout',
-                                    columns:2,
-                                    items:[
+                                    xtype: 'radiogroup',
+                                    fieldLabel: 'Render with Base Layout?',
+                                    width: 220,
+                                    name: 'render_with_base_layout',
+                                    columns: 2,
+                                    items: [
                                         {
-                                            boxLabel:'Yes',
-                                            name:'render_with_base_layout',
-                                            inputValue:'yes',
-                                            checked:record.data.renderWithBaseLayout
+                                            boxLabel: 'Yes',
+                                            name: 'render_with_base_layout',
+                                            inputValue: 'yes',
+                                            checked: record.data.renderWithBaseLayout
                                         },
 
                                         {
-                                            boxLabel:'No',
-                                            name:'render_with_base_layout',
-                                            inputValue:'no',
-                                            checked:!record.data.renderWithBaseLayout
+                                            boxLabel: 'No',
+                                            name: 'render_with_base_layout',
+                                            inputValue: 'no',
+                                            checked: !record.data.renderWithBaseLayout
                                         }
                                     ]
                                 },
                                 {
-                                    xtype:'displayfield',
-                                    fieldLabel:'Path',
-                                    name:'path',
-                                    value:record.data.path
+                                    xtype: 'displayfield',
+                                    fieldLabel: 'Path',
+                                    width: 320,
+                                    name: 'path',
+                                    value: record.data.path
                                 },
                                 {
-                                    xtype:'hidden',
-                                    name:'id',
-                                    value:record.data.id.split('_')[1]
+                                    xtype: 'hidden',
+                                    name: 'id',
+                                    value: sectionId
                                 }
                             ]
-                        }),
-                        buttons:[
+                        },
+                        buttons: [
                             {
-                                text:'Submit',
-                                listeners:{
-                                    'click':function (button) {
+                                text: 'Submit',
+                                listeners: {
+                                    'click': function (button) {
                                         var window = button.findParentByType('window');
                                         var formPanel = window.query('.form')[0];
-                                        self.setWindowStatus('Updating section...');
+                                        //self.setWindowStatus('Updating section...');
                                         formPanel.getForm().submit({
-                                            success:function (form, action) {
-                                                self.clearWindowStatus();
+                                            success: function (form, action) {
+                                                //self.clearWindowStatus();
                                                 var values = formPanel.getValues();
                                                 record.set('title', values.title);
                                                 record.set('text', values.title);
@@ -274,10 +572,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
                                                 record.set("inMenu", (values.in_menu == 'yes'));
                                                 record.set("renderWithBaseLayout", (values.render_with_base_layout == 'yes'));
                                                 record.commit();
-                                                updateSectionWindow.close();
+                                                window.close();
                                             },
-                                            failure:function (form, action) {
-                                                self.clearWindowStatus();
+                                            failure: function (form, action) {
+                                                //self.clearWindowStatus();
                                                 var obj = Ext.decode(action.response.responseText);
                                                 Ext.Msg.alert("Error", obj.msg);
                                             }
@@ -286,58 +584,60 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
                                 }
                             },
                             {
-                                text:'Close',
-                                handler:function () {
-                                    updateSectionWindow.close();
+                                text: 'Close',
+                                handler: function (btn) {
+                                    btn.up('window').close();
                                 }
                             }
                         ]
-                    });
-                    updateSectionWindow.show();
+                    }).show();
                 }
             }
-        });
+        })
+        ;
     }
 
 //no layouts for blogs.
     if (Compass.ErpApp.Utility.isBlank(record.data['isBlog']) && record.data['hasLayout']) {
-        if (currentUser.hasCapability('edit','WebsiteSectionLayout')) {
+        if (currentUser.hasCapability('edit', 'WebsiteSectionLayout')) {
             items.push({
-                text:'Edit Layout',
-                iconCls:'icon-edit',
-                listeners:{
-                    'click':function () {
-                        self.editSectionLayout(record.data.text, record.data.id.split('_')[1], record.data.siteId);
+                text: 'Edit Layout',
+                iconCls: 'icon-edit',
+                listeners: {
+                    'click': function () {
+                        var sectionPanel = Ext.ComponentQuery.query('#knitkitSiteContentsTreePanel').first();
+                        sectionPanel.editSectionLayout(record.data.text, sectionId, record.data.siteId);
                     }
                 }
             });
         }
     }
     else if (Compass.ErpApp.Utility.isBlank(record.data['isBlog'])) {
-        if (currentUser.hasCapability('create','WebsiteSectionLayout')) {
+        if (currentUser.hasCapability('create', 'WebsiteSectionLayout')) {
             items.push({
-                text:'Add Layout',
-                iconCls:'icon-add',
-                listeners:{
-                    'click':function () {
-                        var sectionId = record.data.id.split('_')[1];
+                text: 'Add Layout',
+                iconCls: 'icon-add',
+                listeners: {
+                    'click': function () {
                         Ext.Ajax.request({
-                            url:'/knitkit/erp_app/desktop/section/add_layout',
-                            method:'POST',
-                            params:{
-                                id:sectionId
+                            url: '/knitkit/erp_app/desktop/section/add_layout',
+                            method: 'POST',
+                            params: {
+                                id: sectionId
                             },
-                            success:function (response) {
+                            success: function (response) {
                                 var obj = Ext.decode(response.responseText);
                                 if (obj.success) {
                                     record.data.hasLayout = true;
-                                    self.editSectionLayout(record.data.text, sectionId, record.data.siteId);
+
+                                    var sectionPanel = Ext.ComponentQuery.query('#knitkitSiteContentsTreePanel').first();
+                                    sectionPanel.editSectionLayout(record.data.text, sectionId, record.data.siteId);
                                 }
                                 else {
                                     Ext.Msg.alert('Status', obj.message);
                                 }
                             },
-                            failure:function (response) {
+                            failure: function (response) {
                                 Ext.Msg.alert('Status', 'Error adding layout.');
                             }
                         });
@@ -347,17 +647,43 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions = function (self,
         }
     }
 
-    if (currentUser.hasCapability('delete','WebsiteSection')) {
+    if (currentUser.hasCapability('delete', 'WebsiteSection')) {
         items.push({
-            text:'Delete ' + record.data["type"],
-            iconCls:'icon-delete',
-            listeners:{
-                'click':function () {
-                    self.deleteSection(record);
+            text: 'Delete ' + record.data["type"],
+            iconCls: 'icon-delete',
+            listeners: {
+                'click': function () {
+                    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this section?<br> NOTE: Articles belonging to this section will be orphaned.<br><br>', function (btn) {
+                        if (btn == 'no') {
+                            return false;
+                        }
+                        else if (btn == 'yes') {
+                            Ext.Ajax.request({
+                                url: '/knitkit/erp_app/desktop/section/delete',
+                                method: 'POST',
+                                params: {
+                                    id: sectionId
+                                },
+                                success: function (response) {
+
+                                    var obj = Ext.decode(response.responseText);
+                                    if (obj.success) {
+                                        record.remove();
+                                    }
+                                    else {
+                                        Ext.Msg.alert('Error', 'Error deleting section');
+                                    }
+                                },
+                                failure: function (response) {
+                                    Ext.Msg.alert('Error', 'Error deleting section');
+                                }
+                            });
+                        }
+                    });
                 }
             }
         });
     }
-
     return items;
-};
+}
+;