knitkit 2.0.0 → 2.0.1

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

@@ -8,8 +8,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel",{
   updateThemeActiveStatus : function(themeId, siteId, active){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Updating Status...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/theme/change_status',
       method: 'POST',
       params:{
@@ -39,42 +38,31 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel",{
 
   deleteTheme : function(themeId){
     var self = this;
-    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this theme?', function(btn){
-      if(btn == 'no'){
-        return false;
-      }
-      else
-      if(btn == 'yes')
-      {
-        self.initialConfig['centerRegion'].setWindowStatus('Deleting theme...');
-        var conn = new Ext.data.Connection();
-        conn.request({
-          url: '/knitkit/erp_app/desktop/theme/delete',
-          method: 'POST',
-          params:{
-            theme_id:themeId
-          },
-          success: function(response) {
-            var obj =  Ext.decode(response.responseText);
-            if(obj.success){
-              self.initialConfig['centerRegion'].clearWindowStatus();
-              self.getStore().load({
-                node:self.getRootNode()
-              });
-            }
-            else{
-              Ext.Msg.alert('Error', 'Error deleting theme');
-              self.initialConfig['centerRegion'].clearWindowStatus();
-            }
-          },
-          failure: function(response) {
-            self.initialConfig['centerRegion'].clearWindowStatus();
-            Ext.Msg.alert('Error', 'Error deleting theme');
-          }
-        });
+    self.initialConfig['centerRegion'].setWindowStatus('Deleting theme...');
+    Ext.Ajax.request({
+      url: '/knitkit/erp_app/desktop/theme/delete',
+      method: 'POST',
+      params:{
+        theme_id:themeId
+      },
+      success: function(response) {
+        var obj =  Ext.decode(response.responseText);
+        if(obj.success){
+          self.initialConfig['centerRegion'].clearWindowStatus();
+          self.getStore().load({
+            node:self.getRootNode()
+          });
+        }
+        else{
+          Ext.Msg.alert('Error', 'Error deleting theme');
+          self.initialConfig['centerRegion'].clearWindowStatus();
+        }
+      },
+      failure: function(response) {
+        self.initialConfig['centerRegion'].clearWindowStatus();
+        Ext.Msg.alert('Error', 'Error deleting theme');
       }
-    });
-	
+    });	
   },
 
   exportTheme : function(themeId){
@@ -88,7 +76,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel",{
     var self = this;
     self.sitesJsonStore.load();
     var themesJsonStore = Ext.create("Ext.data.Store",{
-      autoLoad:true,
+      autoLoad:false,
       proxy:{
         url:'/knitkit/erp_app/desktop/theme/available_themes',
         type:'ajax',
@@ -261,12 +249,14 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel",{
     var self = this;
 
     config = Ext.apply({
+      autoLoadRoot:true,
+      rootVisible:true,
       title:'Themes',
+      rootText:'Websites',
       controllerPath:'/knitkit/erp_app/desktop/theme',
       autoDestroy:true,
       allowDownload:true,
       addViewContentsToContextMenu:true,
-      rootVisible:false,
       standardUploadUrl:'/knitkit/erp_app/desktop/theme/upload_file',
       xhrUploadUrl:'/knitkit/erp_app/desktop/theme/upload_file',
       url:'/knitkit/erp_app/desktop/theme/index',
@@ -306,7 +296,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel",{
       containerScroll: true,
       listeners:{
         'contentLoaded':function(fileManager, node, content){
-          self.initialConfig['centerRegion'].editTemplateFile(node, content, []);
+          var themeId = null;
+          var themeNode = node;
+          while(themeId == null && !Compass.ErpApp.Utility.isBlank(themeNode.parentNode)){
+            if(themeNode.data.isTheme){
+              themeId = themeNode.data.id
+            }
+            else{
+              themeNode = themeNode.parentNode;
+            }
+          }
+          self.initialConfig['centerRegion'].editTemplateFile(node, content, [], themeId);
         },
         'handleContextMenu':function(fileManager, node, e){
           if(node.data['isTheme']){

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

@@ -80,18 +80,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsGridPanel",{
           }
         },
         handler: function(grid, rowIndex, colIndex) {
-          if(currentUser.hasRole(['publisher','admin'])){
-            var rec = grid.getStore().getAt(rowIndex);
-            if(rec.get('published')){
-              return false;
-            }
-            else{
-              grid.ownerCt.publish(rec)
-            }
-          }
-          else{
-            compassUser.showInvalidAccess();
-          }
+           var rec = grid.getStore().getAt(rowIndex);
+                    if(rec.get('published')){
+                        return false;
+                    }
+                    else{
+                        grid.ownerCt.publish(rec)
+                    }
 
         }
       }]
@@ -136,65 +131,81 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsArticleGridPanel
     this.initialConfig['centerRegion'].viewContent(rec.get('title') + " - Revision " + rec.get('version'), rec.get('body_html'));
   },
 
-  revert: function(rec){
-    var self = this;
-    self.initialConfig['centerRegion'].setWindowStatus('Reverting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
-      url: '/knitkit/erp_app/desktop/versions/revert_content',
-      method: 'POST',
-      params:{
-        id:rec.get('id'),
-        version:rec.get('version')
-      },
-      success: function(response) {
-        self.initialConfig['centerRegion'].clearWindowStatus();
-        var obj =  Ext.decode(response.responseText);
-        if(obj.success){
-          self.initialConfig['centerRegion'].replaceHtmlInActiveCkEditor(rec.get('body_html'));
-          self.getStore().load();
-        }
-        else{
-          Ext.Msg.alert('Error', 'Error reverting');
+      revert: function(rec){
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'revert_version',
+            resource:'Article'
+        }))
+        {
+            var self = this;
+            self.initialConfig['centerRegion'].setWindowStatus('Reverting...');
+            var conn = new Ext.data.Connection();
+            conn.request({
+                url: '/knitkit/erp_app/desktop/versions/revert_content',
+                method: 'POST',
+                params:{
+                    id:rec.get('id'),
+                    version:rec.get('version')
+                },
+                success: function(response) {
+	        self.initialConfig['centerRegion'].clearWindowStatus();
+                    var obj =  Ext.decode(response.responseText);
+                    if(obj.success){
+                        self.initialConfig['centerRegion'].replaceHtmlInActiveCkEditor(rec.get('body_html'));
+                        self.getStore().load();
+                    }
+                    else{
+                        Ext.Msg.alert('Error', 'Error reverting');
+                    }
+                },
+                failure: function(response) {
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                    Ext.Msg.alert('Error', 'Error reverting');
+                }
+            });
+        } else {
+            currentUser.showInvalidAccess();
         }
-      },
-      failure: function(response) {
-        self.initialConfig['centerRegion'].clearWindowStatus();
-        Ext.Msg.alert('Error', 'Error reverting');
-      }
-    });
-  },
+    },
     
-  publish: function(rec){
-    var self = this;
-
-    var publishWindow = new Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow({
-      baseParams:{
-        id:rec.get('id'),
-        site_id:self.initialConfig.siteId,
-        version:rec.get('version')
-      },
-      url:'/knitkit/erp_app/desktop/versions/publish_content',
-      listeners:{
-        'publish_success':function(window, response){
-          if(response.success){
-            self.initialConfig['centerRegion'].clearWindowStatus();
-            self.getStore().load();
-          }
-          else{
-            Ext.Msg.alert('Error', 'Error publishing');
-            self.initialConfig['centerRegion'].clearWindowStatus();
-          }
-        },
-        'publish_failure':function(window, response){
-          self.initialConfig['centerRegion'].clearWindowStatus();
-          Ext.Msg.alert('Error', 'Error publishing');
+    publish: function(rec){
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'publish',
+            resource:'Article'
+        }))
+        {
+            var self = this;
+
+            var publishWindow = new Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow({
+                baseParams:{
+                    id:rec.get('id'),
+                    site_id:self.initialConfig.siteId,
+                    version:rec.get('version')
+                },
+                url:'/knitkit/erp_app/desktop/versions/publish_content',
+                listeners:{
+                    'publish_success':function(window, response){
+                        if(response.success){
+                            self.initialConfig['centerRegion'].clearWindowStatus();
+                            self.getStore().load();
+                        }
+                        else{
+                            Ext.Msg.alert('Error', 'Error publishing');
+                            self.initialConfig['centerRegion'].clearWindowStatus();
+                        }
+                    },
+                    'publish_failure':function(window, response){
+                        self.initialConfig['centerRegion'].clearWindowStatus();
+                        Ext.Msg.alert('Error', 'Error publishing');
+                    }
+                }
+            });
+
+            publishWindow.show();
+        } else {
+            currentUser.showInvalidAccess();
         }
-      }
-    });
-
-    publishWindow.show();
-  },
+    },
 
   constructor : function(config) {
     config = Ext.apply({
@@ -261,8 +272,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsBlogGridPanel",{
   revert: function(rec){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Reverting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/versions/revert_content',
       method: 'POST',
       params:{
@@ -396,8 +406,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsWebsiteSectionGr
   viewVersionedContent : function(rec){
     this.initialConfig['centerRegion'].setWindowStatus('Loading template...');
     var self = this;
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/versions/get_website_section_version',
       method: 'POST',
       params:{
@@ -419,8 +428,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsWebsiteSectionGr
   revert: function(rec){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Reverting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/versions/revert_website_section',
       method: 'POST',
       params:{
@@ -534,8 +542,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.NonPublishedVersionsGrid
   revert: function(rec){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Reverting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/versions/revert_content',
       method: 'POST',
       params:{

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

@@ -12,7 +12,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
 
   deleteSection : function(node){
     var self = this;
-    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this section?', function(btn){
+    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this section?<br> NOTE: Articles belonging to this section will be orphaned.', function(btn){
       if(btn == 'no'){
         return false;
       }
@@ -20,8 +20,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       if(btn == 'yes')
       {
         self.setWindowStatus('Deleting Section...');
-        var conn = new Ext.data.Connection();
-        conn.request({
+        Ext.Ajax.request({
           url: '/knitkit/erp_app/desktop/section/delete',
           method: 'POST',
           params:{
@@ -63,8 +62,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       if(btn == 'yes')
       {
         self.setWindowStatus('Deleting Website...');
-        var conn = new Ext.data.Connection();
-        conn.request({
+        Ext.Ajax.request({
           url: '/knitkit/erp_app/desktop/site/delete',
           method: 'POST',
           params:{
@@ -118,8 +116,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
     var self = this;
     self.selectWebsite(websiteId);
     self.setWindowStatus('Loading section template...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/section/get_layout',
       method: 'POST',
       params:{
@@ -155,8 +152,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
   changeSecurityOnSection : function(node, secure){
     var self = this;
     self.setWindowStatus('Updating section...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/section/update_security',
       method: 'POST',
       params:{
@@ -191,8 +187,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
   changeSecurityOnMenuItem : function(node, secure){
     var self = this;
     self.setWindowStatus('Updating menu item security...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/website_nav/update_security',
       method: 'POST',
       params:{
@@ -240,6 +235,26 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
     });
     Ext.getCmp('knitkitEastRegion').fileAssetsPanel.selectWebsite(websiteId);
     Ext.getCmp('knitkitEastRegion').imageAssetsPanel.selectWebsite(websiteId);
+    Compass.ErpApp.Shared.FileManagerTree.extraPostData = {
+      website_id:websiteId
+    };
+  },
+
+  updateWebsiteConfiguration : function(rec){
+    var configurationWindow = Ext.create("Ext.window.Window",{
+      layout:'fit',
+      width:600,
+      title:'Configuration',
+      height:400,
+      autoScroll:true,
+      plain: true,
+      items:[{
+        xtype:'sharedconfigurationpanel',
+        configurationId:rec.get('configurationId')
+      }]
+    });
+
+    configurationWindow.show();
   },
 
   initComponent: function() {
@@ -248,7 +263,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
     var store = Ext.create('Ext.data.TreeStore', {
       proxy:{
         type: 'ajax',
-        url: '/knitkit/erp_app/desktop/websites'
+        url: '/knitkit/erp_app/desktop/websites',
+        timeout: 90000
       },
       root: {
         text: 'Websites',
@@ -273,6 +289,12 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       {
         name:'isSection'
       },
+      {
+        name:'isDocument'
+      },
+      {
+        name:'contentInfo'
+      },
       {
         name:'isHost'
       },
@@ -282,6 +304,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       {
         name:'url'
       },
+      {
+        name:'path'
+      },
       {
         name:'inMenu'
       },
@@ -359,73 +384,98 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       },
       {
         name:'internal_identifier'
+      },
+      {
+        name:'configurationId'
+      },
+      {
+        name:'renderWithBaseLayout'
       }
       ]
     });
 
-    this.sitesTree = new Ext.tree.TreePanel({
-      viewConfig: {
-        //TODO_EXTJS4 this is added to fix error should be removed when extjs 4 releases fix.
-        loadMask: false,
-        markDirty: false,
-        plugins: {
-          ptype: 'treeviewdragdrop'
-        },
-        listeners:{
-          'beforedrop':function(node, data, overModel, dropPosition,dropFunction,options){
-            if(overModel.data['isWebsiteNavItem']){
+    var pluginItems = [];
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+      capability_type_iid:'drag_item',
+      resource:'WebsiteTree'
+    }))
+
+    {
+      pluginItems.push({
+        ptype: 'treeviewdragdrop'
+      });
+    }
+    
+    var viewConfigItems = {
+      markDirty: false,
+      plugins: pluginItems,
+      listeners:{
+        'beforedrop':function(node, data, overModel, dropPosition,dropFunction,options){
+          if(overModel.data['isWebsiteNavItem']){
+            return true;
+          }
+          else if(overModel.data['isSection']){
+            if(overModel.parentNode.data['isSectionRoot']){
               return true;
             }
-            else if(overModel.data['isSection']){
-              if(overModel.parentNode.data['isSectionRoot']){
-                return true;
-              }
-            }
-            return false;
-          },
-          'drop':function(node, data, overModel, dropPosition, options){
-            var positionArray = [];
-            var counter = 0;
-            var dropNode = data.records[0];
-
-            if(dropNode.data['isWebsiteNavItem']){
-              overModel.parentNode.eachChild(function(node){
-                positionArray.push({
-                  id:node.data.websiteNavItemId,
-                  position:counter,
-                  klass:'WebsiteNavItem'
-                });
-                counter++;
+          }
+          else if (overModel.data['isDocument']){
+            return true;
+          }
+          return false;
+        },
+        'drop':function(node, data, overModel, dropPosition, options){
+          var positionArray = [];
+          var counter = 0;
+          var dropNode = data.records[0];
+
+          if(dropNode.data['isWebsiteNavItem']){
+            overModel.parentNode.eachChild(function(node){
+              positionArray.push({
+                id:node.data.websiteNavItemId,
+                position:counter,
+                klass:'WebsiteNavItem'
               });
-            }
-            else{
-              overModel.parentNode.eachChild(function(node){
-                positionArray.push({
-                  id:node.data.id.split('_')[1],
-                  position:counter,
-                  klass:'WebsiteSection'
-                });
-                counter++;
+              counter++;
+            });
+          }
+          else{
+            overModel.parentNode.eachChild(function(node){
+              positionArray.push({
+                id:node.data.id.split('_')[1],
+                position:counter,
+                klass:'WebsiteSection'
               });
-            }
+              counter++;
+            });
+          }
 
-            var conn = new Ext.data.Connection();
-            conn.request({
-              url:'/knitkit/erp_app/desktop/position/update',
-              method: 'PUT',
-              jsonData:{
-                position_array:positionArray
-              },
-              success: function(response) {
+          Ext.Ajax.request({
+            url:'/knitkit/erp_app/desktop/position/update',
+            method: 'PUT',
+            jsonData:{
+              position_array:positionArray
+            },
+            success: function(response) {
+              var obj = Ext.decode(response.responseText);
+              if(obj.success){
 
-              },
-              failure: function(response) {
-                Ext.Msg.alert('Error', 'Error saving positions.');
               }
-            });
-          }
+              else{
+                Ext.Msg.alert("Error", obj.message);
+              }
+            },
+            failure: function(response) {
+              Ext.Msg.alert('Error', 'Error saving positions.');
+            }
+          });
         }
-      },
+      }
+    };
+
+    this.sitesTree = new Ext.tree.TreePanel({
+      viewConfig:viewConfigItems,
       store:store,
       region: 'center',
       rootVisible:false,
@@ -445,6 +495,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
             var webNavigator = window.compassDesktop.getModule('web-navigator-win');
             webNavigator.createWindow(record.data['url']);
           }
+          else
+          if(record.data['isDocument']){
+            self.initialConfig['centerRegion'].editContent(record.data['contentInfo'].title, record.data['contentInfo'].id, record.data['contentInfo'].body_html, record.data['siteId'], 'article');
+          }
         },
         'itemcontextmenu':function(view, record, htmlItem, index, e){
           e.stopEvent();
@@ -464,217 +518,29 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
           }
 
           if(record.data['canAddMenuItems']){
-            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: new Ext.FormPanel({
-                    labelWidth: 50,
-                    frame:false,
-                    bodyStyle:'padding:5px 5px 0',
-                    url:'/knitkit/erp_app/desktop/website_nav/add_menu_item',
-                    defaults: {
-                      width: 225
-                    },
-                    items: [
-                    {
-                      xtype:'textfield',
-                      fieldLabel:'Title',
-                      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:[
-                      ['website_section','Section'],
-                      ['url','Url']
-                      ],
-                      value:'website_section',
-                      listeners:{
-                        'change':function(combo, newValue, oldValue){
-                          switch(newValue){
-                            case 'website_section':
-                              Ext.getCmp('knitkit_create_website_nav_item_section').show();
-                              Ext.getCmp('knitkit_create_website_nav_item_url').hide();
-                              break;
-                            case 'url':
-                              Ext.getCmp('knitkit_create_website_nav_item_section').hide();
-                              Ext.getCmp('knitkit_create_website_nav_item_url').show();
-                              break;
-                          }
-                        }
-                      }
-                    },
-                    {
-                      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'
-                          },
-                          extraParams:{
-                            website_id:record.data.websiteId
-                          }
-                        },
-                        autoLoad:true,
-                        fields:[
-                        {
-                          name:'id'
-                        },
-                        {
-                          name:'title_permalink'
-
-                        }
-                        ]
-                      }),
-                      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:'hidden',
-                      name:'klass',
-                      value: ((record.data['websiteNavId']) ? 'WebsiteNav' : 'WebsiteNavItem')
-                    },
-                    {
-                      xtype:'hidden',
-                      name:'id',
-                      value:record.data['websiteNavId'] || record.data['websiteNavItemId']
-                    }
-                    ]
-                  }),
-                  buttons: [{
-                    text:'Submit',
-                    listeners:{
-                      'click':function(button){
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        self.setWindowStatus('Creating menu item...');
-                        formPanel.getForm().submit({
-                          reset:true,
-                          success:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            if(obj.success){
-                              record.appendChild(obj.node);
-                            }
-                            else{
-                              Ext.Msg.alert("Error", obj.msg);
-                            }
-                          },
-                          failure:function(form, action){
-                            self.clearWindowStatus();
-                            if(action.response == null){
-                              Ext.Msg.alert("Error", 'Could not create menu item');
-                            }
-                            else{
-                              var obj = Ext.decode(action.response.responseText);
-                              Ext.Msg.alert("Error", obj.msg);
-                            }
-
-                          }
-                        });
-                      }
-                    }
-                  },{
-                    text: 'Close',
-                    handler: function(){
-                      addMenuItemWindow.close();
-                    }
-                  }]
-                });
-                addMenuItemWindow.show();
-              }
-            });
-          }
 
-          if(record.data['isSection']){
-            items.push({
-              text:'View Articles',
-              iconCls:'icon-document',
-              listeners:{
-                'click':function(){
-                  self.getArticles(record);
-                }
-              }
-            });
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'MenuItem'
+            }))
 
-            if(record.data.isSecured){
-              items.push({
-                text:'Unsecure',
-                iconCls:'icon-document',
-                listeners:{
-                  'click':function(){
-                    self.changeSecurityOnSection(record, false);
-                  }
-                }
-              });
-            }
-            else{
+            {
               items.push({
-                text:'Secure',
-                iconCls:'icon-document_lock',
-                listeners:{
-                  'click':function(){
-                    self.changeSecurityOnSection(record, true);
-                  }
-                }
-              });
-            }
-
-            items.push({
-              text:'Add Section',
-              iconCls:'icon-add',
-              listeners:{
-                'click':function(){
-                  var addSectionWindow = Ext.create("Ext.window.Window",{
+                text:'Add Menu Item',
+                iconCls:'icon-add',
+                handler:function(btn){
+                  var addMenuItemWindow = Ext.create("Ext.window.Window",{
                     layout:'fit',
                     width:375,
-                    title:'New Section',
+                    title:'New Menu Item',
+                    height:175,
                     plain: true,
                     buttonAlign:'center',
                     items: new Ext.FormPanel({
-                      labelWidth: 110,
+                      labelWidth: 50,
                       frame:false,
                       bodyStyle:'padding:5px 5px 0',
-                      url:'/knitkit/erp_app/desktop/section/new',
+                      url:'/knitkit/erp_app/desktop/website_nav/add_menu_item',
                       defaults: {
                         width: 225
                       },
@@ -686,52 +552,93 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                         name:'title'
                       },
                       {
-                        xtype:'textfield',
-                        fieldLabel:'Unique Name',
-                        allowBlank:true,
-                        name:'internal_identifier'
+                        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:[
+                        ['website_section','Section'],
+                        ['url','Url']
+                        ],
+                        value:'website_section',
+                        listeners:{
+                          'change':function(combo, newValue, oldValue){
+                            switch(newValue){
+                              case 'website_section':
+                                Ext.getCmp('knitkit_create_website_nav_item_section').show();
+                                Ext.getCmp('knitkit_create_website_nav_item_url').hide();
+                                break;
+                              case 'url':
+                                Ext.getCmp('knitkit_create_website_nav_item_section').hide();
+                                Ext.getCmp('knitkit_create_website_nav_item_url').show();
+                                break;
+                            }
+                          }
+                        }
                       },
                       {
-                        xtype: 'combo',
+                        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'
+                            },
+                            extraParams:{
+                              website_id:record.data.websiteId
+                            }
+                          },
+                          autoLoad:true,
+                          fields:[
+                          {
+                            name:'id'
+                          },
+                          {
+                            name:'title_permalink'
+
+                          }
+                          ]
+                        }),
                         forceSelection:true,
-                        store: [
-                        ['Page','Page'],
-                        ['Blog','Blog'],
-                        ],
-                        value:'Page',
-                        fieldLabel: 'Type',
-                        name: 'type',
-                        allowBlank: false,
+                        editable:false,
+                        fieldLabel:'Section',
+                        autoSelect:true,
+                        typeAhead: false,
+                        mode: 'local',
+                        displayField:'title_permalink',
+                        valueField:'id',
+
                         triggerAction: 'all'
                       },
                       {
-                        xtype:'radiogroup',
-                        fieldLabel:'Display in menu?',
-                        name:'in_menu',
-                        columns:2,
-                        items:[
-                        {
-                          boxLabel:'Yes',
-                          name:'in_menu',
-                          inputValue: 'yes',
-                          checked:true
-                        },
-
-                        {
-                          boxLabel:'No',
-                          name:'in_menu',
-                          inputValue: 'no'
-                        }]
+                        xtype:'textfield',
+                        fieldLabel:'Url',
+                        id:'knitkit_create_website_nav_item_url',
+                        hidden:true,
+                        name:'url'
                       },
                       {
                         xtype:'hidden',
-                        name:'website_section_id',
-                        value:record.data.id.split('_')[1]
+                        name:'klass',
+                        value: ((record.data['websiteNavId']) ? 'WebsiteNav' : 'WebsiteNavItem')
                       },
                       {
                         xtype:'hidden',
-                        name:'website_id',
-                        value:record.data.siteId
+                        name:'id',
+                        value:record.data['websiteNavId'] || record.data['websiteNavItemId']
                       }
                       ]
                     }),
@@ -740,8 +647,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                       listeners:{
                         'click':function(button){
                           var window = button.findParentByType('window');
-                          var formPanel = window.query('.form')[0];
-                          self.setWindowStatus('Creating section...');
+                          var formPanel = window.query('form')[0];
+                          self.setWindowStatus('Creating menu item...');
                           formPanel.getForm().submit({
                             reset:true,
                             success:function(form, action){
@@ -751,115 +658,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                                 record.appendChild(obj.node);
                               }
                               else{
-                                Ext.Msg.alert("Error", obj.message);
+                                Ext.Msg.alert("Error", obj.msg);
                               }
                             },
                             failure:function(form, action){
                               self.clearWindowStatus();
-                              var obj = Ext.decode(action.response.responseText);
-                              if(obj.message){
-                                Ext.Msg.alert("Error", obj.message);
+                              if(action.response == null){
+                                Ext.Msg.alert("Error", 'Could not create menu item');
                               }
                               else{
-                                Ext.Msg.alert("Error", "Error creating section.");
+                                var obj = Ext.decode(action.response.responseText);
+                                Ext.Msg.alert("Error", obj.msg);
                               }
-                            }
-                          });
-                        }
-                      }
-                    },{
-                      text: 'Close',
-                      handler: function(){
-                        addSectionWindow.close();
-                      }
-                    }]
-                  });
-                  addSectionWindow.show();
-                }
-              }
-            });
-
-            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
-                      },
-                      items: [
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Title',
-                        value:record.data.text,
-                        name:'title'
-                      },
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Unique Name',
-                        allowBlank:true,
-                        name:'internal_identifier',
-                        value:record.data.internal_identifier
-                      },
-                      {
-                        xtype:'radiogroup',
-                        fieldLabel:'Display in menu?',
-                        name:'in_menu',
-                        columns:2,
-                        items:[
-                        {
-                          boxLabel:'Yes',
-                          name:'in_menu',
-                          inputValue: 'yes',
-                          checked:record.data.inMenu
-                        },
 
-                        {
-                          boxLabel:'No',
-                          name:'in_menu',
-                          inputValue: 'no',
-                          checked:!record.data.inMenu
-                        }]
-                      },
-                      {
-                        xtype:'hidden',
-                        name:'id',
-                        value:record.data.id.split('_')[1]
-                      }
-                      ]
-                    }),
-                    buttons: [{
-                      text:'Submit',
-                      listeners:{
-                        'click':function(button){
-                          var window = button.findParentByType('window');
-                          var formPanel = window.query('.form')[0];
-                          self.setWindowStatus('Updating section...');
-                          formPanel.getForm().submit({
-                            success:function(form, action){
-                              self.clearWindowStatus();
-                              var values = formPanel.getValues();
-                              record.set('title',values.title);
-                              record.set('internal_identifier',values.internal_identifier);
-                              record.set("inMenu",(values.in_menu == 'yes'));
-                              record.commit();
-                              updateSectionWindow.close();
-                            },
-                            failure:function(form, action){
-                              self.clearWindowStatus();
-                              var obj =  Ext.decode(action.response.responseText);
-                              Ext.Msg.alert("Error", obj.msg);
                             }
                           });
                         }
@@ -867,75 +678,697 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                     },{
                       text: 'Close',
                       handler: function(){
-                        updateSectionWindow.close();
+                        addMenuItemWindow.close();
                       }
                     }]
                   });
-                  updateSectionWindow.show();
-                }
-              }
-            });
-
-            //no layouts for blogs.
-            if(Compass.ErpApp.Utility.isBlank(record.data['isBlog']) && record.data['hasLayout']){
-              items.push({
-                text:'Edit Layout',
-                iconCls:'icon-edit',
-                listeners:{
-                  'click':function(){
-                    self.editSectionLayout(record.data.text, record.data.id.split('_')[1], record.data.siteId);
-                  }
+                  addMenuItemWindow.show();
                 }
               });
             }
-            else
-            if(Compass.ErpApp.Utility.isBlank(record.data['isBlog'])){
+          }
+
+          if(record.data['isDocument']){
+						
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'Section'
+            }))
+            {
               items.push({
-                text:'Add Layout',
+                text:'Add Document',
                 iconCls:'icon-add',
                 listeners:{
                   'click':function(){
-                    var sectionId = record.data.id.split('_')[1];
-                    var conn = new Ext.data.Connection();
-                    conn.request({
-                      url: '/knitkit/erp_app/desktop/section/add_layout',
-                      method: 'POST',
-                      params:{
-                        id:sectionId
-                      },
-                      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);
-                        }
-                        else
+                    var addSectionWindow = Ext.create("Ext.window.Window",{
+                      layout:'fit',
+                      width:375,
+                      title:'New Document Section',
+                      plain: true,
+                      buttonAlign:'center',
+                      items: new Ext.FormPanel({
+                        labelWidth: 110,
+                        frame:false,
+                        bodyStyle:'padding:5px 5px 0',
+                        url:'/knitkit/erp_app/desktop/online_document_sections/new',
+                        defaults: {
+                          width: 225
+                        },
+                        items: [
                         {
-                          Ext.Msg.alert('Status', obj.message);
-                        }
-                      },
-                      failure: function(response) {
-                        Ext.Msg.alert('Status', 'Error adding layout.');
-                      }
-                    });
-                  }
-                }
-              });
-            }
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          allowBlank:false,
+                          name:'title'
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Unique Name',
+                          allowBlank:true,
+                          name:'internal_identifier'
+                        },
+                        {
+                          xtype: 'combo',
+                          forceSelection:true,
+                          store: [
+                          ['OnlineDocumentSection','Online Document Section'],
+                          ],
+                          value:'OnlineDocumentSection',
+                          fieldLabel: 'Type',
+                          name: 'type',
+                          allowBlank: false,
+                          triggerAction: 'all'
+                        },
+                        {
+                          xtype: 'combo',
+                          forceSelection: true,
+                          store:[
+                          ['Content', 'Content']
+                          ],
+                          value: 'Content',
+                          fieldLabel: 'Document Type',
+                          name: 'documenttype',
+                          allowBlank: false,
+                          triggerAction: 'all'
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Display in menu?',
+                          name:'in_menu',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'in_menu',
+                            inputValue: 'yes',
+                            checked:true
+                          },
 
+                          {
+                            boxLabel:'No',
+                            name:'in_menu',
+                            inputValue: 'no'
+                          }]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'website_section_id',
+                          value:record.data.id.split('_')[1]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'website_id',
+                          value:record.data.siteId
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        text:'Submit',
+                        listeners:{
+                          'click':function(button){
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('.form')[0];
+                            self.setWindowStatus('Creating document section...');
+                            formPanel.getForm().submit({
+                              reset:true,
+                              success:function(form, action){
+                                self.clearWindowStatus();
+                                var obj = Ext.decode(action.response.responseText);
+                                if(obj.success){
+                                  record.appendChild(obj.node);
+                                  self.initialConfig['centerRegion'].editContent(obj.documented_content.title, obj.documented_content.id, obj.documented_content.body_html, record.data.siteId, 'article');
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", obj.message);
+                                }
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                var obj = Ext.decode(action.response.responseText);
+                                if(obj.message){
+                                  Ext.Msg.alert("Error", obj.message);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", "Error creating document.");
+                                }
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          addSectionWindow.close();
+                        }
+                      }]
+                    });
+                    addSectionWindow.show();
+                  }
+                }
+              });
+            }
+						
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'Section'
+            }))
+            {
+              items.push({
+                text:'Update Document',
+                iconCls:'icon-edit',
+                listeners:{
+                  'click':function(){
+                    var updateSectionWindow = Ext.create("Ext.window.Window",{
+                      layout:'fit',
+                      width:375,
+                      title:'Update Document 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
+                        },
+                        items: [
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          value:record.data.text,
+                          name:'title'
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Unique Name',
+                          allowBlank:true,
+                          name:'internal_identifier',
+                          value:record.data.internal_identifier
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Display in menu?',
+                          name:'in_menu',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'in_menu',
+                            inputValue: 'yes',
+                            checked:record.data.inMenu
+                          },
+
+                          {
+                            boxLabel:'No',
+                            name:'in_menu',
+                            inputValue: 'no',
+                            checked:!record.data.inMenu
+                          }]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'id',
+                          value:record.data.id.split('_')[1]
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        text:'Submit',
+                        listeners:{
+                          'click':function(button){
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('.form')[0];
+                            self.setWindowStatus('Updating document section...');
+                            formPanel.getForm().submit({
+                              success:function(form, action){
+                                self.clearWindowStatus();
+                                var values = formPanel.getValues();
+                                record.set('title',values.title);
+                                record.set('internal_identifier',values.internal_identifier);
+                                record.set("inMenu",(values.in_menu == 'yes'));
+                                record.commit();
+                                updateSectionWindow.close();
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                var obj =  Ext.decode(action.response.responseText);
+                                Ext.Msg.alert("Error", obj.msg);
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          updateSectionWindow.close();
+                        }
+                      }]
+                    });
+                    updateSectionWindow.show();
+                  }
+                }
+              });
+            }
+						
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'Section'
+            }))
+            {
+              items.push({
+                text:'Delete Document Section',
+                iconCls:'icon-delete',
+                listeners:{
+                  'click':function(){
+                    self.deleteSection(record);
+                  }
+                }
+              });
+            }
+          }
+
+          if(record.data['isSection']){
             items.push({
-              text:'Delete ' + record.data["type"],
-              iconCls:'icon-delete',
+              text:'View Articles',
+              iconCls:'icon-document',
               listeners:{
                 'click':function(){
-                  self.deleteSection(record);
+                  self.getArticles(record);
                 }
               }
             });
+
+            if(record.data.isSecured){
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'unsecure',
+                resource:'Section'
+              }))
+
+              {
+                items.push({
+                  text:'Unsecure',
+                  iconCls:'icon-document',
+                  listeners:{
+                    'click':function(){
+                      self.changeSecurityOnSection(record, false);
+                    }
+                  }
+                });
+              }
+            }
+            else{
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'secure',
+                resource:'Section'
+              }))
+
+              {
+                items.push({
+                  text:'Secure',
+                  iconCls:'icon-document_lock',
+                  listeners:{
+                    'click':function(){
+                      self.changeSecurityOnSection(record, true);
+                    }
+                  }
+                });
+              }
+            }
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'Section'
+            }))
+
+            {
+              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
+                        },
+                        items: [
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          allowBlank:false,
+                          name:'title'
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Unique Name',
+                          allowBlank:true,
+                          name:'internal_identifier'
+                        },
+                        {
+                          xtype: 'combo',
+                          forceSelection:true,
+                          store: [
+                          ['Page','Page'],
+                          ['Blog','Blog'],
+                          ],
+                          value:'Page',
+                          fieldLabel: 'Type',
+                          name: 'type',
+                          allowBlank: false,
+                          triggerAction: 'all'
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Display in menu?',
+                          name:'in_menu',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'in_menu',
+                            inputValue: 'yes',
+                            checked:true
+                          },
+
+                          {
+                            boxLabel:'No',
+                            name:'in_menu',
+                            inputValue: 'no'
+                          }]
+                        },
+                        {
+                          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:'No',
+                            name:'render_with_base_layout',
+                            inputValue: 'no'
+                          }]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'website_section_id',
+                          value:record.data.id.split('_')[1]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'website_id',
+                          value:record.data.siteId
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        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();
+                                var obj = Ext.decode(action.response.responseText);
+                                if(obj.success){
+                                  record.appendChild(obj.node);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", obj.message);
+                                }
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                var obj =  Ext.decode(action.response.responseText);
+                                if(obj.message){
+                                  Ext.Msg.alert("Error", obj.message);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", "Error creating section.");
+                                }
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          addSectionWindow.close();
+                        }
+                      }]
+                    });
+                    addSectionWindow.show();
+                  }
+                }
+              });
+            }
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'Section'
+            }))
+
+            {
+              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
+                        },
+                        items: [
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          value:record.data.text,
+                          name:'title'
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Unique Name',
+                          allowBlank:true,
+                          name:'internal_identifier',
+                          value:record.data.internal_identifier
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Display in menu?',
+                          name:'in_menu',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'in_menu',
+                            inputValue: 'yes',
+                            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:[
+                          {
+                            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
+                          }]
+                        },
+                        {
+                          xtype: 'displayfield',
+                          fieldLabel: 'Path',
+                          name: 'path',
+                          value: record.data.path
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'id',
+                          value:record.data.id.split('_')[1]
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        text:'Submit',
+                        listeners:{
+                          'click':function(button){
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('.form')[0];
+                            self.setWindowStatus('Updating section...');
+                            formPanel.getForm().submit({
+                              success:function(form, action){
+                                self.clearWindowStatus();
+                                var values = formPanel.getValues();
+                                record.set('title',values.title);
+                                record.set('text',values.title);
+                                record.set('internal_identifier',values.internal_identifier);
+                                record.set("inMenu",(values.in_menu == 'yes'));
+                                record.set("renderWithBaseLayout",(values.render_with_base_layout == 'yes'));
+                                record.commit();
+                                updateSectionWindow.close();
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                var obj =  Ext.decode(action.response.responseText);
+                                Ext.Msg.alert("Error", obj.msg);
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          updateSectionWindow.close();
+                        }
+                      }]
+                    });
+                    updateSectionWindow.show();
+                  }
+                }
+              });
+            }
+
+            //no layouts for blogs.
+            if(Compass.ErpApp.Utility.isBlank(record.data['isBlog']) && record.data['hasLayout']){
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'edit',
+                resource:'Layout'
+              }))
+
+              {
+                items.push({
+                  text:'Edit Layout',
+                  iconCls:'icon-edit',
+                  listeners:{
+                    'click':function(){
+                      self.editSectionLayout(record.data.text, record.data.id.split('_')[1], record.data.siteId);
+                    }
+                  }
+                });
+              }
+            }
+            else
+            if(Compass.ErpApp.Utility.isBlank(record.data['isBlog'])){
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'create',
+                resource:'Layout'
+              }))
+
+              {
+                items.push({
+                  text:'Add Layout',
+                  iconCls:'icon-add',
+                  listeners:{
+                    'click':function(){
+                      var sectionId = record.data.id.split('_')[1];
+                      Ext.Ajax.request({
+                        url: '/knitkit/erp_app/desktop/section/add_layout',
+                        method: 'POST',
+                        params:{
+                          id:sectionId
+                        },
+                        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);
+                          }
+                          else
+                          {
+                            Ext.Msg.alert('Status', obj.message);
+                          }
+                        },
+                        failure: function(response) {
+                          Ext.Msg.alert('Status', 'Error adding layout.');
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            }
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'Section'
+            }))
+
+            {
+              items.push({
+                text:'Delete ' + record.data["type"],
+                iconCls:'icon-delete',
+                listeners:{
+                  'click':function(){
+                    self.deleteSection(record);
+                  }
+                }
+              });
+            }
           }
           else
           if(record.data['isWebsite']){
-            if(currentUser.hasRole(['admin','publisher'])){
+            items.push({
+              text:'Configure',
+              iconCls:'icon-gear',
+              listeners:{
+                'click':function(){
+                  self.updateWebsiteConfiguration(record);
+                }
+              }
+            });
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'publish',
+              resource:'Website'
+            }))
+
+            {
               items.push({
                 text:'Publish',
                 iconCls:'icon-document_up',
@@ -946,9 +1379,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                 }
               });
             }
