knitkit 2.0.0 → 2.0.1

data/lib/knitkit/extensions/railties/theme_support/asset_tag_helper.rb

@@ -11,7 +11,7 @@ module ActionView
     module AssetTagHelper
       def theme_javascript_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "/#{theme.url}/javascripts").first
+        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/javascripts").first
         file.nil? ? '' : file.data.url
       end
       alias_method :theme_path_to_javascript, :theme_javascript_path
@@ -41,7 +41,7 @@ module ActionView
 
       def theme_stylesheet_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "/#{theme.url}/stylesheets").first
+        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/stylesheets").first
         file.nil? ? '' : file.data.url
       end
       alias_method :theme_path_to_stylesheet, :theme_stylesheet_path
@@ -71,7 +71,7 @@ module ActionView
 
       def theme_image_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "/#{theme.url}/images").first
+        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/images").first
         file.nil? ? '' : file.data.url
       end
       alias_method :theme_path_to_image, :theme_image_path # aliased to avoid conflicts with an image_path named route

data/lib/knitkit/extensions/railties/theme_support/theme_file_resolver.rb

@@ -9,10 +9,15 @@ module ActionView
           @cached[key][name][prefix][partial][locals] = decorate(yield, path_info, details, locals)
         else
           @cached[key][name][prefix][partial][locals].each do |template|
-            last_update = mtime(template.identifier)
-            if last_update > template.updated_at
+            #check if the file still exists
+            if File.exists? template.identifier
+              last_update = mtime(template.identifier)
+              if last_update > template.updated_at
+                @cached[key][name][prefix][partial][locals].delete_if{|item| item.identifier == template.identifier}
+                @cached[key][name][prefix][partial][locals] << build_template(template.identifier, template.virtual_path, (details[:formats] || [:html] if template.formats.empty?), template.locals)
+              end
+            else
               @cached[key][name][prefix][partial][locals].delete_if{|item| item.identifier == template.identifier}
-              @cached[key][name][prefix][partial][locals] << build_template(template.identifier, template.virtual_path, (details[:formats] || [:html] if template.formats.empty?), template.locals)
             end
           end
           @cached[key][name][prefix][partial][locals]

data/lib/knitkit/routing_filter/section_router.rb

@@ -2,20 +2,30 @@
 # of the path, replace it by "sections/:id" segments.
 
 module RoutingFilter
+  require 'logger'
   class SectionRouter < Filter
     def around_recognize(path, env, &block)
       website = Website.find_by_host(env["HTTP_HOST"])
