knitkit 2.1.15 → 3.0.0

data/lib/knitkit/extensions/will_paginate/link_renderer.rb

@@ -0,0 +1,67 @@
+require 'will_paginate/view_helpers/action_view'
+
+module Knitkit
+  module Extensions
+    module WillPaginate
+      class LinkRenderer < ::WillPaginate::ActionView::LinkRenderer
+
+        protected
+
+        def page_number(page)
+          unless page == current_page
+            tag(:li, link(page, page, :rel => rel_value(page)))
+          else
+            tag(
+                :li,
+                tag(:a, "#{page} #{tag(:span, '(current)', :class => 'sr-only')}"),
+                :class => 'active'
+            )
+
+          end
+        end
+
+        def previous_page
+          num = @collection.current_page > 1 && @collection.current_page - 1
+          previous_or_next_page(num, '&laquo;')
+        end
+
+        def next_page
+          num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+          previous_or_next_page(num, '&raquo;')
+        end
+
+        def previous_or_next_page(page, text)
+          if page
+            tag(:li, link(text, page))
+          else
+            tag(:li, link(text, 'javascript:void('');'), :class => 'disabled')
+          end
+        end
+
+        def html_container(html)
+          tag(:ul, html, :class => 'pagination')
+        end
+
+        def url(page)
+          @base_url_params ||= begin
+            url_params = merge_get_params(default_url_params)
+            merge_optional_params(url_params)
+          end
+
+          url_params = @base_url_params.dup
+          add_current_page_param(url_params, page)
+
+          if url_params[:scope]
+            scope = url_params[:scope]
+            url_params.delete(:scope)
+
+            scope.url_for(url_params)
+          else
+            @template.url_for(url_params)
+          end
+        end
+
+      end # LinkRenderer
+    end # WillPaginate
+  end # Extensions
+end # Knitkit

data/lib/knitkit/routing_filter/section_router.rb

@@ -8,9 +8,10 @@ module RoutingFilter
       website = Website.find_by_host(env["HTTP_HOST"])
       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 }
+          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
@@ -24,8 +25,8 @@ module RoutingFilter
       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
@@ -34,15 +35,15 @@ module RoutingFilter
         end
       end
     end
-    
+
     protected
     def paths_for_website(website)
-      website ? website.all_section_paths.map{|path| path[1..path.length]}.sort{|a, b| b.size <=> a.size }.join('|') : []
+      website ? website.all_section_paths.map { |path| path[1..path.length] }.sort { |a, b| b.size <=> a.size }.join('|') : []
     end
 
     def website_section_by_path(website, path)
       path = "/#{path}"
-      valid_section = website.website_sections.detect{|website_section| website_section.path == path }
+      valid_section = website.website_sections.detect { |website_section| website_section.path == path }
       if valid_section.nil?
         website.website_sections.each do |website_section|
           valid_section = website_section.child_by_path(path)
@@ -58,8 +59,9 @@ module RoutingFilter
     end
 
     def generate_pattern