-            else{
-              compassUser.showInvalidAccess();
-            }
 
             items.push({
               text:'Publications',
@@ -970,183 +1400,560 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
               }
             });
 
-            items.push({
-              text:'Update Website',
-              iconCls:'icon-edit',
-              listeners:{
-                'click':function(){
-                  var editWebsiteWindow = Ext.create("Ext.window.Window",{
-                    layout:'fit',
-                    width:375,
-                    title:'Update Website',
-                    height:250,
-                    plain: true,
-                    buttonAlign:'center',
-                    items: Ext.create("Ext.form.Panel",{
-                      labelWidth: 110,
-                      frame:false,
-                      bodyStyle:'padding:5px 5px 0',
-                      url:'/knitkit/erp_app/desktop/site/update',
-                      defaults: {
-                        width: 225
-                      },
-                      items: [
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Name',
-                        allowBlank:false,
-                        name:'name',
-                        value:record.data['name']
-                      },
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Title',
-                        id:'knitkitUpdateSiteTitle',
-                        allowBlank:false,
-                        name:'title',
-                        value:record.data['title']
-                      },
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Sub Title',
-                        allowBlank:true,
-                        name:'subtitle',
-                        value:record.data['subtitle']
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'Website'
+            }))
 
-                      },
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Email',
-                        allowBlank:false,
-                        name:'email',
-                        value:record.data['email']
-                      },
-                      {
-                        xtype:'radiogroup',
-                        fieldLabel:'Auto Activate Publication?',
-                        name:'auto_activate_publication',
-                        id:'knitkitAutoActivatePublication',
-                        columns:2,
-                        items:[
+            {
+              items.push({
+                text:'Update Website',
+                iconCls:'icon-edit',
+                listeners:{
+                  'click':function(){
+                    var editWebsiteWindow = Ext.create("Ext.window.Window",{
+                      title:'Update Website',
+                      plain: true,
+                      buttonAlign:'center',
+                      items: Ext.create("Ext.form.Panel",{
+                        labelWidth: 110,
+                        frame:false,
+                        bodyStyle:'padding:5px 5px 0',
+                        url:'/knitkit/erp_app/desktop/site/update',
+                        defaults: {
+                          width: 225
+                        },
+                        items: [
                         {
-                          boxLabel:'Yes',
-                          name:'auto_activate_publication',
-                          inputValue: 'yes',
-                          checked:record.data['autoActivatePublication']
+                          xtype:'textfield',
+                          fieldLabel:'Name',
+                          allowBlank:false,
+                          name:'name',
+                          value:record.data['name']
                         },
                         {
-                          boxLabel:'No',
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          id:'knitkitUpdateSiteTitle',
+                          allowBlank:false,
+                          name:'title',
+                          value:record.data['title']
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Sub Title',
+                          allowBlank:true,
+                          name:'subtitle',
+                          value:record.data['subtitle']
+
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Email',
+                          allowBlank:false,
+                          name:'email',
+                          value:record.data['email']
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Auto Activate Publication?',
                           name:'auto_activate_publication',
-                          inputValue: 'no',
-                          checked:!record.data['autoActivatePublication']
-                        }]
-                      },
-                      {
-                        xtype:'radiogroup',
-                        fieldLabel:'Email Inquiries?',
-                        name:'email_inquiries',
-                        id:'knitkitEmailInquiries',
-                        columns:2,
-                        items:[
+                          id:'knitkitAutoActivatePublication',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'auto_activate_publication',
+                            inputValue: 'yes',
+                            checked:record.data['autoActivatePublication']
+                          },
+                          {
+                            boxLabel:'No',
+                            name:'auto_activate_publication',
+                            inputValue: 'no',
+                            checked:!record.data['autoActivatePublication']
+                          }]
+                        },
                         {
-                          boxLabel:'Yes',
+                          xtype:'radiogroup',
+                          fieldLabel:'Email Inquiries?',
                           name:'email_inquiries',
-                          inputValue: 'yes',
-                          checked:record.data['emailInquiries'],
-                          listeners:{
-                            scope:this,
-                            'check':function(checkbox, checked){
-                              if(checked)
-                              {
-                                Ext.Msg.alert("Warning","ActionMailer must be setup to send emails");
+                          id:'knitkitEmailInquiries',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'email_inquiries',
+                            inputValue: 'yes',
+                            checked:record.data['emailInquiries'],
+                            listeners:{
+                              scope:this,
+                              'check':function(checkbox, checked){
+                                if(checked)
+                                {
+                                  Ext.Msg.alert("Warning","ActionMailer must be setup to send emails");
+                                }
                               }
                             }
+                          },
+
+                          {
+                            boxLabel:'No',
+                            name:'email_inquiries',
+                            inputValue: 'no',
+                            checked:!record.data['emailInquiries']
+                          }]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'id',
+                          value:record.data.id.split('_')[1]
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        text:'Submit',
+                        listeners:{
+                          'click':function(button){
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('form')[0];
+                            self.setWindowStatus('Updating website...');
+                            formPanel.getForm().submit({
+                              success:function(form, action){
+                                self.clearWindowStatus();
+                                record.data['name'] = form.findField('name').getValue();
+                                record.data['title'] = form.findField('title').getValue();
+                                record.data['subtitle'] = form.findField('subtitle').getValue();
+                                record.data['email'] = form.findField('email').getValue();
+                                //node.setText(node.attributes['title']);
+                                record.data.emailInquiries = form.findField('knitkitEmailInquiries').getValue().inputValue == 'yes';
+                                record.data.autoActivatePublication = form.findField('knitkitAutoActivatePublication').getValue().inputValue == 'yes';
+                                editWebsiteWindow.close();
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                Ext.Msg.alert("Error", "Error updating website");
+                              }
+                            });
                           }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          editWebsiteWindow.close();
+                        }
+                      }]
+                    });
+                    editWebsiteWindow.show();
+                  }
+                }
+              });
+            }
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'Website'
+            }))
+
+            {
+              items.push({
+                text:'Delete',
+                iconCls:'icon-delete',
+                listeners:{
+                  'click':function(){
+                    self.deleteSite(record);
+                  }
+                }
+              });
+            }
+
+            items.push({
+              text:'Export',
+              iconCls:'icon-document_out',
+              listeners:{
+                'click':function(){
+                  self.exportSite(record.data.id.split('_')[1]);
+                }
+              }
+            });
+          }
+          else
+          if(record.data['isHostRoot']){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'Host'
+            }))
+
+            {
+              items.push({
+                text:'Add Host',
+                iconCls:'icon-add',
+                listeners:{
+                  'click':function(){
+                    var addHostWindow = Ext.create("Ext.window.Window",{
+                      layout:'fit',
+                      width:310,
+                      title:'Add 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/add_host',
+                        defaults: {
+                          width: 225
                         },
+                        items:[
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Host',
+                          name:'host',
+                          allowBlank:false
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'id',
+                          value:record.data.websiteId
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        text:'Submit',
+                        listeners:{
+                          'click':function(button){
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('form')[0];
+                            self.setWindowStatus('Adding Host...');
+                            formPanel.getForm().submit({
+                              reset:true,
+                              success:function(form, action){
+                                self.clearWindowStatus();
+                                var obj =  Ext.decode(action.response.responseText);
+                                if(obj.success){
+                                  addHostWindow.close();
+                                  record.appendChild(obj.node);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", obj.msg);
+                                }
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                Ext.Msg.alert("Error", "Error adding Host");
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          addHostWindow.close();
+                        }
+                      }]
+                    });
+                    addHostWindow.show();
+                  }
+                }
+              });
+            }
+          }
+          else
+          if(record.data['isHost']){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'Host'
+            }))
 
