kit_cms 2.3.9 → 2.3.10

data/app/controllers/admin/user_controller.rb

@@ -1,5 +1,5 @@
 class Admin::UserController < AdminController
-  layout "cms-boxed" 
+  layout "cms" 
 
 
   def email

data/app/controllers/admin/views_controller.rb

@@ -1,5 +1,5 @@
 class Admin::ViewsController < AdminController
-  layout 'cms-boxed'
+  layout 'cms'
 
   def index
     @views = View.sys(_sid).all

data/app/controllers/admin_controller.rb

@@ -1,5 +1,5 @@
 class AdminController < KitController
   before_filter :can_moderate
 
-  layout "cms-boxed"
+  layout "cms"
 end

data/app/controllers/asset_controller.rb

@@ -1,5 +1,5 @@
 class AssetController < AdminController
-  layout "cms-boxed"
+  layout "cms"
 
 
   def update

data/app/controllers/calendar_controller.rb

@@ -105,7 +105,7 @@ class CalendarController < KitController
     else
       url = params[:edit_url]
       if url =~ /^\/admin\//
-        render "/admin/calendar_entries/edit", :layout=>"cms-boxed"
+        render "/admin/calendar_entries/edit", :layout=>"cms"
       else
         render_page_by_url(params[:edit_url])
       end

data/app/controllers/category_controller.rb

@@ -1,7 +1,7 @@
 class CategoryController < KitController
   include ActionView::Helpers::JavaScriptHelper
 
-  layout 'cms-boxed'
+  layout 'cms'
   protect_from_forgery :except => [:subcat]
   before_filter :can_use
 
@@ -154,7 +154,7 @@ class CategoryController < KitController
 
   def show
     @category = Category.find_sys_id(_sid, params[:id])
-    render "show", :layout=>"cms-boxed"
+    render "show", :layout=>"cms"
   end
 
   def browse

data/app/controllers/menu_controller.rb

@@ -1,6 +1,6 @@
 class MenuController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def new
     @menu = Menu.new

data/app/controllers/pages_controller.rb

@@ -3,7 +3,7 @@ class PagesController < KitController
   before_filter :load_page, :except=>[:search, :cookie_text, :unique, :index, :new, :create, :stub, :zoom, :terms, :editor_trial]
   before_filter :can_use, :except=>[:show, :search, :cookie_text, :editor_trial, :save, :redir]
 
-  layout "layouts/cms-boxed"
+  layout "layouts/cms"
 
   def copy
     @original = @page
@@ -20,7 +20,7 @@ class PagesController < KitController
     @page.header = @original.header
     @page.tags = @original.tags
 
-    render "new", :layout=>"cms-boxed"
+    render "new", :layout=>"cms"
 
   end
 
@@ -355,7 +355,7 @@ class PagesController < KitController
     @page.page_template_id = PageTemplate.sys(_sid).where(:is_default=>1).first.id rescue Pagetemplate.first.id
     @page.category_id = params[:cat_id]
 
-    render "new", :layout=>"cms-boxed"
+    render "new", :layout=>"cms"
   end
 
   def create
@@ -369,7 +369,7 @@ class PagesController < KitController
         @original = Page.sys(_sid).where(:id=>@page.copy_of).first
         @page.copy_content_from(@original)
       end
-      Activity.add(_sid,"Created page '#{@page.name}' as <a href='#{@page.full_path}'>#{@page.full_path}</a>", current_user, 'Pages')
+      Activity.add(_sid,"Created page '#{@page.name}' as <a href='#{@page.full_path}'>#{@page.full_path}</a>", current_user.id, 'Pages')
       @page.generate_block_instances(current_user.id) unless @original
 
       redirect_to @page.link("show", true)
@@ -545,7 +545,7 @@ class PagesController < KitController
       redirect_to "/page/#{@page.id}/info"
       return
     else
-      render "edit", :layout=>"cms-boxed"
+      render "edit", :layout=>"cms"
     end
   end
 

data/app/controllers/utility_controller.rb

@@ -32,7 +32,7 @@ class UtilityController < KitController
 
   def design_history
     @dh = DesignHistory.sys(_sid).where(:id=>params[:id]).first
-    render "design_history", :layout=>"cms-boxed"
+    render "design_history", :layout=>"cms"
   end
 
   def addresses

data/app/helpers/kit_helper.rb

@@ -142,26 +142,14 @@ module KitHelper
     link_to_function label, "submit_form(this)", options
   end
 