-      types = WebsiteSection.types.map{|type| type.downcase.pluralize }.join('|')
+      types = WebsiteSection.types.map { |type| type.downcase.pluralize }.join('|')
       %r((#{types})/([\w]+(/?))(\.?)) # ?(?=\b)?
     end
+
   end
-end
+end

data/lib/knitkit/syntax_validator.rb

@@ -20,9 +20,9 @@ module Knitkit
       def validate_erb(contents)
         begin
           ActionView::Template::Handlers::Erubis.new(contents).result
-        rescue SyntaxError=>ex
+        rescue SyntaxError=> ex
           ex.message
-        rescue Exception=>ex
+        rescue => ex
           nil
         end
       end

data/lib/knitkit/version.rb

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

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

@@ -1,681 +1,710 @@
-Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
-  extend:"Ext.grid.Panel",
-  alias:'widget.knitkit_articlesgridpanel',
-  deleteArticle : function(id){
-    var self = this;
-    this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
-    Ext.Ajax.request({
-      url: '/knitkit/erp_app/desktop/articles/delete',
-      method: 'POST',
-      params:{id:id},
-      success: function(response) {
-        var obj = Ext.decode(response.responseText);
-        if(obj.success){
-          self.initialConfig['centerRegion'].clearWindowStatus();
-          self.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');
-      }
-    });
-  },
+Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel", {
+    extend: "Ext.grid.Panel",
+    alias: 'widget.knitkit_articlesgridpanel',
 
-  editArticle : function(record){
-    var self = this;
-    var itemId = 'editArticle-'+record.get('id');
-    var editArticleWindow = Ext.ComponentQuery.query('#'+itemId).first();
-
-    if(Compass.ErpApp.Utility.isBlank(editArticleWindow)){
-      var editArticleWindow = Ext.create("Ext.window.Window",{
-        layout:'fit',
-        width:375,
-        title:'Edit Article',
-        itemId:itemId,
-        // minimizable:true,
-        plain: true,
-        buttonAlign:'center',
-        items: {
-          xtype: 'form',
-          labelWidth: 110,
-          frame:false,
-          bodyStyle:'padding:5px 5px 0',
-          width: 425,
-          url:'/knitkit/erp_app/desktop/articles/update/',
-          defaults: {width: 225},
-          items: [
-          {
-            xtype:'textfield',
-            fieldLabel:'Title',
-            allowBlank:false,
-            name:'title',
-            value: record.data.title
-          },
-          {
-            xtype:'radiogroup',
-            fieldLabel:'Display title?',
-            name:'display_title',
-            columns:2,
-            items:[
-            {
-              boxLabel:'Yes',
-              name:'display_title',
-              inputValue: 'yes',
-              checked:record.data.display_title
-            },
-
-            {
-              boxLabel:'No',
-              name:'display_title',
-              inputValue:'no',
-              checked:!record.data.display_title
-            }]
-          },
-          {
-            xtype:'textfield',
-            fieldLabel:'Internal ID',
-            allowBlank:true,
-            name:'internal_identifier',
-            value: record.data.internal_identifier
-          },
-          {
-            xtype:'textfield',
-            fieldLabel:'Tags',
-            allowBlank:true,
-            name:'tags',
-            itemId: 'tag_list',
-            value: record.data.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,
-            name:'id',
-            itemId: 'record_id',
-            value: record.data.id
-          }
-          ]
-        },
-        buttons: [{
-          text:'Submit',
-          listeners:{
-            'click':function(button){
-              var window = button.findParentByType('window');
-              var formPanel = window.query('form')[0];
-              self.initialConfig['centerRegion'].setWindowStatus('Updating article...');
-              formPanel.getForm().submit({
-                reset:false,
-                success:function(form, action){
-                  self.initialConfig['centerRegion'].clearWindowStatus();
-                  var obj = Ext.decode(action.response.responseText);
-                  if(obj.success){
+    deleteArticle: function (id) {
+        var self = this;
+        this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
+        Ext.Ajax.request({
+            url: '/knitkit/erp_app/desktop/articles/delete',
+            method: 'POST',
+            params: {id: id},
+            success: function (response) {
+                var obj = Ext.decode(response.responseText);
+                if (obj.success) {
+                    self.initialConfig['centerRegion'].clearWindowStatus();
                     self.getStore().load();
-                    if(formPanel.getForm().findField('tag_list')){
-                      var tag_list = formPanel.getForm().findField('tag_list').getValue();
-                      record.set('tag_list', tag_list);
-                    }
-                    editArticleWindow.close();
-                  }
-                  else{
-                    Ext.Msg.alert("Error", obj.msg);
-                  }
-                },
-                failure:function(form, action){
-                  self.initialConfig['centerRegion'].clearWindowStatus();
-                  Ext.Msg.alert("Error", "Error updating article");
                 }
-              });
+                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');
             }
-          }
-        },{
-          text: 'Close',
-          handler: function(){
-            editArticleWindow.close();
-          }
-        }]
-      });
-    }
-    editArticleWindow.show();
-  },
+        });
+    },
 
-  initComponent: function() {
-    this.callParent(arguments);
-    this.getStore().load();
-  },
+    editArticle: function (record) {
+        var self = this;
+        var itemId = 'editArticle-' + record.get('id');
+        var editArticleWindow = Ext.ComponentQuery.query('#' + itemId).first();
 
-  constructor : function(config) {
-    var self = this;
+        if (Compass.ErpApp.Utility.isBlank(editArticleWindow)) {
+            var editArticleWindow = Ext.create("Ext.window.Window", {
+                layout: 'fit',
+                width: 375,
+                title: 'Edit Article',
+                itemId: itemId,
+                // minimizable:true,
+                plain: true,
+                buttonAlign: 'center',
+                items: {
+                    xtype: 'form',
+                    labelWidth: 110,
+                    frame: false,
+                    bodyStyle: 'padding:5px 5px 0',
+                    width: 425,
+                    url: '/knitkit/erp_app/desktop/articles/update/',
+                    defaults: {width: 225},
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Title',
+                            allowBlank: false,
+                            name: 'title',
+                            value: record.data.title
+                        },
+                        {
+                            xtype: 'radiogroup',
+                            fieldLabel: 'Display title?',
+                            name: 'display_title',
+                            columns: 2,
+                            items: [
+                                {
+                                    boxLabel: 'Yes',
+                                    name: 'display_title',
+                                    inputValue: 'yes',
+                                    checked: record.data.display_title
+                                },
 
-    // create the Data Store
-    var store = Ext.create('Ext.data.Store', {
-      storeId: 'knitkit_articlesgridpanelStore',
-      pageSize: 20,
-      proxy: {
-        type: 'ajax',
-        url:'/knitkit/erp_app/desktop/articles/all/',
-        reader: {type: 'json', root: 'data'}
-      },
-      remoteSort: true,
-      fields:[
-        {name:'id'},
-        {name:'title'},
-        {name:'tag_list'},
-        {name:'excerpt_html'},
-        {name:'body_html'},
-        {name:'sections'},
-        {name:'internal_identifier'},
-        {name:'display_title'},
-        {name:'created_at'},
-        {name:'updated_at'}
-      ]
-    });
+                                {
+                                    boxLabel: 'No',
+                                    name: 'display_title',
+                                    inputValue: 'no',
+                                    checked: !record.data.display_title
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Internal ID',
+                            allowBlank: true,
+                            name: 'internal_identifier',
+                            value: record.data.internal_identifier
+                        },
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Tags',
+                            allowBlank: true,
+                            name: 'tags',
+                            itemId: 'tag_list',
+                            value: record.data.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,
+                            name: 'id',
+                            itemId: 'record_id',
+                            value: record.data.id
+                        }
+                    ]
+                },
+                buttons: [
+                    {
+                        text: 'Submit',
+                        listeners: {
+                            'click': function (button) {
+                                var window = button.findParentByType('window');
+                                var formPanel = window.query('form')[0];
+                                self.initialConfig['centerRegion'].setWindowStatus('Updating article...');
+                                formPanel.getForm().submit({
+                                    reset: false,
+                                    success: function (form, action) {
+                                        self.initialConfig['centerRegion'].clearWindowStatus();
+                                        var obj = Ext.decode(action.response.responseText);
+                                        if (obj.success) {
+                                            self.getStore().load();
+                                            if (formPanel.getForm().findField('tag_list')) {
+                                                var tag_list = formPanel.getForm().findField('tag_list').getValue();
+                                                record.set('tag_list', tag_list);
+                                            }
+                                            editArticleWindow.close();
+                                        }
+                                        else {
+                                            Ext.Msg.alert("Error", obj.msg);
+                                        }
+                                    },
+                                    failure: function (form, action) {
+                                        self.initialConfig['centerRegion'].clearWindowStatus();
+                                        Ext.Msg.alert("Error", "Error updating article");
+                                    }
+                                });
+                            }
+                        }
+                    },
+                    {
+                        text: 'Close',
+                        handler: function () {
+                            editArticleWindow.close();
+                        }
+                    }
+                ]
+            });
+        }
+        editArticleWindow.show();
+    },
 
-var columnItems = [];
+    initComponent: function () {
+        this.callParent(arguments);
+        this.getStore().load();
+    },
 
-        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:[{
-                iconCls:'actioncolumn_hover',
-                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;
-                }
-            }]
+    constructor: function (config) {
+        var self = this;
+
+        // create the Data Store
+        var store = Ext.create('Ext.data.Store', {
+            storeId: 'knitkit_articlesgridpanelStore',
+            pageSize: 20,
+            proxy: {
+                type: 'ajax',
+                url: '/knitkit/erp_app/desktop/articles/all/',
+                reader: {type: 'json', root: 'data'}
+            },
+            remoteSort: true,
+            fields: [
+                {name: 'id'},
+                {name: 'title'},
+                {name: 'tag_list'},
+                {name: 'excerpt_html'},
+                {name: 'body_html'},
+                {name: 'sections'},
+                {name: 'internal_identifier'},
+                {name: 'display_title'},
+                {name: 'created_at'},
+                {name: 'updated_at'}
+            ]
         });
 
-        if (currentUser.hasCapability('edit','Content'))
-        {
-            columnItems.push(
+        var columnItems = [];
+
+        columnItems.push(
+            {
+                header: 'Title',
+                sortable: true,
+                dataIndex: 'title',
+                width: 110,
+                editable: false
+            },
             {
-                menuDisabled:true,
-                resizable:false,
-                xtype:'actioncolumn',
-                header:'Edit',
-                align:'center',
-                width:40,
-                items:[{
-                    icon:'/images/icons/edit/edit_16x16.png',
-                    iconCls:'actioncolumn_hover',
-                    tooltip:'Edit',
-                    handler :function(grid, rowIndex, colIndex){
-                        var rec = grid.getStore().getAt(rowIndex);
-                        self.editArticle(rec);
+                menuDisabled: true,
+                resizable: false,
+                xtype: 'actioncolumn',
+                header: 'Sections',
+                align: 'center',
+                flex: 1,
+                items: [
+                    {
+                        iconCls: 'actioncolumn_hover',
+                        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;
+                        }
                     }
-                }]
+                ]
             });
+
+        if (currentUser.hasCapability('edit', 'Content')) {
+            columnItems.push(
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'Edit',
+                    align: 'center',
+                    flex: 1,
+                    items: [
+                        {
+                            icon: '/images/icons/edit/edit_16x16.png',
+                            iconCls: 'actioncolumn_hover',
+                            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',
-                iconCls:'actioncolumn_hover',
-                tooltip:'Comments',
-                handler :function(grid, rowIndex, colIndex){
-                    var rec = grid.getStore().getAt(rowIndex);
-                    self.initialConfig['centerRegion'].viewContentComments(rec.get('id'), rec.get('title') + ' - Comments');
-                }
-            }]
-        });
-
-        if (currentUser.hasCapability('edit_excerpt','Content'))
-        {
-            columnItems.push(
             {
-                menuDisabled:true,
-                resizable:false,
-                xtype:'actioncolumn',
-                header:'Excerpt',
-                align:'center',
-                width:50,
-                items:[{
-                    icon:'/images/icons/edit/edit_16x16.png',
-                    iconCls:'actioncolumn_hover',
-                    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);
+                menuDisabled: true,
+                resizable: false,
+                xtype: 'actioncolumn',
+                header: 'Comments',
+                align: 'center',
+                flex: 1,
+                items: [
+                    {
+                        icon: '/images/icons/document_text/document_text_16x16.png',
+                        iconCls: 'actioncolumn_hover',
+                        tooltip: 'Comments',
+                        handler: function (grid, rowIndex, colIndex) {
+                            var rec = grid.getStore().getAt(rowIndex);
+                            self.initialConfig['centerRegion'].viewContentComments(rec.get('id'), rec.get('title') + ' - Comments');
+                            grid.up('window').close();
+                        }
                     }
-                }]
+                ]
             });
+
+        if (currentUser.hasCapability('edit_excerpt', 'Content')) {
+            columnItems.push(
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'Excerpt',
+                    align: 'center',
+                    flex: 1,
+                    items: [
+                        {
+                            icon: '/images/icons/edit/edit_16x16.png',
+                            iconCls: 'actioncolumn_hover',
+                            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);
+                                grid.up('window').close();
+                            }
+                        }
+                    ]
+                });
         }
 
         columnItems.push(
-        {
-            menuDisabled:true,
-            resizable:false,
-            xtype:'actioncolumn',
-            header:'HTML',
-            align:'center',
-            width:40,
-            items:[{
-                icon:'/images/icons/edit/edit_16x16.png',
-                iconCls:'actioncolumn_hover',
-                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');
-                }
-            }]
-        });
+            {
+                menuDisabled: true,
+                resizable: false,
+                xtype: 'actioncolumn',
+                header: 'HTML',
+                align: 'center',
+                flex: 1,
+                items: [
+                    {
+                        icon: '/images/icons/edit/edit_16x16.png',
+                        iconCls: 'actioncolumn_hover',
+                        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');
+                            grid.up('window').close();
+                        }
+                    }
+                ]
+            });
 
-        if (currentUser.hasCapability('delete','Content'))
-        {
+        if (currentUser.hasCapability('delete', 'Content')) {
             columnItems.push(
-            {
-                menuDisabled:true,
-                resizable:false,
-                xtype:'actioncolumn',
-                header:'Delete',
-                align:'center',
-                width:40,
-                items:[{
-                    icon:'/images/icons/delete/delete_16x16.png',
-                    iconCls:'actioncolumn_hover',
-                    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);
-                                }
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'Delete',
+                    align: 'center',
+                    flex: 1,
+                    items: [
+                        {
+                            icon: '/images/icons/delete/delete_16x16.png',
+                            iconCls: 'actioncolumn_hover',
+                            tooltip: 'Delete',
+                            handler: function (grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                var id = rec.get('id');
+                                Ext.MessageBox.confirm(
+                                    'Confirm', 'Are you sure?',
+                                    function (btn) {
+                                        if (btn == 'yes') {
+                                            self.deleteArticle(id);
+                                        }
+                                    }
+                                );
                             }
-                        );
-                    }
-                }]
-            }
+                        }
+                    ]
+                }
             );
         }
 
         var tbarItems = [];
 