+            {
+              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
+                        },
+                        items:[
                         {
-                          boxLabel:'No',
-                          name:'email_inquiries',
-                          inputValue: 'no',
-                          checked:!record.data['emailInquiries']
-                        }]
-                      },
-                      {
-                        xtype:'hidden',
-                        name:'id',
-                        value:record.data.id.split('_')[1]
-                      }
-                      ]
-                    }),
-                    buttons: [{
-                      text:'Submit',
-                      listeners:{
-                        'click':function(button){
-                          var window = button.findParentByType('window');
-                          var formPanel = window.query('form')[0];
-                          self.setWindowStatus('Updating website...');
-                          formPanel.getForm().submit({
-                            success:function(form, action){
-                              self.clearWindowStatus();
-                              record.data['name'] = form.findField('name').getValue();
-                              record.data['title'] = form.findField('title').getValue();
-                              record.data['subtitle'] = form.findField('subtitle').getValue();
-                              record.data['email'] = form.findField('email').getValue();
-                              //node.setText(node.attributes['title']);
-                              record.data.emailInquiries = form.findField('knitkitEmailInquiries').getValue().inputValue == 'yes';
-                              record.data.autoActivatePublication = form.findField('knitkitAutoActivatePublication').getValue().inputValue == 'yes';
-                              editWebsiteWindow.close();
-                            },
-                            failure:function(form, action){
-                              self.clearWindowStatus();
-                              Ext.Msg.alert("Error", "Error updating website");
-                            }
-                          });
+                          xtype:'textfield',
+                          fieldLabel:'Host',
+                          id:'knitkitUpdateWebsiteHostHost',
+                          name:'host',
+                          value:record.data.host,
+                          allowBlank:false
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'id',
+                          value:record.data.websiteHostId
                         }
+                        ]
+                      }),
+                      buttons: [{
+                        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();
+                                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();
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", obj.msg);
+                                }
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                Ext.Msg.alert("Error", "Error updating Host");
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          updateHostWindow.close();
+                        }
+                      }]
+                    });
+                    updateHostWindow.show();
+                  }
+                }
+              });
+            }
+
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'Host'
+            }))
+
+            {
+              items.push({
+                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;
                       }
-                    },{
-                      text: 'Close',
-                      handler: function(){
-                        editWebsiteWindow.close();
+                      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();
+                            var obj = Ext.decode(response.responseText);
+                            if(obj.success){
+                              record.remove(true);
+                            }
+                            else{
+                              Ext.Msg.alert('Error', 'Error deleting Host');
+                            }
+                          },
+                          failure: function(response) {
+                            self.clearWindowStatus();
+                            Ext.Msg.alert('Error', 'Error deleting Host');
+                          }
+                        });
                       }
