knitkit 2.1.3 → 2.1.4

data/app/views/knitkit/online_document_sections/index.html.erb

@@ -4,13 +4,12 @@
 <script type="text/javascript" charset="utf-8">
 
     Ext.onReady(function () {
-        var index = 0;
-        var currentItem;
+        var currentItem, tree, tabs, fitted_panel;
 
-        var tree = Ext.create('Ext.tree.Panel', {
+        tree = Ext.create('Ext.tree.Panel', {
             region: 'west',
             cls: 'tree_styles',
-            store: Ext.create('Ext.data.TreeStore',{
+            store: Ext.create('Ext.data.TreeStore', {
                 proxy: {
                     type: 'ajax',
                     url: 'online_document_sections/build_tree',
@@ -25,20 +24,20 @@
                 fields: [
                     { name: 'id' },
                     { name: 'title' },
-                    { name: 'documented_item_published_content_html' },
                     { name: 'leaf' }
                 ]
             }),
             collapsible: true,
-            tbar: {
+            dockedItems: {
+                xtype: 'toolbar',
+                docked: 'top',
                 items: [
-                    new Ext.form.TextField({
-                        id: "search",
-                        disabled: true,
-                        cls: 'document_search',
+                    {
+                        xtype: 'textfield',
                         emptyText: 'Search',
-                        allowBlank: true,
-                    })
+                        disabled: true,
+                        allowBlank: true
+                    }
                 ]
             },
             header: false,
@@ -51,40 +50,23 @@
             title: '<%= @root.title %>',
             listeners: {
                 'itemclick': function (view, record, htmlItem, index, e) {
-                    var tab_panel = Ext.getCmp('tabs_root')
-                    var tab = Ext.getCmp("tab_" + record.data['id'])
-                    if (tab) {
-                        tab_panel.setActiveTab(tab.id);
-                    }
-                    else {
-                        addTab(record);
-                    }
+                    var tab_panel = Ext.getCmp('tabs_root'),
+                            tab = Ext.getCmp("tab_" + record.data['id']);
+                    showContent(record, tab);
                 }
             }
         });
 
-        var tabs = Ext.createWidget('tabpanel', {
+        tabs = Ext.createWidget('tabpanel', {
             id: 'tabs_root',
             region: 'center',
             plain: true,
             bodyBorder: true,
-            resizeTabs: true,
-            enableTabScroll: true,
-            width: 640,
-            collapsible: false,
             defaults: {
                 autoScroll: true,
-                bodyPadding: 10,
+                bodyPadding: 10
             },
-            items: [
-                {
-                    id: "tab_" + <%= @root.id.to_s %>,
-                    title: '<%= @root.title %>',
-                    html: "<%= raw @root_content.gsub(/\n/, '<br/>') %>",
-                    closable: false,
-                    autoScroll: true
-                }
-            ],
+            items: [],
             plugins: Ext.create('Ext.ux.TabCloseMenu', {
                 extraItemsTail: [
                     '-',
@@ -110,26 +92,49 @@
             })
         });
 
-        function addTab(record) {
-            ++index;
-            tabs.add({
-                id: "tab_" + record.data['id'],
-                title: record.data['title'],
-                html: record.data['documented_item_published_content_html'],
-                closable: true
-            }).show();
+        function showContent(record, tab) {
+            Ext.Ajax.request({
+                url: 'online_document_sections/get_content',
+                params: {
+                    document_section_id: record.data['id'],
+                    section_id:<%= @root.id %>
+                },
+                success: function (response) {
+                    var responseObj = Ext.JSON.decode(response.responseText);
+                    if (responseObj.success) {
+                        if (Ext.isEmpty(tab)) {
+                            tabs.add({
+                                id: "tab_" + record.data['id'],
+                                title: record.data['title'],
+                                html: responseObj.html,
+                                closable: true
+                            }).show();
+                        }
+                        else {
+                            tabs.setActiveTab(tab);
+                            tab.update(responseObj.html)
+                        }
+                    }
+                    else {
+                        Ext.Msg.alert('Error', 'Could not load content');
+                    }
+                },
+                failure: function (response) {
+                    Ext.Msg.alert('Error', 'Could not load content');
+                }
+            });
         }
 
-        var fitted_panel = Ext.createWidget('panel', {
+        fitted_panel = Ext.createWidget('panel', {
             id: 'fitted_panel',
             layout: 'border',
+            width: 800,
             header: false,
             defaults: {
                 collapsible: true,
-                split: true,
+                split: true
             },
             renderTo: 'document_content',
-            autoScroll: true,
             items: [
                 tree,
                 tabs
@@ -137,7 +142,33 @@
         });
 
         resize_windows();
+    });
 
+    Ext.Ajax.request({
+        url: 'online_document_sections/get_content',
+        params: {
+            document_section_id:<%= @root.id %>,
+            section_id:<%= @root.id %>
+        },
+        success: function (response) {
+            var responseObj = Ext.JSON.decode(response.responseText);
+            if (responseObj.success) {
+                Ext.getCmp('tabs_root').add({
+                    xtype: 'panel',
+                    id: "tab_" + <%= @root.id.to_s %>,
+                    title: '<%= @root.title %>',
+                    html: responseObj.html,
+                    closable: false,
+                    autoScroll: true
+                });
+            }
+            else {
+                Ext.Msg.alert('Error', 'Could not load content');
+            }
+        },
+        failure: function (response) {
+            Ext.Msg.alert('Error', 'Could not load content');
+        }
     });
 
     function resize_windows() {

data/app/views/layouts/knitkit/online_document_sections.html.erb

@@ -3,32 +3,26 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="generator" content="Knitkit - Compass AE Open source content management platform" />
-    
+
     <meta name="description" content="" />
     <meta name="keywords" content="" />
     <meta name="copyright" content="&copy;" />
     <meta name="robots" content="ALL" />
     <meta name="language" content="English" />
-    
+
     <title><%= @website.title %></title>
     <%= javascript_include_tag :application %>
     <%= include_extjs :theme => 'extjs:ext-all-gray' %>
-    <%= add_authenticity_token_to_extjs %>
+    <%= set_erp_tech_config_vars %>
+    <%= static_javascript_include_tag('erp_app/utility.js') %>
     <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
     <%= static_javascript_include_tag('datepicker.js') %>
     <%= static_stylesheet_link_tag('datepicker.css') %>
-    <%= static_javascript_include_tag('erp_app/utility.js') %>
+    <%= static_stylesheet_link_tag('extjs/resources/css/knitkit_extjs_4.css') %>
     <%= static_stylesheet_link_tag('knitkit/style.css') %>
     <%= static_javascript_include_tag('erp_app/widgets.js') %>
-    <%= static_javascript_include_tag('ajax_pagination.js') %>
-    <%= static_javascript_include_tag('erp_app/shared/dynamic_forms/dynamic_forms_validation.js') %>
-		<%= static_stylesheet_link_tag('knitkit/documentation.css') %>
+
     <%= yield :head %>
-		<!--[if !IE 7]>
-			<style type="text/css">
-				#main {display:table;height:100%}
-			</style>
-		<![endif]-->
   </head>
   <body>
     <div id="main">
@@ -48,8 +42,13 @@
         <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
         <%#=render_menu(@contents, :menu => 'main')%>
       </div>
-      
-      <%= yield %>
+      <div id="site_content">
+        <%=build_crumbs %>
+        <br/>
+        <div id="content">
+          <%= yield %>
+        </div>
+      </div>
     </div>
 		<div id="content_footer"></div>
     <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>

data/app/widgets/login/base.rb

@@ -4,7 +4,7 @@ module Widgets
 
       def index
         @logout_to  = params[:logout_to]
-        @login_to   = params[:login_to]
+        @login_to   = (session[:return_to_url] or params[:login_to])
         @signup_url = params[:signup_url]
         @reset_password_url = params[:reset_password_url]
     

data/config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
   match '/comments/add' => 'knitkit/comments#add', :as => 'comments'
   match '/unauthorized' => 'knitkit/unauthorized#index', :as => 'knitkit/unauthorized'
   match '/view_current_publication' => 'knitkit/base#view_current_publication'
-  match '/online_document_sections/build_tree' => 'knitkit/online_document_sections#build_tree'
+  match '/online_document_sections(/:action)' => 'knitkit/online_document_sections'
 end
 
 Knitkit::Engine.routes.draw do

data/db/migrate/20110211002317_setup_knitkit.rb

@@ -46,6 +46,7 @@ class SetupKnitkit < ActiveRecord::Migration
         t.text :layout
         t.boolean :in_menu
         t.integer :position, :default => 0
+        t.boolean :use_markdown, :default => false
         t.string :internal_identifier
         t.integer :version
         t.boolean :render_base_layout, :default => true

data/db/migrate/20130405184234_add_use_markdown_to_section.rb

@@ -0,0 +1,19 @@
+class AddUseMarkdownToSection < ActiveRecord::Migration
+  def self.up
+    unless columns(:website_sections).collect {|c| c.name}.include?('use_markdown')
+      add_column :website_sections, :use_markdown, :boolean
+
+      WebsiteSection.all.each do |section|
+        section.use_markdown = false
+        section.save
+      end
+
+    end
+  end
+
+  def self.down
+    if columns(:website_sections).collect {|c| c.name}.include?('use_markdown')
+      remove_column :website_sections, :use_markdown
+    end
+  end
+end

data/lib/knitkit/extensions/railties/action_view/helpers/knitkit_helper.rb

@@ -45,7 +45,7 @@ module Knitkit
                 raise "Website Section with that Internal ID does not exist" if section.nil?
                 links = section.self_and_ancestors.map{|child| {:url => child.path, :title => child.title}}
               else
-                links = @website_section.self_and_ancestors.collect{|child| {:url => child.path, :title => child.title}}
+                links = @website_section.nil? ? [] : @website_section.self_and_ancestors.collect{|child| {:url => child.path, :title => child.title}}
               end
 
               render :partial => 'shared/knitkit/bread_crumb', :locals => {:links => links}

data/lib/knitkit/extensions/railties/action_view/helpers/menu_helper.rb

@@ -54,7 +54,6 @@ module Knitkit
                 layout = options[:layout] ? "menus/#{options[:layout]}" : "menus/knitkit/default_sub_menu"
               else
                 section = options[:section_unique_name].nil? ? @website_section : WebsiteSection.find_by_internal_identifier(options[:section_unique_name])
-                raise "No website sections exist" if section.nil?
                 locals[:section] = section
                 layout = options[:layout] ? "menus/#{options[:layout]}" : "menus/knitkit/default_sub_section_menu"
               end

data/lib/knitkit/version.rb

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

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

@@ -164,6 +164,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
 
     // create the Data Store
     var store = Ext.create('Ext.data.Store', {
+      storeId: 'knitkit_articlesgridpanelStore',
       pageSize: 20,
       proxy: {
         type: 'ajax',

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

@@ -42,6 +42,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         return false;
     },
 
+    /* sections */
+
     saveSectionLayout:function (sectionId, content) {
         var self = this;
         this.setWindowStatus('Saving...');
@@ -127,6 +129,96 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         return false;
     },
 
+    /* documentation using markdown */
+
+    saveDocumentationMarkdown:function (id, siteId, content) {
+        var self = this;
+        this.setWindowStatus('Saving...');
+        Ext.Ajax.request({
+            url:'/knitkit/erp_app/desktop/content/update',
+            method:'POST',
+            params:{
+                id:id,
+                html:content,
+                site_id:siteId
+            },
+            success:function (response) {
+                var obj = Ext.decode(response.responseText);
+                if (obj.success) {
+                    self.clearWindowStatus();
+                    Ext.getStore('knitkit_articlesgridpanelStore').load();
+                    var activeTab = self.workArea.getActiveTab();
+                    var versionsGrid = activeTab.down('knitkit_versionsarticlegridpanel');
+                    versionsGrid.getStore().load();
+                }
+                else {
+                    Ext.Msg.alert('Error', 'Error saving contents');
+                    self.clearWindowStatus();
+                }
+            },
+            failure:function (response) {
+                self.clearWindowStatus();
+                Ext.Msg.alert('Error', 'Error saving contents');
+            }
+        });
+    },
+
+    editDocumentationMarkdown:function (sectionName, websiteId, contentId, content, tbarItems) {
+        var self = this;
+        var itemId = 'markdown-' + contentId;
+        var item = this.workArea.query('#' + itemId).first();
+
+        if (Compass.ErpApp.Utility.isBlank(item)) {
+            item = Ext.create("Ext.panel.Panel", {
+                layout:'border',
+                title:sectionName,
+                save:function (comp) {
+                    var content = comp.down('codemirror').getValue();
+                    self.saveDocumentationMarkdown(contentId, websiteId, content);
+                },
+                closable:true,
+                itemId:itemId,
+                items:[
+                    {
+                        title:sectionName + ' - Markdown',
+                        tbarItems:tbarItems,
+                        disableSave:true,
+                        listeners:{
+                            save:function (comp, content) {
+                                self.saveDocumentationMarkdown(contentId, websiteId, content);
+                            }
+                        },
+                        xtype:'codemirror',
+                        parser:'erb',
+                        region:'center',
+                        sourceCode:content
+                    },
+                    {
+                        xtype:'knitkit_versionsarticlegridpanel',
+                        contentId:contentId,
+                        region:'south',
+                        height:150,
+                        collapsible:true,
+                        centerRegion:self,
+                        siteId:websiteId
+                    }
+                ],
+                listeners:{
+                    'show':function (panel) {
+                        Ext.getCmp('knitkitWestRegion').selectWebsite(websiteId);
+                    }
+                }
+            });
+
+            this.workArea.add(item);
+        }
+
+        this.workArea.setActiveTab(item);
+        return false;
+    },
+
+    /* templates */
+
     saveTemplateFile:function (path, content) {
         var self = this;
         this.setWindowStatus('Saving...');
@@ -191,6 +283,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         return false;
     },
 
+    /* excerpts */
+
     saveExcerpt:function (id, content, siteId) {
         var self = this;
         this.setWindowStatus('Saving...');
@@ -206,9 +300,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 var obj = Ext.decode(response.responseText);
                 if (obj.success) {
                     self.clearWindowStatus();
+                    Ext.getStore('knitkit_articlesgridpanelStore').load();
                     var activeTab = self.workArea.getActiveTab();
                     var panel = activeTab.query('knitkit_versionsbloggridpanel');
-                    if (panel.length == 0) {
+                    if (panel.length === 0) {
                         panel = activeTab.query('knitkit_nonpublishedversionswebsitesectiongridpanel');
                     }
                     panel[0].getStore().load();
@@ -241,8 +336,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 listeners:{
                     save:function (comp, content) {
                         self.saveExcerpt(id, content, siteId);
-                        if (contentGridStore)
-                            contentGridStore.load();
+                        if (!Ext.isEmpty(contentGridStore)) contentGridStore.load();
                     }
                 }
             });
@@ -289,7 +383,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                     if (currentUser.hasCapability('edit_html', 'Content')) {
                         var content = comp.down('ckeditor').getValue();
                         self.saveExcerpt(id, content, siteId);
-                        contentGridStore.load();
+                        if (!Ext.isEmpty(contentGridStore)) contentGridStore.load();
                     } else {
                         currentUser.showInvalidAccess();
                     }
@@ -310,6 +404,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         this.workArea.setActiveTab(item);
     },
 
+    /* image */
 
     showImage:function (node, themeId) {
         var self = this;
@@ -334,6 +429,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         return false;
     },
 
+    /* content */
+
     saveContent:function (id, content, contentType, siteId) {
         var self = this;
         this.setWindowStatus('Saving...');
@@ -349,6 +446,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 var obj = Ext.decode(response.responseText);
                 if (obj.success) {
                     self.clearWindowStatus();
+                    Ext.getStore('knitkit_articlesgridpanelStore').load();
                     if (!Compass.ErpApp.Utility.isBlank(contentType)) {
                         var activeTab = self.workArea.getActiveTab();
                         var versionsGrid = activeTab.down('knitkit_versions' + contentType + 'gridpanel');
@@ -414,8 +512,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 listeners:{
                     save:function (comp, content) {
                         self.saveContent(id, content, contentType, siteId);
-                        if (contentGridStore)
-                            contentGridStore.load();
+                        if (!Ext.isEmpty(contentGridStore)) contentGridStore.load();
                     }
                 }
             });
@@ -489,6 +586,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         this.workArea.setActiveTab(item);
     },
 
+    /* comment */
+
     showComment:function (comment) {
         var activeTab = this.workArea.getActiveTab();
         var cardPanel = activeTab.query('panel')[0];
@@ -584,7 +683,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
             Ext.Msg.alert('Error', 'No editor');
         }
         else {
-            if (activeTab.query('ckeditor').length == 0) {
+            if (activeTab.query('ckeditor').length === 0) {
                 Ext.Msg.alert('Error', 'No ckeditor found');
             }
             else {
@@ -600,7 +699,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
             Ext.Msg.alert('Error', 'No editor');
         }
         else {
-            if (activeTab.query('ckeditor').length == 0) {
+            if (activeTab.query('ckeditor').length === 0) {
                 Ext.Msg.alert('Error', 'No ckeditor found');
             }
             else {
@@ -616,7 +715,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
             Ext.Msg.alert('Error', 'No editor');
         }
         else {
-            if (activeTab.query('codemirror').length == 0) {
+            if (activeTab.query('codemirror').length === 0) {
                 Ext.Msg.alert('Error', 'No codemirror found.');
             }
             else {
@@ -632,7 +731,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
             Ext.Msg.alert('Error', 'No editor');
         }
         else {
-            if (activeTab.query('codemirror').length == 0) {
+            if (activeTab.query('codemirror').length === 0) {
                 Ext.Msg.alert('Error', 'No codemirror found. Note that a widget can only be added to a Layout.');
             }
             else {
@@ -664,22 +763,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
         return false;
     },
 
-    insertHtmlIntoActiveCkEditor:function (html) {
-        var activeTab = this.workArea.getActiveTab();
-        if (Compass.ErpApp.Utility.isBlank(activeTab)) {
-            Ext.Msg.alert('Error', 'No editor');
-        }
-        else {
-            if (activeTab.query('ckeditor').length == 0) {
-                Ext.Msg.alert('Error', 'No ckeditor found');
-            }
-            else {
-                activeTab.query('ckeditor')[0].insertHtml(html);
-            }
-        }
-        return false;
-    },
-
     saveCurrent:function () {
         var activeTab = this.workArea.getActiveTab();
         if (!Ext.isEmpty(activeTab) && !Ext.isEmpty(activeTab.initialConfig.save)) {