-  def ace_editor(mode, object, field, form, form_field = nil)
-
+  def cm_editor(mode, object, field, form, form_field = nil)
     form_field ||= "#{object}_#{field}"
-    begin
-      content = eval("@#{object}.#{field}").html_safe
-    rescue
-      content = ''
-    end
-     
-    "
-    #{render :partial=>'utility/ace_editor', :locals=>{:mode=>mode, :field=>field, :form_field=>form_field, :content=>content}}
-    <div id='editor_mode'>Mode: #{mode.upcase}
-      <a target='_blank' href='/db/help/html_editor_keys'>Shortcut Keys</a>
-    </div>
-    <div id='editor_body'></div> 
-    #{form.text_area field, :style=>'display: none;'}
-    ".html_safe
+  
+    mode = 'htmlmixed' if mode == 'html'
+    mode = 'css' if mode == 'sass' || mode == 'scss'
+    render :partial=>'utility/cm_editor', :locals=>{:mode=>mode, :field=>field, :form_field=>form_field, :form=>form}
   end
 
-
   def hide_if(bool)
     bool ? "display:none;" : ""
   end

data/app/helpers/kit_modules_helper.rb

@@ -282,7 +282,7 @@ module KitModulesHelper
         (render :inline=>@instance.render).html_safe
       rescue Exception => e
         logger.debug("***** Block error: #{e.message}")
-        e.message
+        e.message 
       end
     else
       "[Block instance missing '#{id}']"

data/app/models/asset.rb

@@ -2,6 +2,8 @@ include ActionView::Helpers::TextHelper
 
 class Asset < KitIndexed
 
+  attr_accessible :file, :file_file_name, :file_content_type, :file_file_size, :comment, :tags, :height, :width, :extension, :code, :is_image,  :system_id
+  
   Asset.do_indexing :Asset, [
     {:name=>:id, :index=>:not_analyzed, :include_in_all=>false},
     {:name=>:file_file_name, :boost=>25},

data/app/models/block.rb

@@ -1,6 +1,7 @@
 class Block < ActiveRecord::Base
   has_and_belongs_to_many :page_templates
 
+  attr_accessible :name, :show_editors, :all_templates, :page_template_ids, :description, :body, :system_id
   validates :name, :presence=>true, :length=>{:minimum=>1, :maximum=>80}
   belongs_to :user
 

data/app/models/block_instance.rb

@@ -26,9 +26,14 @@ class BlockInstance < ActiveRecord::Base
     return "[No block definition #{self.block_id}]" unless self.block
 
     self.block.body.gsub(/\[\[([^\:]+)\:([^\:]+)\:[^\]]+\]\]/) do
-      bi = self.page.get_block_instances(self.instance_id, self.version, $1, self.block_id)
-      return "[No block instances]" unless bi
-      block_instance = bi.first
+      if self.page
+        bi = self.page.get_block_instances(self.instance_id, self.version, $1, self.block_id)
+        return "[No block instances]" unless bi
+       block_instance = bi.first
+      else
+        block_instance = self
+      end
+
       if block_instance && block_instance.field_value
         if $2 == "friendly"
           block_instance.field_value.friendly_format 

data/app/models/html_asset.rb

@@ -3,6 +3,7 @@ class HtmlAsset < ActiveRecord::Base
   validates :name, :presence=>true, :length=>{:minimum=>1, :maximum=>80}
   before_save :generate_fingerprint
 
+  attr_accessible :name, :file_type, :body, :system_id
   attr_accessor :compiled
 
   before_save :record_history

data/app/models/layout.rb

@@ -3,6 +3,7 @@ class Layout < ActiveRecord::Base
 
   use_kit_caching
 
+  attr_accessible :name, :handler, :stylesheets, :javascripts, :body
   before_save :make_path
   before_save :set_format
   has_many :page_templates

data/app/models/page.rb

@@ -1,6 +1,6 @@
 class Page < KitIndexed
 