-                    }]
-                  });
-                  editWebsiteWindow.show();
+                    });
+                  }
                 }
-              }
-            });
+              });
+            }
+          }
+          else if(record.data['isSectionRoot']){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'Section'
+            }))
+
+            {
+              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: Ext.create("Ext.form.Panel",{
+                        labelWidth: 110,
+                        frame:false,
+                        bodyStyle:'padding:5px 5px 0',
+                        url:'/knitkit/erp_app/desktop/section/new',
+                        defaults: {
+                          width: 225
+                        },
+                        items: [
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Title',
+                          allowBlank:false,
+                          name:'title'
+                        },
+                        {
+                          xtype:'textfield',
+                          fieldLabel:'Unique Name',
+                          allowBlank:true,
+                          name:'internal_identifier'
+                        },
+                        {
+                          xtype: 'combo',
+                          forceSelection:true,
+                          store: [
+                          ['Page','Page'],
+                          ['Blog','Blog'],
+                          ['OnlineDocumentSection', 'Online Document Section']
+                          ],
+                          value:'Page',
+                          fieldLabel: 'Type',
+                          name: 'type',
+                          allowBlank: false,
+                          triggerAction: 'all'
+                        },
+                        {
+                          xtype:'radiogroup',
+                          fieldLabel:'Display in menu?',
+                          name:'in_menu',
+                          columns:2,
+                          items:[
+                          {
+                            boxLabel:'Yes',
+                            name:'in_menu',
+                            inputValue: 'yes',
+                            checked:true
+                          },
 
-            items.push({
-              text:'Delete',
-              iconCls:'icon-delete',
-              listeners:{
-                'click':function(){
-                  self.deleteSite(record);
-                }
-              }
-            });
+                          {
+                            boxLabel:'No',
+                            name:'in_menu',
+                            inputValue: 'no'
+                          }]
+                        },
+                        {
+                          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
+                          },
 
-            items.push({
-              text:'Export',
-              iconCls:'icon-document_out',
-              listeners:{
-                'click':function(){
-                  self.exportSite(record.data.id.split('_')[1]);
+                          {
+                            boxLabel:'No',
+                            name:'render_with_base_layout',
+                            inputValue: 'no'
+                          }]
+                        },
+                        {
+                          xtype:'hidden',
+                          name:'website_id',
+                          value:record.data.websiteId
+                        }
+                        ]
+                      }),
+                      buttons: [{
+                        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();
+                                var obj = Ext.decode(action.response.responseText);
+                                if(obj.success){
+                                  record.appendChild(obj.node);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", obj.msg);
+                                }
+                              },
+                              failure:function(form, action){
+                                self.clearWindowStatus();
+                                var obj = Ext.decode(action.response.responseText);
+                                if(obj.message){
+                                  Ext.Msg.alert("Error", obj.message);
+                                }
+                                else{
+                                  Ext.Msg.alert("Error", "Error creating section.");
+                                }
+                              }
+                            });
+                          }
+                        }
+                      },{
+                        text: 'Close',
+                        handler: function(){
+                          addSectionWindow.close();
+                        }
+                      }]
+                    });
+                    addSectionWindow.show();
+                  }
                 }