-        if (currentUser.hasCapability('create','Content'))
-        {
+        if (currentUser.hasCapability('create', 'Content')) {
             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
-                                },
+                {
+                    text: 'New Article',
+                    iconCls: 'icon-add',
+                    handler: function () {
+                        Ext.create('widget.window', {
+                            title: 'New Article',
+                            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:'Internal ID',
-                                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);
+                                            {
+                                                boxLabel: 'No',
+                                                name: 'display_title',
+                                                inputValue: 'no'
                                             }
-                                            addArticleWindow.close();
+                                        ]
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: 'Internal ID',
+                                        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");
+                                                },
+                                                failure: function (form, action) {
+                                                    self.initialConfig['centerRegion'].clearWindowStatus();
+                                                    Ext.Msg.alert("Error", "Error creating article");
+                                                }
+                                            });
                                         }
-                                    });
+                                    }
+                                },
+                                {
+                                    text: 'Close',
+                                    handler: function () {
+                                        addArticleWindow.close();
+                                    }
                                 }
-                            }
-                        },{
-                            text: 'Close',
-                            handler: function(){
-                                addArticleWindow.close();
-                            }
-                        }]
-                    });
-                    addArticleWindow.show();
-                }
-            },'|');
+                            ]
+                        });
+                        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:'textfield',
-                            fieldLabel:'Content',
-                            allowBlank:true,
-                            name:'content',
-                            id:'global_article_advanced_search_content'
-                        },
-                        {
-                            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: 'textfield',
+                hideLabel: true,
+                id: 'global_article_search_field',
+                width: 300
+            },
+            {
+                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'
                         },