-      paths = paths_for_website(website)
-      if path !~ %r(^/([\w]{2,4}/)?admin) and !paths.empty? and path =~ recognize_pattern(paths)
-        if section = website_section_by_path(website, $2)
-          type = section.type.pluralize.downcase
-          path.sub! %r(^/([\w]{2,4}/)?(#{paths})(?=/|\.|$)), "/#{$1}#{type}/#{section.id}#{$3}"
+      if website
+        paths = paths_for_website(website)
+        if path.to_sym == :/
+          home_page_url = website.configurations.first.get_configuration_item(ConfigurationItemType.find_by_internal_identifier('homepage_url')).options.first.value
+          valid_section = website.website_sections.detect{|website_section| website_section.path == home_page_url }
+          type = valid_section.type.pluralize.downcase
+          path.sub!('/', "/#{$1}#{type}/#{valid_section.id}#{$3}")
+        else
+          if !Rails.application.config.knitkit.ignored_prefix_paths.include?(path) and path !~ %r(^/([\w]{2,4}/)?admin) and !paths.empty? and path =~ recognize_pattern(paths)
+            if section = website_section_by_path(website, $2)
+              type = section.type.pluralize.downcase
+              path.sub! %r(^/([\w]{2,4}/)?(#{paths})(?=/|\.|$)), "/#{$1}#{type}/#{section.id}#{$3}"
+            end
+          end
         end
       end
       yield
     end
     
-    def around_generate(params, &block)      
+    def around_generate(params, &block)   
       yield.tap do |path|
         result = result.first if result.is_a?(Array)
         if result !~ %r(^/([\w]{2,4}/)?admin) and result =~ generate_pattern

data/lib/knitkit/version.rb

@@ -1,3 +1,9 @@
 module Knitkit
-  VERSION = "2.0.0"
+  module VERSION #:nodoc:
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 1
+
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+  end
 end

data/public/javascripts/ajax_pagination.js

@@ -0,0 +1,33 @@
+/* ajax pagination */
+
+/* Prototype implementation let here for reference
+document.observe("dom:loaded", function() {
+  // the element in which we will observe all clicks and capture
+  // ones originating from pagination links
+  var container = $(document.body);
+
+  if (container) {
+    var img = new Image;
+    img.src = '/images/erp_app/ajax-loader.gif';
+
+    function createSpinner() {
+      return new Element('img', { src: img.src, 'class': 'spinner' });
+    }
+
+    container.observe('click', function(e) {
+      var el = e.element();
+      if (el.match('.pagination a')) {
+        el.up('.pagination').insert(createSpinner());
+        new Ajax.Request(el.href, { method: 'get' });
+        e.stop();
+      }
+    });
+  }
+});
+*/
+
+/* jQuery implementation 
+NOTE: Does not work standalone like the prototype implementation did, you have to do it inline in the ajax response */
+jQuery(function(){
+  jQuery('.pagination a').attr('data-remote', 'true'); 
+});

data/public/javascripts/datepicker.js

@@ -187,7 +187,12 @@ function refreshDatePicker(dateFieldName, year, month, day)
   // now, the days of the month
   do {
     dayNum = thisDay.getDate();
-    TD_onclick = " onclick=\"updateDateField('" + dateFieldName + "', '" + getDateString(thisDay) + "');\">";
+    if(new Date(thisDay.getFullYear(), thisDay.getMonth(), (thisDay.getDate() + 1)) >= new Date()){
+      TD_onclick = " onclick=\"updateDateField('" + dateFieldName + "', '" + getDateString(thisDay) + "');\">";
+    }
+    else{
+      TD_onclick = " onclick=\"alert('Invalid Date');\">";
+    }
 
     if (dayNum == day)
       html += TD_selected + TD_onclick + DIV_selected + dayNum + xDIV + xTD;

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

@@ -4,8 +4,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
   deleteArticle : function(id){
     var self = this;
     this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/articles/delete',
       method: 'POST',
       params:{
@@ -29,6 +28,242 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
     });
   },
 
+// shouldnt need this anymore
+    deleteAttribute : function(id){
+        var self = this;
+        this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
+        var conn = new Ext.data.Connection();
+        conn.request({
+            url: '/knitkit/erp_app/desktop/articles/delete_attribute',
+            method: 'POST',
+            params:{
+                id:id
+            },
+            success: function(response) {
+                var obj = Ext.decode(response.responseText);
+                if(obj.success){
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                    Ext.getCmp('editGlobalArticleAttributesWindowGrid').getStore().load();
+                }
+                else{
+                    Ext.Msg.alert('Error', 'Error deleting Article');
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                }
+            },
+            failure: function(response) {
+                self.initialConfig['centerRegion'].clearWindowStatus();
+                Ext.Msg.alert('Error', 'Error deleting Article');
+            }
+        });
+    },
+
+// shouldnt need this
+    editAttributes :function(record) {
+        var self = this;
+
+        var attributesStore = Ext.create('Ext.data.Store', {
+            proxy: {
+                type: 'ajax',
+                url:'/knitkit/erp_app/desktop/articles/article_attributes/',
+                extraParams:{
+                    article_id:record.get('id')
+                },
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            remoteSort: true,
+            fields:[
+            {
+                name:'id'
+            },
+            {
+                name:'description'
+            },
+            {
+                name:'data_type'
+            },
+            {
+                name:'value'
+            }
+            ]
+        });
+
+        var editArticleAttributesWindow = Ext.create("Ext.window.Window",{
+            layout:'fit',
+            width:375,
+            height:253,
+            title:'Edit Attributes',
+            plain: true,
+            buttonAlign:'center',
+            items: {
+                xtype: 'grid',
+                id: 'editGlobalArticleAttributesWindowGrid',
+                border:false,
+                frame:false,
+                store: attributesStore,
+                columns: [
+                {
+                    header: "id",
+                    width: 30,
+                    dataIndex: 'id',
+                    sortable: true,
+                    hidden:true
+                },
+                {
+                    id: 'description',
+                    header: "Name",
+                    width: 151,
+                    dataIndex: 'description',
+                    sortable: true
+                },
+                {
+                    id: 'data_type',
+                    header: "Data_Type",
+                    width: 70,
+                    dataIndex: 'data_type',
+                    sortable: true
+                },
+                {
+                    id: 'value',
+                    header: "Value",
+                    width: 100,
+                    dataIndex: 'value',
+                    sortable: true
+                },
+                {
+                    menuDisabled:true,
+                    resizable:false,
+                    xtype:'actioncolumn',
+                    header:'Delete',
+                    align:'center',
+                    width:40,
+                    items:[{
+                        icon:'/images/icons/delete/delete_16x16.png',
+                        tooltip:'Delete',
+                        handler :function(grid, rowIndex, colIndex){
+                            var rec = grid.getStore().getAt(rowIndex);
+                            var id = rec.get('id');
+                            var messageBox = Ext.MessageBox.confirm(
+                                'Confirm', 'Are you sure?',
+                                function(btn){
+                                    if (btn == 'yes'){
+                                        self.deleteAttribute(id);
+                                    }
+                                }
+                                );
+                        }
+                    }]
+                }],
+                tbar: [{
+                    text: 'Add Attribute',
+                    iconCls: 'icon-add',
+                    handler : function(){
+                        var addAttributeWindow = new Ext.Window({
+                            layout:'fit',
+                            width:375,
+                            title:'New Attribute',
+                            plain: true,
+                            buttonAlign:'center',
+                            items: new Ext.FormPanel({
+                                labelWidth: 110,
+                                frame:false,
+                                bodyStyle:'padding:5px 5px 0',
+                                width: 425,
+                                url:'/knitkit/erp_app/desktop/articles/new_attribute/',
+                                defaults: {
+                                    width: 257
+                                },
+                                items:[
+                                {
+                                    xtype:'hidden',
+                                    name:'article_id',
+                                    value:record.get('id')
+                                },
+                                {
+                                    xtype:'textfield',
+                                    fieldLabel:'Name',
+                                    allowBlank:false,
+                                    name:'description'
+                                },
+                                {
+                                    xtype:'combo',
+                                    fieldLabel:'Data_type',
+                                    forceSelection:true,
+                                    store:[
+                                    ['Text','Text'],
+                                    ['Date', 'Date'],
+                                    ['Boolean', 'Boolean'],
+                                    ['Integer', 'Integer'],
+                                    ['Float', 'Float']
+                                    ],
+                                    value:'Text',
+                                    name:'data_type',
+                                    allowBlank: false,
+                                    triggerAction:'all'
+                                },
+                                {
+                                    xtype:'textfield',
+                                    fieldLabel:'Value',
+                                    allowBlank:false,
+                                    name:'value'
+                                }]
+                            }),
+                            buttons: [{
+                                text:'Submit',
+                                listeners:{
+                                    'click':function(button){
+                                        var window = button.findParentByType('window');
+                                        var formPanel = window.query('form')[0];
+                                        self.initialConfig['centerRegion'].setWindowStatus('Creating attribute...');
+                                        formPanel.getForm().submit({
+                                            reset:true,
+                                            success:function(form, action){
+                                                self.initialConfig['centerRegion'].clearWindowStatus();
+                                                var obj =  Ext.decode(action.response.responseText);
+                                                if(obj.success){
+                                                    Ext.getCmp('editGlobalArticleAttributesWindowGrid').getStore().load()
+                                                }
+                                                else{
+                                                    Ext.Msg.alert("Error", obj.msg);
+                                                }
+                                                addAttributeWindow.close();
+
+                                            },
+                                            failure:function(form, action){
+                                                self.initialConfig['centerRegion'].clearWindowStatus();
+                                                Ext.Msg.alert("Error", "Error creating attribute");
+                                            }
+                                        });
+                                    }
+                                }
+                            },{
+                                text: 'Close',
+                                handler: function(){
+                                    addAttributeWindow.close();
+                                }
+                            }]
+                        });
+                        addAttributeWindow.show();
+                    }
+                }],
+                bbar: new Ext.PagingToolbar({
+                    pageSize: 5,
+                    store: attributesStore,
+                    displayInfo: true,
+                    displayMsg: '{0} - {1} of {2}',
+                    emptyMsg: "Empty"
+                }),
+                renderTo: Ext.getBody(),
+                autoscroll: true,
+                loadMask: true
+            }
+        });
+        attributesStore.loadPage(1);
+        editArticleAttributesWindow.show();
+    },
+
   editArticle : function(record){
     var self = this;
 
@@ -91,6 +326,18 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
           id: 'tag_list',
           value: record.get('tag_list')
         },
+        {
+          xtype: 'displayfield',
+          fieldLabel: 'Created At',
+          name: 'created_at',
+          value: record.data.created_at
+        },
+        {
+          xtype: 'displayfield',
+          fieldLabel: 'Updated At',
+          name: 'updated_at',
+          value: record.data.updated_at
+        },        
         {
           xtype:'hidden',
           allowBlank:false,
@@ -151,6 +398,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
 
     // create the Data Store
     var store = Ext.create('Ext.data.Store', {
+      pageSize: 20,
       proxy: {
         type: 'ajax',
         url:'/knitkit/erp_app/desktop/articles/all/',
@@ -184,277 +432,502 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
       },
       {
         name:'display_title'
-      }
-      ]
-    });
-
-    config = Ext.apply({
-      title:'Articles',
-      columns:[
-      {
-        header:'Title',
-        sortable:true,
-        dataIndex:'title',
-        width:110,
-        editable:false
       },
       {
-        header:'Unique Name',
-        sortable:true,
-        dataIndex:'internal_identifier',
-        width:110,
-        editable:false
+        name:'created_at'
       },
       {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Tags',
-        align:'center',
-        width:40,
-        items:[{
-          getClass: function(v, meta, rec) {  // Or return a class from a function
-            this.items[0].tooltip = rec.get('tag_list');
-            return 'info-col';
-          },
-          handler :function(grid, rowIndex, colIndex){
-            return true;
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Sections',
-        align:'center',
-        width:50,
-        items:[{
-          getClass: function(v, meta, rec) {  // Or return a class from a function
-            this.items[0].tooltip = rec.get('sections');
-            return 'info-col';
-          },
-          handler :function(grid, rowIndex, colIndex){
-            return true;
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Edit',
-        align:'center',
-        width:40,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.editArticle(rec);
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Comments',
-        align:'center',
-        width:60,
-        items:[{
-          icon:'/images/icons/document_text/document_text_16x16.png',
-          tooltip:'Comments',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.initialConfig['centerRegion'].viewContentComments(rec.get('id'), rec.get('title') + ' - Comments');
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Excerpt',
-        align:'center',
-        width:50,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.initialConfig['centerRegion'].editExcerpt(rec.get('title') + ' - Excerpt', rec.get('id'), rec.get('excerpt_html'), self.initialConfig.siteId);
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'HTML',
-        align:'center',
-        width:40,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.initialConfig['centerRegion'].editContent(rec.get('title'), rec.get('id'), rec.get('body_html'), null, 'blog');
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Delete',
-        align:'center',
-        width:40,
-        items:[{
-          icon:'/images/icons/delete/delete_16x16.png',
-          tooltip:'Delete',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            var id = rec.get('id');
-            var messageBox = Ext.MessageBox.confirm(
-              'Confirm', 'Are you sure?',
-              function(btn){
-                if (btn == 'yes'){
-                  self.deleteArticle(id);
-                }
-              }
-              );
-          }
-        }]
+        name:'updated_at'
       }
-      ],
-      store:store,
-      tbar: [{
-        text: 'Add New Article',
-        iconCls: 'icon-add',
-        handler : function(){
-          var addArticleWindow = new Ext.Window({
-            layout:'fit',
-            width:375,
-            title:'New Article',
-            plain: true,
-            buttonAlign:'center',
-            items: new Ext.FormPanel({
-              labelWidth: 110,
-              frame:false,
-              bodyStyle:'padding:5px 5px 0',
-              width: 425,
-              url:'/knitkit/erp_app/desktop/articles/new/',
-              defaults: {
-                width: 225
-              },
-              items:[
-              {
-                xtype:'textfield',
-                fieldLabel:'Title',
-                allowBlank:false,
-                name:'title'
-              },
-              {
-                xtype:'radiogroup',
-                fieldLabel:'Display title?',
-                name:'display_title',
-                columns:2,
-                items:[
-                {
-                  boxLabel:'Yes',
-                  name:'display_title',
-                  inputValue: 'yes',
-                  checked:true
+      ]
+    });
+
+var columnItems = [];
+
+        columnItems.push(
+        {
+            header:'Title',
+            sortable:true,
+            dataIndex:'title',
+            width:110,
+            editable:false
+        },
+        {
+            menuDisabled:true,
+            resizable:false,
+            xtype:'actioncolumn',
+            header:'Sections',
+            align:'center',
+            width:50,
+            items:[{
+                getClass: function(v, meta, rec) {  // Or return a class from a function
+                    this.items[0].tooltip = rec.get('sections');
+                    return 'info-col';
                 },
+                handler :function(grid, rowIndex, colIndex){
+                    return true;
+                }
+            }]
+        });
 
-                {
-                  boxLabel:'No',
-                  name:'display_title',
-                  inputValue: 'no'
-                }]
-              },
-              {
-                xtype:'textfield',
-                fieldLabel:'Unique Name',
-                allowBlank:true,
-                name:'internal_identifier'
-              },
-              {
-                xtype:'textfield',
-                fieldLabel:'Tags',
-                allowBlank:true,
-                name:'tags',
-                id: 'tag_list'
-              }
-              ]
-            }),
-            buttons: [{
-              text:'Submit',
-              listeners:{
-                'click':function(button){
-                  var window = button.findParentByType('window');
-                  var formPanel = window.query('form')[0];
-                  self.initialConfig['centerRegion'].setWindowStatus('Creating article...');
-                  formPanel.getForm().submit({
-                    reset:true,
-                    success:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      var obj =  Ext.decode(action.response.responseText);
-                      if(obj.success){
-                        self.getStore().load();
-                      }
-                      else{
-                        Ext.Msg.alert("Error", obj.msg);
-                      }
-                      addArticleWindow.close();
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'edit',
+            resource:'Article'
+        }))
 
-                    },
-                    failure:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      Ext.Msg.alert("Error", "Error creating article");
+        {
+            columnItems.push(
+            {
+                menuDisabled:true,
+                resizable:false,
+                xtype:'actioncolumn',
+                header:'Edit',
+                align:'center',
+                width:40,
+                items:[{
+                    icon:'/images/icons/edit/edit_16x16.png',
+                    tooltip:'Edit',
+                    handler :function(grid, rowIndex, colIndex){
+                        var rec = grid.getStore().getAt(rowIndex);
+                        self.editArticle(rec);
                     }
-                  });
+                }]
+            });
+        }
+
+        columnItems.push(
+        {
+            menuDisabled:true,
+            resizable:false,
+            xtype:'actioncolumn',
+            header:'Comments',
+            align:'center',
+            width:60,
+            items:[{
+                icon:'/images/icons/document_text/document_text_16x16.png',
+                tooltip:'Comments',
+                handler :function(grid, rowIndex, colIndex){
+                    var rec = grid.getStore().getAt(rowIndex);
+                    self.initialConfig['centerRegion'].viewContentComments(rec.get('id'), rec.get('title') + ' - Comments');
                 }
-              }
-            },{
-              text: 'Close',
-              handler: function(){
-                addArticleWindow.close();
-              }
             }]
-          });
-          addArticleWindow.show();
+        });
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'edit_excerpt',
+            resource:'Article'
+        }))
+
+        {
+            columnItems.push(
+            {
+                menuDisabled:true,
+                resizable:false,
+                xtype:'actioncolumn',
+                header:'Excerpt',
+                align:'center',
+                width:50,
+                items:[{
+                    icon:'/images/icons/edit/edit_16x16.png',
+                    tooltip:'Edit Excerpt',
+                    handler :function(grid, rowIndex, colIndex){
+                        var rec = grid.getStore().getAt(rowIndex);
+                        self.initialConfig['centerRegion'].editExcerpt(rec.get('title') + ' - Excerpt', rec.get('id'), rec.get('excerpt_html'), self.initialConfig.siteId);
+                    }
+                }]
+            });
         }
-      },'|',
-      {
-        xtype:'textfield',
-        hideLabel:true,
-        id:'global_article_search_field'
-      },
-      {
-        text: 'Search',
-        iconCls: 'icon-search',
-        handler: function(button) {
-          var iid = Ext.getCmp('global_article_search_field').getValue();
-          store.setProxy({
-            type: 'ajax',
-            url: '/knitkit/erp_app/desktop/articles/all/',
-            reader: {
-              type: 'json',
-              root: 'data',
-              idProperty: 'id',
-              totalProperty:'totalCount'
-            },
-            extraParams:{
-              iid:iid
+
+        columnItems.push(
+        {
+            menuDisabled:true,
+            resizable:false,
+            xtype:'actioncolumn',
+            header:'HTML',
+            align:'center',
+            width:40,
+            items:[{
+                icon:'/images/icons/edit/edit_16x16.png',
+                tooltip:'Edit Content',
+                handler :function(grid, rowIndex, colIndex){
+                    var rec = grid.getStore().getAt(rowIndex);
+                    self.initialConfig['centerRegion'].editContent(rec.get('title'), rec.get('id'), rec.get('body_html'), null, 'blog');
+                }
+            }]
+        });
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'delete',
+            resource:'Article'
+        }))
+
+        {
+            columnItems.push(
+            {
+                menuDisabled:true,
+                resizable:false,
+                xtype:'actioncolumn',
+                header:'Delete',
+                align:'center',
+                width:40,
+                items:[{
+                    icon:'/images/icons/delete/delete_16x16.png',
+                    tooltip:'Delete',
+                    handler :function(grid, rowIndex, colIndex){
+                        var rec = grid.getStore().getAt(rowIndex);
+                        var id = rec.get('id');
+                        var messageBox = Ext.MessageBox.confirm(
+                            'Confirm', 'Are you sure?',
+                            function(btn){
+                                if (btn == 'yes'){
+                                    self.deleteArticle(id);
+                                }
+                            }
+                        );
+                    }
+                }]
             }
-          });
-          store.loadPage(1);
+            );
         }
-      }],
+
+        var tbarItems = [];
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'create',
+            resource:'Article'
+        }))
+
+        {
+            tbarItems.push(
+            {
+                text: 'New Article',
+                iconCls: 'icon-add',
+                handler : function(){
+                    var addArticleWindow = new Ext.Window({
+                        layout:'fit',
+                        width:375,
+                        title:'New Article',
+                        plain: true,
+                        buttonAlign:'center',
+                        items: new Ext.FormPanel({
+                            labelWidth: 110,
+                            frame:false,
+                            bodyStyle:'padding:5px 5px 0',
+                            width: 425,
+                            url:'/knitkit/erp_app/desktop/articles/new/',
+                            defaults: {
+                                width: 257
+                            },
+                            items:[
+                            {
+                                xtype:'textfield',
+                                fieldLabel:'Title',
+                                allowBlank:false,
+                                name:'title'
+                            },
+                            {
+                                xtype:'radiogroup',
+                                fieldLabel:'Display title?',
+                                name:'display_title',
+                                columns:2,
+                                items:[
+                                {
+                                    boxLabel:'Yes',
+                                    name:'display_title',
+                                    inputValue: 'yes',
+                                    checked:true
+                                },
+
+                                {
+                                    boxLabel:'No',
+                                    name:'display_title',
+                                    inputValue: 'no'
+                                }]
+                            },
+                            {
+                                xtype:'textfield',
+                                fieldLabel:'Unique Name',
+                                allowBlank:true,
+                                name:'internal_identifier'
+                            },
+                            {
+                                xtype:'textfield',
+                                fieldLabel:'Tags',
+                                allowBlank:true,
+                                name:'tags',
+                                id: 'tag_list'
+                            }]
+                        }),
+                        buttons: [{
+                            text:'Submit',
+                            listeners:{
+                                'click':function(button){
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('form')[0];
+                                    self.initialConfig['centerRegion'].setWindowStatus('Creating article...');
+                                    formPanel.getForm().submit({
+                                        reset:true,
+                                        success:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            var obj =  Ext.decode(action.response.responseText);
+                                            if(obj.success){
+                                                self.getStore().load();
+                                            }
+                                            else{
+                                                Ext.Msg.alert("Error", obj.msg);
+                                            }
+                                            addArticleWindow.close();
+
+                                        },
+                                        failure:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            Ext.Msg.alert("Error", "Error creating article");
+                                        }
+                                    });
+                                }
+                            }
+                        },{
+                            text: 'Close',
+                            handler: function(){
+                                addArticleWindow.close();
+                            }
+                        }]
+                    });
+                    addArticleWindow.show();
+                }
+            },'|');
+        }
+
+        tbarItems.push(
+        {
+            xtype:'textfield',
+            hideLabel:true,
+            id:'global_article_search_field',
+            width:75
+        },
+        {
+            text: 'Search',
+            iconCls: 'icon-search',
+            handler: function(button) {
+                var iid = Ext.getCmp('global_article_search_field').getValue();
+                store.setProxy({
+                    type: 'ajax',
+                    url: '/knitkit/erp_app/desktop/articles/all/',
+                    reader: {
+                        type: 'json',
+                        root: 'data',
+                        idProperty: 'id',
+                        totalProperty:'total'
+                    },
+                    extraParams:{
+                        iid:iid,
+                    }
+                });
+                store.load();
+            }
+        },
+        {
+            text: 'Advanced',
+            iconCls: 'icon-search',
+            handler: function(){
+                var advancedSearchWindow = new Ext.Window({
+                    layout:'fit',
+                    width:375,
+                    title:'Advanced Search',
+                    plain: true,
+                    buttonAlign:'center',
+                    items: new Ext.FormPanel({
+                        labelWidth: 110,
+                        frame:false,
+                        bodyStyle:'padding:5px 5px 0',
+                        width: 425,
+                        defaults: {
+                            width: 257
+                        },
+                        items:[
+                        {
+                            xtype:'textfield',
+                            fieldLabel:'Title',
+                            allowBlank:true,
+                            name:'title',
+                            id:'global_article_advanced_search_title'
+                        },
+                        {
+                            xtype:'fieldset',
+                            border: false,
+                            autoHeight: true,
+                            title:'Created Between',
+                            items: [{
+                                xtype:'datefield',
+                                fieldLabel: "Start",
+                                name: 'created_start_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_created_start_date'
+                            },
+                            {
+                                xtype:'datefield',
+                                fieldLabel: "End",
+                                name: 'created_end_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_created_end_date'
+                            }]
+                        },
+                        {
+                            xtype:'fieldset',
+                            border: false,
+                            autoHeight: true,
+                            title:'Last Updated Between',
+                            items: [{
+                                xtype:'datefield',
+                                fieldLabel: "Start",
+                                name: 'updated_start_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_updated_start_date'
+                            },
+                            {
+                                xtype:'datefield',
+                                fieldLabel: "End",
+                                name: 'updated_end_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_updated_end_date'
+                            }]
+                        },
+                        {
+                            xtype:'fieldset',
+                            border: false,
+                            autoHeight: true,
+                            title:'Viewable Between',
+                            items: [{
+                                xtype:'datefield',
+                                fieldLabel: "Start",
+                                name: 'viewable_start_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_viewable_start_date'
+                            },
+                            {
+                                xtype:'datefield',
+                                fieldLabel: "End",
+                                name: 'viewable_end_date',
+                                allowBlank:true,
+                                width: 230,
+                                id:'global_article_advanced_search_viewable_end_date'
+                            },
+                            {
+                                xtype:'radiogroup',
+                                fieldLabel:'Show Articles Without Display Dates?',
+                                columns:2,
+                                id:'global_article_advanced_search_show_articles_without_display_dates',
+                                items:[
+                                {
+                                    boxLabel:'Yes',
+                                    name:'show_articles_without_display_dates',
+                                    inputValue: 'true',
+                                    checked:true
+                                },
+                                {
+                                    boxLabel:'No',
+                                    name:'show_articles_without_display_dates',
+                                    inputValue: 'false'
+                                }
+                                ]
+                            }]
+                        },
+                        {
+                          xtype: 'checkbox',
+                          fieldLabel: 'Show Orphaned Only',
+                          id: 'show_orphaned_checkbox',
+                          name: 'show_orphaned',
+                          inputValue: 1,
+                          uncheckedValue: 0
+
+                        },
+                        {
+                            xtype:'radiogroup',
+                            fieldLabel:'Archivable',
+                            columns:2,
+                            id:'global_article_advanced_search_archivable',
+                            items:[
+                            {
+                                boxLabel:'Yes',
+                                name:'archivable',
+                                inputValue: 'true'
+                            },
+                            {
+                                boxLabel:'No',
+                                name:'archivable',
+                                inputValue: 'false'
+                            },
+                            {
+                                boxLabel:'Both',
+                                name:'archivable',
+                                inputValue: 'both',
+                                checked:true
+                            }]
+                        }]
+                    }),
+                    buttons: [{
+                        text:'Submit',
+                        listeners:{
+                            'click':function(button){
+                                var iid = Ext.getCmp('global_article_advanced_search_title').getValue();
+                                var created_start_date = Ext.getCmp('global_article_advanced_search_created_start_date').getValue();
+                                var created_end_date = Ext.getCmp('global_article_advanced_search_created_end_date').getValue();
+                                var updated_start_date = Ext.getCmp('global_article_advanced_search_updated_start_date').getValue();
+                                var updated_end_date = Ext.getCmp('global_article_advanced_search_updated_end_date').getValue();
+                                var viewable_start_date = Ext.getCmp('global_article_advanced_search_viewable_start_date').getValue();
+                                var viewable_end_date = Ext.getCmp('global_article_advanced_search_viewable_end_date').getValue();
+                                var show_articles_without_display_dates = Ext.getCmp('global_article_advanced_search_show_articles_without_display_dates').getValue();
+                                var archivable = Ext.getCmp('global_article_advanced_search_archivable').getValue();
+                                var show_orphaned = Ext.getCmp('show_orphaned_checkbox').getValue();
+                                store.setProxy({
+                                    type: 'ajax',
+                                    url: '/knitkit/erp_app/desktop/articles/all/',
+                                    reader: {
+                                        type: 'json',
+                                        root: 'data',
+                                        idProperty: 'id',
+                                        totalProperty:'total'
+                                    },
+                                    extraParams:{
+                                        iid:iid,
+                                        created_start_date:created_start_date,
+                                        created_end_date:created_end_date,
+                                        updated_start_date:updated_start_date,
+                                        updated_end_date:updated_end_date,
+                                        viewable_start_date:viewable_start_date,
+                                        viewable_end_date:viewable_end_date,
+                                        show_articles_without_display_dates:show_articles_without_display_dates,
+                                        archivable:archivable,
+                                        show_orphaned:show_orphaned
+                                    }
+                                });
+                                store.load();
+                                advancedSearchWindow.close();
+                            }
+                        }
+                    },{
+                        text: 'Close',
+                        handler: function(){
+                            advancedSearchWindow.close();
+                        }
+                    }]
+                });
+                advancedSearchWindow.show();
+            }
+        }        
+        );
+
+    config = Ext.apply({
+      title:'Articles',
+      columns:columnItems,
+      store:store,
+      tbar: tbarItems,
       bbar: new Ext.PagingToolbar({
-        pageSize: 10,
         store: store,
         displayInfo: true,
         displayMsg: '{0} - {1} of {2}',