-              }
-            });
+              });
+            }
           }
           else
-          if(record.data['isHostRoot']){
-            items.push({
-              text:'Add Host',
-              iconCls:'icon-add',
-              listeners:{
-                'click':function(){
-                  var addHostWindow = Ext.create("Ext.window.Window",{
+          if(record.data['isMenuRoot']){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'create',
+              resource:'Menu'
+            }))
+
+            {
+              items.push({
+                text:'Add Menu',
+                iconCls:'icon-add',
+                handler:function(btn){
+                  var addMenuWindow = Ext.create("Ext.window.Window",{
                     layout:'fit',
-                    width:310,
-                    title:'Add Host',
+                    width:375,
+                    title:'New Menu',
                     height:100,
                     plain: true,
                     buttonAlign:'center',
@@ -1154,21 +1961,20 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                       labelWidth: 50,
                       frame:false,
                       bodyStyle:'padding:5px 5px 0',
-                      width: 425,
-                      url:'/knitkit/erp_app/desktop/site/add_host',
+                      url:'/knitkit/erp_app/desktop/website_nav/new',
                       defaults: {
                         width: 225
                       },
-                      items:[
+                      items: [
                       {
                         xtype:'textfield',
-                        fieldLabel:'Host',
-                        name:'host',
-                        allowBlank:false
+                        fieldLabel:'name',
+                        allowBlank:false,
+                        name:'name'
                       },
                       {
                         xtype:'hidden',
-                        name:'id',
+                        name:'website_id',
                         value:record.data.websiteId
                       }
                       ]
@@ -1179,14 +1985,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                         'click':function(button){
                           var window = button.findParentByType('window');
                           var formPanel = window.query('form')[0];
-                          self.setWindowStatus('Adding Host...');
+                          self.setWindowStatus('Creating menu...');
                           formPanel.getForm().submit({
                             reset:true,
                             success:function(form, action){
                               self.clearWindowStatus();
-                              var obj =  Ext.decode(action.response.responseText);
+                              var obj = Ext.decode(action.response.responseText);
                               if(obj.success){
-                                addHostWindow.close();
                                 record.appendChild(obj.node);
                               }
                               else{
@@ -1195,7 +2000,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                             },
                             failure:function(form, action){
                               self.clearWindowStatus();
-                              Ext.Msg.alert("Error", "Error adding Host");
+                              var obj = Ext.decode(action.response.responseText);
+                              Ext.Msg.alert("Error", obj.msg);
                             }
                           });
                         }
@@ -1203,51 +2009,55 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                     },{
                       text: 'Close',
                       handler: function(){
-                        addHostWindow.close();
+                        addMenuWindow.close();
                       }
                     }]
                   });
-                  addHostWindow.show();
+                  addMenuWindow.show();
                 }
-              }
-            });
+              });
+            }
           }
           else
-          if(record.data['isHost']){
-            items.push({
-              text:'Update',
-              iconCls:'icon-edit',
-              listeners:{
-                'click':function(){
-                  var updateHostWindow = Ext.create("Ext.window.Window",{
+          if(record.data['isWebsiteNav']){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'Menu'
+            }))
+
+            {
+              items.push({
+                text:'Update',
+                iconCls:'icon-edit',
+                handler:function(btn){
+                  var updateMenuWindow = Ext.create("Ext.window.Window",{
                     layout:'fit',
-                    width:310,
-                    title:'Update Host',
+                    width:375,
+                    title:'Update Menu',
                     height:100,
                     plain: true,
                     buttonAlign:'center',
-                    items: Ext.create("Ext.form.Panel",{
+                    items: new Ext.FormPanel({
                       labelWidth: 50,
                       frame:false,
                       bodyStyle:'padding:5px 5px 0',
-                      width: 425,
-                      url:'/knitkit/erp_app/desktop/site/update_host',
+                      url:'/knitkit/erp_app/desktop/website_nav/update',
                       defaults: {
                         width: 225
                       },
-                      items:[
+                      items: [
                       {
                         xtype:'textfield',
-                        fieldLabel:'Host',
-                        id:'knitkitUpdateWebsiteHostHost',
-                        name:'host',
-                        value:record.data.host,
-                        allowBlank:false
+                        fieldLabel:'Name',
+                        value:record.data.text,
+                        id:'knitkit_website_nav_update_name',
+                        allowBlank:false,
+                        name:'name'
                       },
                       {
                         xtype:'hidden',
-                        name:'id',
-                        value:record.data.websiteHostId
+                        name:'website_nav_id',
+                        value:record.data.websiteNavId
                       }
                       ]
                     }),
@@ -1257,18 +2067,16 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                         'click':function(button){
                           var window = button.findParentByType('window');
                           var formPanel = window.query('form')[0];
-                          self.setWindowStatus('Updating Host...');
+                          self.setWindowStatus('Creating menu...');
                           formPanel.getForm().submit({
                             reset:false,
                             success:function(form, action){
                               self.clearWindowStatus();
-                              var obj =  Ext.decode(action.response.responseText);
+                              var obj = Ext.decode(action.response.responseText);
                               if(obj.success){
-                                var newHost = Ext.getCmp('knitkitUpdateWebsiteHostHost').getValue();
-                                record.set('host',newHost);
-                                record.set('text',newHost);
+                                var newText = Ext.getCmp('knitkit_website_nav_update_name').getValue();
+                                record.set('text',newText);
                                 record.commit();
-                                updateHostWindow.close();
                               }
                               else{
                                 Ext.Msg.alert("Error", obj.msg);
@@ -1276,7 +2084,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                             },
                             failure:function(form, action){
                               self.clearWindowStatus();
-                              Ext.Msg.alert("Error", "Error updating Host");
+                              var obj = Ext.decode(action.response.responseText);
+                              Ext.Msg.alert("Error", obj.msg);
                             }
                           });
                         }
@@ -1284,34 +2093,38 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                     },{
                       text: 'Close',
                       handler: function(){
-                        updateHostWindow.close();
+                        updateMenuWindow.close();
                       }
                     }]
                   });
-                  updateHostWindow.show();
+                  updateMenuWindow.show();
                 }
-              }
-            });
+              });
+            }
 
-            items.push({
-              text:'Delete',
-              iconCls:'icon-delete',
-              listeners:{
-                'click':function(){
-                  Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this Host?', function(btn){
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'Menu'
+            }))
+
+            {
+              items.push({
+                text:'Delete',
+                iconCls:'icon-delete',
+                handler:function(btn){
+                  Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this menu?', function(btn){
                     if(btn == 'no'){
                       return false;
                     }
                     else
                     if(btn == 'yes')
                     {
-                      self.setWindowStatus('Deleting Host...');
-                      var conn = new Ext.data.Connection();
-                      conn.request({
-                        url: '/knitkit/erp_app/desktop/site/delete_host',
+                      self.setWindowStatus('Deleting menu...');
+                      Ext.Ajax.request({
+                        url: '/knitkit/erp_app/desktop/website_nav/delete',
                         method: 'POST',
                         params:{
-                          id:record.data.websiteHostId
+                          id:record.data.websiteNavId
                         },
                         success: function(response) {
                           self.clearWindowStatus();
@@ -1320,567 +2133,292 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
                             record.remove(true);
                           }
                           else{
-                            Ext.Msg.alert('Error', 'Error deleting Host');
+                            Ext.Msg.alert('Error', 'Error deleting menu');
                           }
                         },
                         failure: function(response) {
                           self.clearWindowStatus();
-                          Ext.Msg.alert('Error', 'Error deleting Host');
+                          Ext.Msg.alert('Error', 'Error deleting menu');
                         }
                       });
                     }
                   });
                 }
-              }
-            });
-          }
-          else if(record.data['isSectionRoot']){
-            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: Ext.create("Ext.form.Panel",{
-                      labelWidth: 110,
-                      frame:false,
-                      bodyStyle:'padding:5px 5px 0',
-                      url:'/knitkit/erp_app/desktop/section/new',
-                      defaults: {
-                        width: 225
-                      },
-                      items: [
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Title',
-                        allowBlank:false,
-                        name:'title'
-                      },
-                      {
-                        xtype:'textfield',
-                        fieldLabel:'Unique Name',
-                        allowBlank:true,
-                        name:'internal_identifier'
-                      },
-                      {
-                        xtype: 'combo',
-                        forceSelection:true,
-                        store: [
-                        ['Page','Page'],
-                        ['Blog','Blog'],
-                        ],
-                        value:'Page',
-                        fieldLabel: 'Type',
-                        name: 'type',
-                        allowBlank: false,
-                        triggerAction: 'all'
-                      },
-                      {
-                        xtype:'radiogroup',
-                        fieldLabel:'Display in menu?',
-                        name:'in_menu',
-                        columns:2,
-                        items:[
-                        {
-                          boxLabel:'Yes',
-                          name:'in_menu',
-                          inputValue: 'yes',
-                          checked:true
-                        },
-
-                        {
-                          boxLabel:'No',
-                          name:'in_menu',
-                          inputValue: 'no'
-                        }]
-                      },
-                      {
-                        xtype:'hidden',
-                        name:'website_id',
-                        value:record.data.websiteId
-                      }
-                      ]
-                    }),
-                    buttons: [{
-                      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();
-                              var obj = Ext.decode(action.response.responseText);
-                              if(obj.success){
-                                record.appendChild(obj.node);
-                              }
-                              else{
-                                Ext.Msg.alert("Error", obj.message);
-                              }
-                            },
-                            failure:function(form, action){
-                              self.clearWindowStatus();
-                              var obj = Ext.decode(action.response.responseText);
-                              if(obj.message){
-                                Ext.Msg.alert("Error", obj.message);
-                              }
-                              else{
-                                Ext.Msg.alert("Error", "Error creating section.");
-                              }
-                            }
-                          });
-                        }
-                      }
-                    },{
-                      text: 'Close',
-                      handler: function(){
-                        addSectionWindow.close();
-                      }
-                    }]
-                  });
-                  addSectionWindow.show();
-                }
-              }
-            });
-          }
-          else
-          if(record.data['isMenuRoot']){
-            items.push({
-              text:'Add Menu',
-              iconCls:'icon-add',
-              handler:function(btn){
-                var addMenuWindow = Ext.create("Ext.window.Window",{
-                  layout:'fit',
-                  width:375,
-                  title:'New Menu',
-                  height:100,
-                  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/new',
-                    defaults: {
-                      width: 225
-                    },
-                    items: [
-                    {
-                      xtype:'textfield',
-                      fieldLabel:'name',
-                      allowBlank:false,
-                      name:'name'
-                    },
-                    {
-                      xtype:'hidden',
-                      name:'website_id',
-                      value:record.data.websiteId
-                    }
-                    ]
-                  }),
-                  buttons: [{
-                    text:'Submit',
-                    listeners:{
-                      'click':function(button){
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        self.setWindowStatus('Creating menu...');
-                        formPanel.getForm().submit({
-                          reset:true,
-                          success:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            if(obj.success){
-                              record.appendChild(obj.node);
-                            }
-                            else{
-                              Ext.Msg.alert("Error", obj.msg);
-                            }
-                          },
-                          failure:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            Ext.Msg.alert("Error", obj.msg);
-                          }
-                        });
-                      }
-                    }
-                  },{
-                    text: 'Close',
-                    handler: function(){
-                      addMenuWindow.close();
-                    }
-                  }]
-                });
-                addMenuWindow.show();
-              }
-            });
-          }
-          else
-          if(record.data['isWebsiteNav']){
-            items.push({
-              text:'Update',
-              iconCls:'icon-edit',
-              handler:function(btn){
-                var updateMenuWindow = Ext.create("Ext.window.Window",{
-                  layout:'fit',
-                  width:375,
-                  title:'Update Menu',
-                  height:100,
-                  plain: true,
-                  buttonAlign:'center',
-                  items: new Ext.FormPanel({
-                    labelWidth: 50,
-                    frame:false,
-                    bodyStyle:'padding:5px 5px 0',
-                    url:'/knitkit/erp_app/desktop/website_nav/update',
-                    defaults: {
-                      width: 225
-                    },
-                    items: [
-                    {
-                      xtype:'textfield',
-                      fieldLabel:'Name',
-                      value:record.data.text,
-                      id:'knitkit_website_nav_update_name',
-                      allowBlank:false,
-                      name:'name'
-                    },
-                    {
-                      xtype:'hidden',
-                      name:'website_nav_id',
-                      value:record.data.websiteNavId
-                    }
-                    ]
-                  }),
-                  buttons: [{
-                    text:'Submit',
-                    listeners:{
-                      'click':function(button){
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        self.setWindowStatus('Creating menu...');
-                        formPanel.getForm().submit({
-                          reset:false,
-                          success:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            if(obj.success){
-                              var newText = Ext.getCmp('knitkit_website_nav_update_name').getValue();
-                              record.set('text',newText);
-                              record.commit();
-                            }
-                            else{
-                              Ext.Msg.alert("Error", obj.msg);
-                            }
-                          },
-                          failure:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            Ext.Msg.alert("Error", obj.msg);
-                          }
-                        });
-                      }
-                    }
-                  },{
-                    text: 'Close',
-                    handler: function(){
-                      updateMenuWindow.close();
-                    }
-                  }]
-                });
-                updateMenuWindow.show();
-              }
-            });
-
-            items.push({
-              text:'Delete',
-              iconCls:'icon-delete',
-              handler:function(btn){
-                Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this menu?', function(btn){
-                  if(btn == 'no'){
-                    return false;
-                  }
-                  else
-                  if(btn == 'yes')
-                  {
-                    self.setWindowStatus('Deleting menu...');
-                    var conn = new Ext.data.Connection();
-                    conn.request({
-                      url: '/knitkit/erp_app/desktop/website_nav/delete',
-                      method: 'POST',
-                      params:{
-                        id:record.data.websiteNavId
-                      },
-                      success: function(response) {
-                        self.clearWindowStatus();
-                        var obj = Ext.decode(response.responseText);
-                        if(obj.success){
-                          record.remove(true);
-                        }
-                        else{
-                          Ext.Msg.alert('Error', 'Error deleting menu');
-                        }
-                      },
-                      failure: function(response) {
-                        self.clearWindowStatus();
-                        Ext.Msg.alert('Error', 'Error deleting menu');
-                      }
-                    });
-                  }
-                });
-              }
-            });
+              });
+            }
           }
           else
           if(record.data['isWebsiteNavItem'])