-  attr_accessible :full_path, :category_id, :status, :name, :title, :page_template_id, :created_by, :updated_by, :system_id
+  attr_accessible :full_path, :category_id, :status_id, :name, :title, :page_template_id, :created_by, :updated_by, :system_id, :tags, :meta_description, :meta_keywords, :header
 
     @@index_def =  [
       {:name=>:id, :index=>:not_analyzed, :include_in_all=>false},
@@ -115,9 +115,8 @@ class Page < KitIndexed
 
     validates_associated :page_template
     validates_presence_of :page_template, :unless => "self.status == Status.stub_status(self.system_id)"
-    validates_associated :status
-    validates_presence_of :status
     validates_presence_of :category_id
+    validates_presence_of :status_id
     validates_associated :category
     validates :name, :format=>{:with=>/^[a-z0-9\-\.]+$/}, :presence=>true
     validates :title, :presence=>true

data/app/models/page_template.rb

@@ -6,6 +6,8 @@ class PageTemplate < ActiveRecord::Base
   has_many :page_template_terms
   belongs_to :user
 
+  attr_accessible :name, :template_type, :layout_id, :allow_anonymous_comments, :allow_user_comments, :hidden, :is_mobile, :mobile_version_id, :body, :stylesheets, :javascripts
+
   use_kit_caching
 
   before_validation :set_page_type

data/app/views/admin/blocks/_form.html.haml

@@ -24,7 +24,7 @@
     %a(name='editor')
     %p
       = f.label :body
-      = ace_editor('html', :block, :body, f)
+      = cm_editor('html', :block, :body, f)
     %p
       = kit_submit "Save"
       = kit_submit "Save And Edit Again"

data/app/views/admin/dashboard/system.html.haml

@@ -16,6 +16,7 @@
       %li(style="margin-bottom: 10px;")
         Reindex content:
         = icon_to "Reindex", "/admin/dashboard/reindex", false, :method=>:post, :confirm=>"Are you sure?  This can take a long time if there is lots of content and searching won't work properly whilst it's taking place."
+        = icon_to "Reindex (With Logging)", "/admin/dashboard/reindex?slow=1", false, :method=>:post, :confirm=>"Are you sure?  This can take a long time if there is lots of content and searching won't work properly whilst it's taking place."
 
       %li
         Integrity check:

data/app/views/admin/help/edit.html.haml

@@ -11,7 +11,7 @@
       = f.text_field :path
 
       %label Content
-      = ace_editor('html', :help, :body, f)
+      = cm_editor('html', :help, :body, f)
       %br
       = kit_submit "Save"
       or

data/app/views/admin/html_asset/show.html.haml

@@ -31,7 +31,7 @@
           = flash[:notice]
 
       %a(name='editor')
-      = ace_editor(@html_asset.file_type == 'css' ? 'scss' : 'javascript', :html_asset, :body, f, "html_asset_body")
+      = cm_editor(@html_asset.file_type, :html_asset, :body, f, "html_asset_body")
 
       %p
         = render :partial=>"utility/design_history", :locals=>{:object=>@html_asset}

data/app/views/admin/layouts/show.html.haml

@@ -40,9 +40,9 @@
             Comma separated list of javascripts to include.  If left blank it will default to none.
         %li
           %label Body
-          = ace_editor('html', :layout, :body, f)
+          = cm_editor('html', :layout, :body, f)
 
-        %li
+        %li(style="margin-top: 10px;")
           = render :partial=>"utility/design_history", :locals=>{:object=>@layout}
       
       = kit_submit "Save"

data/app/views/admin/page_templates/_form.html.haml

@@ -43,7 +43,7 @@
           If this template has an equivalent version for mobile devices, select it here.  As such, practically this is mutually exclusive with the "For mobile devices" option above.
     %p
       = f.label :body
-      = ace_editor('html', :page_template, :body, f)
+      = cm_editor('html', :page_template, :body, f)
       .field_help
         The content of the template.  
     %p

data/app/views/admin/snippet/edit.html.erb

@@ -18,7 +18,7 @@
   </div>
   </div>
     <b>Content:</b><br/>
-    <%= ace_editor('html', :snippet, :body, f) %>
+    <%= cm_editor('html', :snippet, :body, f) %>
 
 
     <%= kit_submit "Save" %> or <%= link_to "Cancel", "/admin/snippet/#{@snippet.id}" %>

data/app/views/admin/snippet/new.html.erb

@@ -17,7 +17,7 @@
   </div>
 
   <b>Content:</b><br/>
-    <%= ace_editor('html', :snippet, :body, f) %>
+    <%= cm_editor('html', :snippet, :body, f) %>
 
     <%= kit_submit "Save" %> or <%= icon_to "Cancel", "/admin/snippet" %>
   <% end %>

data/app/views/admin/stylesheet/show.html.haml

@@ -21,7 +21,7 @@
       - if flash[:notice]
         #error_explanation
           = flash[:notice]
-      = ace_editor('scss', :sheet, :body, f, "stylesheet_body")
+      = cm_editor('scss', :sheet, :body, f, "stylesheet_body")
 
       = kit_submit "Save"
       = link_to "Delete", "/admin/stylesheet/#{@sheet.id}", :method=>:delete, :class=>"action", :confirm=>"Are you sure you want to delete this stylesheet?  It cannot be undone."

data/app/views/asset/index.html.haml

@@ -1,6 +1,3 @@
-- content_for :head do
-  = javascript_include_tag "kit/jquery.fileupload"
-
 - content_for :page_scripts do
   $(document).ready(function() {
   initialise_upload_form('#uploadform');

data/app/views/layouts/_cms-common.html.erb

@@ -1,6 +1,6 @@
   <meta http-equiv="X-UA-Compatible" content="chrome=1">
 
-  <%= javascript_include_tag "kit_admin" %>
+  <%= javascript_include_tag 'kit/cms' %>
   
   <link href='http://fonts.googleapis.com/css?family=Sorts+Mill+Goudy|Rosarivo|Italiana' rel='stylesheet' type='text/css'>
   <link href='http://fonts.googleapis.com/css?family=Oxygen' rel='stylesheet' type='text/css'>

data/app/views/layouts/_kit_header.html.haml

@@ -4,8 +4,8 @@
 %title
   = page_title
 
-= stylesheet_link_tag "application"
-= javascript_include_tag "application"
+= stylesheet_link_tag "kit/kit" 
+= javascript_include_tag "kit/kit" 
 
 - if @page && @page.editable
   = render :partial=>"/layouts/cms-common", :locals=>{:include_menu => false} 

data/app/views/layouts/{cms-boxed.html.haml → cms.html.haml}

@@ -1,7 +1,7 @@
 !!!
 %head
   = render :partial=>'/layouts/cms-common', :locals=>{:include_menu=>true}
-  = stylesheet_link_tag "kit_admin"
+  = stylesheet_link_tag "kit/cms"
   - if content_for? :head
     = yield :head
 

data/app/views/layouts/mercury-editor.html.erb

@@ -9,14 +9,8 @@
       var is_draft = <%= params[:draft] ? 'true' : 'false' %>;
     </script>
 
-      <%= stylesheet_link_tag    'mercury', 'mercury_editor'  %>
-      <%= javascript_include_tag 'kit/mercury-editor' %>
-      <%= javascript_include_tag 'kit/utilities.js' %>
-      <%= javascript_include_tag 'kit/application-edit' %>
-      <%= javascript_include_tag "codemirror/editor" %>
-      <%= stylesheet_link_tag 'codemirror/style.css' %>
-      <%= stylesheet_link_tag 'codemirror/theme.css' %>
-      <%= stylesheet_link_tag 'codemirror/dialog.css' %>
+    <%= stylesheet_link_tag    'kit/editor'  %>
+    <%= javascript_include_tag 'kit/editor'%>
 
     </head>
     <body>

data/app/views/pages/content_edit.html.haml

@@ -6,7 +6,7 @@
   .cms_form
     = form_for @page_content, :url=>"/page/#{@page.id}/content/#{@page_content.id}", :method=>:post do |f|
 
-      = ace_editor('html', :page_content, :value, f)
+      = cm_editor('html', :page_content, :value, f)
 
       .div
         = kit_submit "Save" 

data/app/views/utility/_cm_editor.html.erb

@@ -0,0 +1,19 @@
+<%= javascript_include_tag 'codemirror/editor' %>
+
+<script type="text/javascript">
+  $(document).ready(function() {
+      var editor_a = parent.document.getElementById('<%= form_field %>');
+      var options = { lineNumbers: true, theme: 'blackboard-cms', indentUnit: 2, lineWrapping: true, matchBrackets: true  , collapseRange: true, mode : '<%= mode %>'};
+  html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
+  html_editor.focus();
+    
+  });
+</script>
+
+<div id='editor_mode'>Mode: <%= (mode=='htmlmixed' ? 'html' : mode).upcase %>
+</div>
+
+<%= form.text_area field %>
+
+
+

data/app/views/utility/mercury_html.html.haml

@@ -22,9 +22,6 @@
   var options = { lineNumbers: true, theme: 'blackboard', indentUnit: 2, lineWrapping: true, matchBrackets: true  , collapseRange: true};
   html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
   html_editor.focus();
-  html_editor.on('change', function() {
-  console.debug(html_editor.getValue());
-  });
   }
 
   function the_editor() {