-                        {
-                            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:[
+                        extraParams: {iid: iid}
+                    });
+                    store.load();
+                }
+            },
+            {
+                text: 'Advanced',
+                iconCls: 'icon-search',
+                handler: function () {
+                    Ext.create('widget.window', {
+                        title: 'Advanced Search',
+                        buttonAlign: 'center',
+                        items: Ext.create('widget.form', {
+                            labelWidth: 110,
+                            frame: false,
+                            bodyStyle: 'padding:5px 5px 0',
+                            width: 425,
+                            defaults: {width: 257},
+                            items: [
                                 {
-                                    boxLabel:'Yes',
-                                    name:'show_articles_without_display_dates',
-                                    inputValue: 'true',
-                                    checked:true
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Title',
+                                    allowBlank: true,
+                                    name: 'title',
+                                    id: 'global_article_advanced_search_title'
                                 },
                                 {
-                                    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: 'textfield',
+                                    fieldLabel: 'Content',
+                                    allowBlank: true,
+                                    name: 'content',
+                                    id: 'global_article_advanced_search_content'
+                                },
+                                {
+                                    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'
-                            },
+                                },
+                                {
+                                    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: [
                             {
-                                boxLabel:'No',
-                                name:'archivable',
-                                inputValue: 'false'
+                                text: 'Submit',
+                                listeners: {
+                                    'click': function (button) {
+                                        var title = Ext.getCmp('global_article_advanced_search_title').getValue();
+                                        var content = Ext.getCmp('global_article_advanced_search_content').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: {
+                                                title: title,
+                                                content: content,
+                                                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();
+                                    }
+                                }
                             },
                             {
-                                boxLabel:'Both',
-                                name:'archivable',
-                                inputValue: 'both',
-                                checked:true
-                            }]
-                        }]
-                    }),
-                    buttons: [{
-                        text:'Submit',
-                        listeners:{
-                            'click':function(button){
-                                var title = Ext.getCmp('global_article_advanced_search_title').getValue();
-                                var content = Ext.getCmp('global_article_advanced_search_content').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:{
-                                        title:title,
-                                        content:content,
-                                        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 (btn) {
+                                    btn.up('window').close();
+                                }
                             }
-                        }
-                    },{
-                        text: 'Close',
-                        handler: function(){
-                            advancedSearchWindow.close();
-                        }
-                    }]
-                });
-                advancedSearchWindow.show();
+                        ]
+                    }).show();
+                }
             }
-        }        
         );
 
-    config = Ext.apply({
-      title:'Articles',
-      columns:columnItems,
-      store:store,
-      tbar: tbarItems,
-      bbar: new Ext.PagingToolbar({
-        store: store,
-        displayInfo: true,
-        displayMsg: '{0} - {1} of {2}',
-        emptyMsg: "Empty"
-      }),
-      autoScroll:true,
-      viewConfig:{
-        loadMask: false
-      }
-    }, config);
+        config = Ext.apply({
+            columns: columnItems,
+            store: store,
+            dockedItems: [
+                {
+                    xtype: 'pagingtoolbar',
+                    store: store,
+                    displayInfo: true,
+                    displayMsg: '{0} - {1} of {2}',
+                    emptyMsg: "Empty",
+                    dock: 'bottom'
+                },
+                {
+                    xtype: 'toolbar',
+                    items: tbarItems,
+                    dock: 'top'
+                }
+            ],
+            autoScroll: true
+        }, config);
 
-    this.callParent([config]);
-  }
+        this.callParent([config]);
+    }
 });