-          {
-            items.push({
-              text:'Update Menu Item',
-              iconCls:'icon-edit',
-              handler:function(btn){
-                var addMenuItemWindow = Ext.create("Ext.window.Window",{
-                  layout:'fit',
-                  width:375,
-                  title:'Update Menu Item',
-                  height:175,
-                  plain: true,
-                  buttonAlign:'center',
-                  items: new Ext.FormPanel({
-                    labelWidth: 50,
-                    frame:false,
-                    bodyStyle:'padding:5px 5px 0',
-                    url:'/knitkit/erp_app/desktop/website_nav/update_menu_item',
-                    defaults: {
-                      width: 225
-                    },
-                    items: [
-                    {
-                      xtype:'textfield',
-                      fieldLabel:'Title',
-                      value:record.data.text,
-                      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:[
-                      ['website_section','Section'],
-                      //['article','Article'],
-                      ['url','Url']
-                      ],
-                      value:record.data.linkToType,
-                      listeners:{
-                        'change':function(combo, newValue, oldValue){
-                          switch(newValue){
-                            case 'website_section':
-                              Ext.getCmp('knitkit_website_nav_item_section').show();
-                              //Ext.getCmp('knitkit_website_nav_item_article').hide();
-                              Ext.getCmp('knitkit_website_nav_item_url').hide();
-                              break;
-                            case 'article':
-                              Ext.getCmp('knitkit_website_nav_item_section').hide();
-                              //Ext.getCmp('knitkit_website_nav_item_article').show();
-                              Ext.getCmp('knitkit_website_nav_item_url').hide();
-                              break;
-                            case 'url':
-                              Ext.getCmp('knitkit_website_nav_item_section').hide();
-                              //Ext.getCmp('knitkit_website_nav_item_article').hide();
-                              Ext.getCmp('knitkit_website_nav_item_url').show();
-                              break;
-                          }
-                        }
-                      }
-                    },
-                    {
-                      xtype:'combo',
-                      width:300,
-                      id:'knitkit_website_nav_item_section',
-                      hiddenName:'website_section_id',
-                      name:'website_section_id',
-                      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
-                          }
-                        },
-                        autoLoad:true,
-                        fields:[
-                        {
-                          name:'id'
-                        },
-                        {
-                          name:'title_permalink'
+          {
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'edit',
+              resource:'MenuItem'
+            }))
+
+            {
+              items.push({
+                text:'Update Menu Item',
+                iconCls:'icon-edit',
+                handler:function(btn){
+                  var addMenuItemWindow = Ext.create("Ext.window.Window",{
+                    layout:'fit',
+                    width:375,
+                    title:'Update Menu Item',
+                    height:175,
+                    plain: true,
+                    buttonAlign:'center',
+                    items: new Ext.FormPanel({
+                      labelWidth: 50,
+                      frame:false,
+                      bodyStyle:'padding:5px 5px 0',
+                      url:'/knitkit/erp_app/desktop/website_nav/update_menu_item',
+                      defaults: {
+                        width: 225
+                      },
+                      items: [
+                      {
+                        xtype:'textfield',
+                        fieldLabel:'Title',
+                        value:record.data.text,
+                        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:[
+                        ['website_section','Section'],
+                        //['article','Article'],
+                        ['url','Url']
 
-                        }
                         ],
+                        value:record.data.linkToType,
                         listeners:{
-                          'load':function(store, records, options){
-                            Ext.getCmp('knitkit_website_nav_item_section').setValue(record.data.linkedToId);
+                          'change':function(combo, newValue, oldValue){
+                            switch(newValue){
+                              case 'website_section':
+                                Ext.getCmp('knitkit_website_nav_item_section').show();
+                                //Ext.getCmp('knitkit_website_nav_item_article').hide();
+                                Ext.getCmp('knitkit_website_nav_item_url').hide();
+                                break;
+                              case 'article':
+                                Ext.getCmp('knitkit_website_nav_item_section').hide();
+                                //Ext.getCmp('knitkit_website_nav_item_article').show();
+                                Ext.getCmp('knitkit_website_nav_item_url').hide();
+                                break;
+                              case 'url':
+                                Ext.getCmp('knitkit_website_nav_item_section').hide();
+                                //Ext.getCmp('knitkit_website_nav_item_article').hide();
+                                Ext.getCmp('knitkit_website_nav_item_url').show();
+                                break;
+                            }
                           }
                         }
-                      }),
-                      forceSelection:true,
-                      editable:false,
-                      fieldLabel:'Section',
-                      autoSelect:true,
-                      typeAhead: false,
-                      queryMode: 'local',
-                      displayField:'title_permalink',
-                      valueField:'id',
-                      hidden:(record.data.linkToType != 'website_section' && record.data.linkToType != 'article')
-                    },
-                    {
-                      xtype:'textfield',
-                      fieldLabel:'Url',
-                      value:record.data.url,
-                      id:'knitkit_website_nav_item_url',
-                      hidden:(record.data.linkToType == 'website_section' || record.data.linkToType == 'article'),
-                      name:'url'
-                    },
-                    {
-                      xtype:'hidden',
-                      name:'website_nav_item_id',
-                      value:record.data.websiteNavItemId
-                    }
-                    ]
-                  }),
-                  buttons: [{
-                    text:'Submit',
-                    listeners:{
-                      'click':function(button){
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        self.setWindowStatus('Updating menu item...');
-                        formPanel.getForm().submit({
-                          reset:false,
-                          success:function(form, action){
-                            self.clearWindowStatus();
-                            var obj = Ext.decode(action.response.responseText);
-                            if(obj.success){
-                              record.data.linkedToId = obj.linkedToId;
-                              record.data.linkToType = obj.linkToType;
-                              record.data.url = obj.url;
-                            //node.getUI().getTextEl().innerHTML = obj.title;
-                            }
-                            else{
-                              Ext.Msg.alert("Error", obj.msg);
+                      },
+                      {
+                        xtype:'combo',
+                        width:300,
+                        id:'knitkit_website_nav_item_section',
+                        hiddenName:'website_section_id',
+                        name:'website_section_id',
+                        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
                             }
                           },
-                          failure:function(form, action){
-                            self.clearWindowStatus();
-                            if(action.response == null){
-                              Ext.Msg.alert("Error", 'Could not create menu item');
+                          autoLoad:true,
+                          fields:[
+                          {
+                            name:'id'
+                          },
+                          {
+                            name:'title_permalink'
+
+                          }
+                          ],
+                          listeners:{
+                            'load':function(store, records, options){
+                              Ext.getCmp('knitkit_website_nav_item_section').setValue(record.data.linkedToId);
                             }
-                            else{
+                          }
+                        }),
+                        forceSelection:true,
+                        editable:false,
+                        fieldLabel:'Section',
+                        autoSelect:true,
+                        typeAhead: false,
+                        queryMode: 'local',
+                        displayField:'title_permalink',
+                        valueField:'id',
+                        hidden:(record.data.linkToType != 'website_section' && record.data.linkToType != 'article')
+                      },
+                      {
+                        xtype:'textfield',
+                        fieldLabel:'Url',
+                        value:record.data.url,
+                        id:'knitkit_website_nav_item_url',
+                        hidden:(record.data.linkToType == 'website_section' || record.data.linkToType == 'article'),
+                        name:'url'
+                      },
+                      {
+                        xtype:'hidden',
+                        name:'website_nav_item_id',
+                        value:record.data.websiteNavItemId
+                      }
+                      ]
+                    }),
+                    buttons: [{
+                      text:'Submit',
+                      listeners:{
+                        'click':function(button){
+                          var window = button.findParentByType('window');
+                          var formPanel = window.query('form')[0];
+                          self.setWindowStatus('Updating menu item...');
+                          formPanel.getForm().submit({
+                            reset:false,
+                            success:function(form, action){
+                              self.clearWindowStatus();
                               var obj = Ext.decode(action.response.responseText);
-                              Ext.Msg.alert("Error", obj.msg);
+                              if(obj.success){
+                                record.data.linkedToId = obj.linkedToId;
+                                record.data.linkToType = obj.linkToType;
+                                record.data.url = obj.url;
+                              //node.getUI().getTextEl().innerHTML = obj.title;
+                              }
+                              else{
+                                Ext.Msg.alert("Error", obj.msg);
+                              }
+                            },
+                            failure:function(form, action){
+                              self.clearWindowStatus();
+                              if(action.response == null){
+                                Ext.Msg.alert("Error", 'Could not create menu item');
+                              }
+                              else{
+                                var obj = Ext.decode(action.response.responseText);
+                                Ext.Msg.alert("Error", obj.msg);
+                              }
+
                             }
-                                                       
-                          }
-                        });
+                          });
+                        }
                       }
-                    }
-                  },{
-                    text: 'Close',
-                    handler: function(){
-                      addMenuItemWindow.close();
-                    }
-                  }]
-                });
-                addMenuItemWindow.show();
-              }
-            });
+                    },{
+                      text: 'Close',
+                      handler: function(){
+                        addMenuItemWindow.close();
+                      }
+                    }]
+                  });
+                  addMenuItemWindow.show();
+                }
+              });
+            }
 
             if(record.data.isSecured){
-              items.push({
-                text:'Unsecure',
-                iconCls:'icon-document',
-                listeners:{
-                  'click':function(){
-                    self.changeSecurityOnMenuItem(record, false);
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'unsecure',
+                resource:'MenuItem'
+              }))
+
+              {
+                items.push({
+                  text:'Unsecure',
+                  iconCls:'icon-document',
+                  listeners:{
+                    'click':function(){
+                      self.changeSecurityOnMenuItem(record, false);
+                    }
                   }
-                }
-              });
+                });
+              }
             }
             else{
-              items.push({
-                text:'Secure',
-                iconCls:'icon-document_lock',
-                listeners:{
-                  'click':function(){
-                    self.changeSecurityOnMenuItem(record, true);
+              if (currentUser.hasApplicationCapability('knitkit', {
+                capability_type_iid:'secure',
+                resource:'MenuItem'
+              }))
+
+              {
+                items.push({
+                  text:'Secure',
+                  iconCls:'icon-document_lock',
+                  listeners:{
+                    'click':function(){
+                      self.changeSecurityOnMenuItem(record, true);
+                    }
                   }
-                }
-              });
+                });
+              }
             }
 
-            items.push({
-              text:'Delete',
-              iconCls:'icon-delete',
-              handler:function(btn){
-                Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this menu item?', function(btn){
-                  if(btn == 'no'){
-                    return false;
-                  }
-                  else
-                  if(btn == 'yes')
-                  {
-                    self.setWindowStatus('Deleting menu item...');
-                    var conn = new Ext.data.Connection();
-                    conn.request({
-                      url: '/knitkit/erp_app/desktop/website_nav/delete_menu_item',
-                      method: 'POST',
-                      params:{
-                        id:record.data.websiteNavItemId
-                      },
-                      success: function(response) {
-                        self.clearWindowStatus();
-                        var obj = Ext.decode(response.responseText);
-                        if(obj.success){
-                          record.remove(true);
-                        }
-                        else{
+            if (currentUser.hasApplicationCapability('knitkit', {
+              capability_type_iid:'delete',
+              resource:'MenuItem'
+            }))
+
+            {
+              items.push({
+                text:'Delete',
+                iconCls:'icon-delete',
+                handler:function(btn){
+                  Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this menu item?', function(btn){
+                    if(btn == 'no'){
+                      return false;
+                    }
+                    else
+                    if(btn == 'yes')
+                    {
+                      self.setWindowStatus('Deleting menu item...');
+                      Ext.Ajax.request({
+                        url: '/knitkit/erp_app/desktop/website_nav/delete_menu_item',
+                        method: 'POST',
+                        params:{
+                          id:record.data.websiteNavItemId
+                        },
+                        success: function(response) {
+                          self.clearWindowStatus();
+                          var obj = Ext.decode(response.responseText);
+                          if(obj.success){
+                            record.remove(true);
+                          }
+                          else{
+                            Ext.Msg.alert('Error', 'Error deleting menu item');
+                          }
+                        },
+                        failure: function(response) {
+                          self.clearWindowStatus();
                           Ext.Msg.alert('Error', 'Error deleting menu item');
                         }
-                      },
-                      failure: function(response) {
-                        self.clearWindowStatus();
-                        Ext.Msg.alert('Error', 'Error deleting menu item');
-                      }
-                    });
-                  }
-                });
-              }
+                      });
+                    }
+                  });
+                }
+              });
+            }
+          }
+          if (items.length !=0){
+            var contextMenu = Ext.create("Ext.menu.Menu",{
+              items:items
             });
+            contextMenu.showAt(e.xy);
           }
-          var contextMenu = Ext.create("Ext.menu.Menu",{
-            items:items
-          });
-          contextMenu.showAt(e.xy);
         }
       }
     });
@@ -1894,231 +2432,257 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.WestRegion",{
       collapsible:true
     });
 
-    var layout = new Ext.Panel({
-      layout: 'border',
-      autoDestroy:true,
-      title:'Websites',
-      items: [this.sitesTree,this.contentsCardPanel],
-      tbar:{
-        items:[
-        {
-          text:'New Website',
-          iconCls:'icon-add',
-          handler:function(btn){
-            var addWebsiteWindow = Ext.create("Ext.window.Window",{
-              layout:'fit',
-              width:375,
-              title:'New Website',
-              height:300,
-              plain: true,
-              buttonAlign:'center',
-              items: new Ext.FormPanel({
-                labelWidth: 110,
-                frame:false,
-                bodyStyle:'padding:5px 5px 0',
-                url:'/knitkit/erp_app/desktop/site/new',
-                defaults: {
-                  width: 225
-                },
-                items: [
-                {
-                  xtype:'textfield',
-                  fieldLabel:'Name',
-                  allowBlank:false,
-                  name:'name'
-                },
-                {
-                  xtype:'textfield',
-                  fieldLabel:'Host',
-                  allowBlank:false,
-                  name:'host'
-                },
-                {
-                  xtype:'textfield',
-                  fieldLabel:'Title',
-                  allowBlank:false,
-                  name:'title'
-                },
-                {
-                  xtype:'textfield',
-                  fieldLabel:'Sub Title',
-                  allowBlank:true,
-                  name:'subtitle'
-                },
+    var tbarItems = [];
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+      capability_type_iid:'create',
+      resource:'Website'
+    }))
+    {
+      tbarItems.push({
+        text:'New Website',
+        iconCls:'icon-add',
+        handler:function(btn){
+          var addWebsiteWindow = Ext.create("Ext.window.Window",{
+            title:'New Website',
+            plain: true,
+            buttonAlign:'center',
+            items: new Ext.FormPanel({
+              labelWidth: 110,
+              frame:false,
+              bodyStyle:'padding:5px 5px 0',
+              url:'/knitkit/erp_app/desktop/site/new',
+              defaults: {
+                width: 225
+              },
+              items: [
+              {
+                xtype:'textfield',
+                fieldLabel:'Name',
+                allowBlank:false,
+                name:'name'
+              },
+              {
+                xtype:'textfield',
+                fieldLabel:'Host',
+                allowBlank:false,
+                name:'host'
+              },
+              {
+                xtype:'textfield',
+                fieldLabel:'Title',
+                allowBlank:false,
+                name:'title'
+              },
+              {
+                xtype:'textfield',
+                fieldLabel:'Sub Title',
+                allowBlank:true,
+                name:'subtitle'
+              },
+              {
+                xtype:'textfield',
+                fieldLabel:'Email',
+                allowBlank:false,
+                name:'email'
+              },
+              {
+                xtype:'radiogroup',
+                fieldLabel:'Auto Activate Publication?',
+                name:'auto_activate_publication',
+                columns:2,
+                items:[
                 {
-                  xtype:'textfield',
-                  fieldLabel:'Email',
-                  allowBlank:false,
-                  name:'email'
+                  boxLabel:'Yes',
+                  name:'auto_activate_publication',
+                  inputValue: 'yes'
                 },
                 {
-                  xtype:'radiogroup',
-                  fieldLabel:'Auto Activate Publication?',
+                  boxLabel:'No',
                   name:'auto_activate_publication',
-                  columns:2,
-                  items:[
-                  {
-                    boxLabel:'Yes',
-                    name:'auto_activate_publication',
-                    inputValue: 'yes'
-                  },
-                  {
-                    boxLabel:'No',
-                    name:'auto_activate_publication',
-                    inputValue: 'no',
-                    checked:true
-                  }]
-                },
+                  inputValue: 'no',
+                  checked:true
+                }]
+              },
+              {
+                xtype:'radiogroup',
+                fieldLabel:'Email Inquiries',
+                name:'email_inquiries',
+                columns:2,
+                items:[
                 {
-                  xtype:'radiogroup',
-                  fieldLabel:'Email Inquiries',
+                  boxLabel:'Yes',
                   name:'email_inquiries',
-                  columns:2,
-                  items:[
-                  {
-                    boxLabel:'Yes',
-                    name:'email_inquiries',
-                    inputValue: 'yes',
-                    checked:false,
-                    listeners:{
-                      scope:this,
-                      'check':function(checkbox, checked){
-                        if(checked)
-                        {
-                          Ext.Msg.alert("Warning","ActionMailer must be setup to send emails");
-                        }
+                  inputValue: 'yes',
+                  checked:false,
+                  listeners:{
+                    scope:this,
+                    'check':function(checkbox, checked){
+                      if(checked)
+                      {
+                        Ext.Msg.alert("Warning","ActionMailer must be setup to send emails");
                       }
                     }
-                  },
-                  {
-                    boxLabel:'No',
-                    name:'email_inquiries',
-                    inputValue: 'no',
-                    checked:true
-                  }
-                  ]
-                }
-                ]
-              }),
-              buttons: [{
-                text:'Submit',
-                listeners:{
-                  'click':function(button){
-                    var window = button.findParentByType('window');
-                    var formPanel = window.query('.form')[0];
-                    self.setWindowStatus('Creating website...');
-                    formPanel.getForm().submit({
-                      success:function(form, action){
-                        self.clearWindowStatus();
-                        var obj = Ext.decode(action.response.responseText);
-                        if(obj.success){
-                          self.sitesTree.getStore().load();
-                          addWebsiteWindow.close();
-                        }
-                      },
-                      failure:function(form, action){
-                        self.clearWindowStatus();
-                        Ext.Msg.alert("Error", "Error creating website");
-                      }
-                    });
                   }
-                }
-              },{
-                text: 'Close',
-                handler: function(){
-                  addWebsiteWindow.close();
-                }
-              }]
-            });
-            addWebsiteWindow.show();
-          }
-        },
-        {
-          text:'Import Website',
-          iconCls:'icon-globe',
-          handler:function(btn){
-            var importWebsiteWindow = Ext.create("Ext.window.Window",{
-              layout:'fit',
-              width:375,
-              title:'Import Website',
-              height:100,
-              plain: true,
-              buttonAlign:'center',
-              items: new Ext.FormPanel({
-                labelWidth: 110,
-                frame:false,
-                fileUpload: true,
-                bodyStyle:'padding:5px 5px 0',
-                url:'/knitkit/erp_app/desktop/site/import',
-                defaults: {
-                  width: 225
                 },
-                items: [
                 {
-                  xtype:'fileuploadfield',
-                  fieldLabel:'Upload Website',
-                  buttonText:'Upload',
-                  buttonOnly:false,
-                  allowBlank:false,
-                  name:'website_data'
+                  boxLabel:'No',
+                  name:'email_inquiries',
+                  inputValue: 'no',
+                  checked:true
                 }
                 ]
-              }),
-              buttons: [{
-                text:'Submit',
-                listeners:{
-                  'click':function(button){
-                    var window = button.findParentByType('window');
-                    var formPanel = window.query('form')[0];
-                    self.setWindowStatus('Importing website...');
-                    formPanel.getForm().submit({
-                      success:function(form, action){
-                        self.clearWindowStatus();
-                        var obj =  Ext.decode(action.response.responseText);
-                        if(obj.success){
-                          self.sitesTree.getStore().load();
-                          importWebsiteWindow.close();
-                        }
-                        else{
-                          Ext.Msg.alert("Error", obj.message);
-                        }
-                      },
-                      failure:function(form, action){
-                        self.clearWindowStatus();
-                        var obj =  Ext.decode(action.response.responseText);
-                        if(obj != null){
-                          Ext.Msg.alert("Error", obj.message);
-                        }
-                        else{
-                          Ext.Msg.alert("Error", "Error importing website");
-                        }
+              }
+              ]
+            }),
+            buttons: [{
+              text:'Submit',
+              listeners:{
+                'click':function(button){
+                  var window = button.findParentByType('window');
+                  var formPanel = window.query('.form')[0];
+                  self.setWindowStatus('Creating website...');
+                  formPanel.getForm().submit({
+                    success:function(form, action){
+                      self.clearWindowStatus();
+                      var obj = Ext.decode(action.response.responseText);
+                      if(obj.success){
+                        self.sitesTree.getStore().load();
+                        addWebsiteWindow.close();
                       }
-                    });
-                  }
+                    },
+                    failure:function(form, action){
+                      self.clearWindowStatus();
+                      Ext.Msg.alert("Error", "Error creating website");
+                    }
+                  });
                 }
-              },{
-                text: 'Close',
-                handler: function(){
-                  importWebsiteWindow.close();
+              }
+            },{
+              text: 'Close',
+              handler: function(){
+                addWebsiteWindow.close();
+              }
+            }]
+          });
+          addWebsiteWindow.show();
+        }
+      }
+      );
+    }
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+      capability_type_iid:'import',
+      resource:'Website'
+    }))
+    {
+      tbarItems.push({
+        text:'Import Website',
+        iconCls:'icon-globe',
+        handler:function(btn){
+          var importWebsiteWindow = Ext.create("Ext.window.Window",{
+            layout:'fit',
+            width:375,
+            title:'Import Website',
+            height:100,
+            plain: true,
+            buttonAlign:'center',
+            items: new Ext.FormPanel({
+              labelWidth: 110,
+              frame:false,
+              fileUpload: true,
+              bodyStyle:'padding:5px 5px 0',
+              url:'/knitkit/erp_app/desktop/site/import',
+              defaults: {
+                width: 225
+              },
+              items: [
+              {
+                xtype:'fileuploadfield',
+                fieldLabel:'Upload Website',
+                buttonText:'Upload',
+                buttonOnly:false,
+                allowBlank:false,
+                name:'website_data'
+              }
+              ]
+            }),
+            buttons: [{
+              text:'Submit',
+              listeners:{
+                'click':function(button){
+                  var window = button.findParentByType('window');
+                  var formPanel = window.query('form')[0];
+                  self.setWindowStatus('Importing website...');
+                  formPanel.getForm().submit({
+                    success:function(form, action){
+                      self.clearWindowStatus();
+                      var obj =  Ext.decode(action.response.responseText);
+                      if(obj.success){
+                        self.sitesTree.getStore().load();
+                        importWebsiteWindow.close();
+                      }
+                      else{
+                        Ext.Msg.alert("Error", obj.message);
+                      }
+                    },
+                    failure:function(form, action){
+                      self.clearWindowStatus();
+                      var obj =  Ext.decode(action.response.responseText);
+                      if(obj != null){
+                        Ext.Msg.alert("Error", obj.message);
+                      }
+                      else{
+                        Ext.Msg.alert("Error", "Error importing website");
+                      }
+                    }
+                  });
                 }
-              }]
-            });
-            importWebsiteWindow.show();
-          }
+              }
+            },{
+              text: 'Close',
+              handler: function(){
+                importWebsiteWindow.close();
+              }
+            }]
+          });
+          importWebsiteWindow.show();
         }
-        ]
+      });
+    }
+
+    var layout = new Ext.Panel({
+      layout: 'border',
+      autoDestroy:true,
+      title:'Websites',
+      items: [this.sitesTree,this.contentsCardPanel],
+      tbar:{
+        items:tbarItems
       }
     });
 
-    this.items = [layout,
-    {
-      xtype:'knitkit_themestreepanel',
-      centerRegion:this.initialConfig['module'].centerRegion
-    },
+    if (currentUser.hasApplicationCapability('knitkit', {
+      capability_type_iid:'view',
+      resource:'Theme'
+    }))
+
     {
-      xtype:'knitkit_articlesgridpanel',
-      centerRegion:this.initialConfig['module'].centerRegion
-    }];
+      this.items = [layout,
+      {
+        xtype:'knitkit_themestreepanel',
+        centerRegion:this.initialConfig['module'].centerRegion
+      },
+      {
+        xtype:'knitkit_articlesgridpanel',
+        centerRegion:this.initialConfig['module'].centerRegion
+      }];
+    } else {
+      this.items = [layout,
+      {
+        xtype:'knitkit_articlesgridpanel',
+        centerRegion:this.initialConfig['module'].centerRegion
+      }];
+    }
         
     this.callParent(arguments);
     this.setActiveTab(0);