imagine_cms 3.0.19 → 3.0.20

data/app/assets/javascripts/imagine.js

@@ -455,9 +455,11 @@ var cbColWidthFull = 202;
 
 function cbAddColumn() {
     var currentWidth = parseInt($('columnBrowser').style.width, 10);
-    if (currentWidth < ((cbNumColumns+1) * cbColWidthFull)) $('columnBrowser').style.width = '' + ((cbNumColumns+1) * cbColWidthFull) + 'px';
+    // if (currentWidth < ((cbNumColumns+1) * cbColWidthFull)) {
+      $('columnBrowser').style.width = '' + ((cbNumColumns+1) * cbColWidthFull) + 'px';
+      $('columnBrowserContainer').scrollLeft = $('columnBrowserContainer').scrollWidth;
+    // }
     $('columnBrowser').innerHTML += "<div id=\"columnBrowserLevel" + cbNumColumns + "\" style=\"width: " + cbColWidth + "; height: " + cbColHeight + "; overflow: auto; float: left; border-width: " + cbBorderWidth + " " + cbBorderWidth + " " + cbBorderWidth + " " + (cbNumColumns == 0 ? cbBorderWidth : '0') + "; border-style: solid; border-color: gray;\">Loading...</div>";
-    $('columnBrowserLevel' + cbNumColumns).scrollIntoView();
     cbNumColumns++;
 }
 
@@ -495,7 +497,7 @@ function cbSelectItem(el, currentLevel, urlForNextLevel) {
     
     cbAddColumn();
     el = $(el.id);
-    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {asynchronous:true, evalScripts:true});
+    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {method: 'GET', asynchronous:true, evalScripts:true});
     
     setScrollbarPosition(el.parentNode, coords);
 }

data/app/assets/stylesheets/imagine_controls.css

@@ -0,0 +1,38 @@
+/** auto complete **/
+
+div.auto_complete {
+    width: 350px;
+    background: #fff;
+}
+div.auto_complete ul {
+    border: 1px solid #888;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style-type: none;
+}
+div.auto_complete ul li {
+    margin: 0;
+    padding: 3px;
+}
+div.auto_complete ul li.selected { 
+    background-color: #ffb; 
+}
+div.auto_complete ul strong.highlight { 
+    color: #800; 
+    margin: 0;
+    padding: 0;
+}
+
+
+/** column browser **/
+
+.cb_item {
+    color: black;
+    padding-left: 2px;
+}
+
+.cb_item.cb_item_selected {
+    color: white;
+    background-color: #506D91;
+}

data/app/assets/stylesheets/management.css

@@ -1,3 +1,7 @@
+/*
+ *= require imagine_controls
+*/
+
 /* From Eric Meyer, Web coding guru, at http://meyerweb.com/eric/tools/css/reset/ */
 /*
 	Any style rule denoted with [+] has been added.
@@ -94,58 +98,31 @@ img { display: inline; border: none; margin: 0; padding: 0; }
 
 .clearer { clear: both; line-height: 0; height: 0; }
 
-#management-content ul { list-style-type: disc; list-style-position: outside; margin: 0 0 15px 20px; }
-#management-content ol { list-style-type: decimal; list-style-position: outside; margin: 0 0 15px 20px; }
-
 
+.form {
+    font-size: 12px; line-height: 14px;
+    color: #000;
+    text-decoration: none;
+    text-indent: 0;
+    background-color: #ffffff;
+    margin: 0px;
+    padding: 3px 2px 3px 3px;
+    border: solid 1px #A4A4A4;
+}
+select.form {
+    padding: 3px 3px 3px 3px;
+}
 .form_button {
     margin: 0;
-    font-size: 11px;
+    font-size: 12px; line-height: 14px;
     color: #ffffff;
     text-decoration: none;
     text-indent: 0;
     background-color: #333;
 }
 
-/** auto complete **/
-
-div.auto_complete {
-    width: 350px;
-    background: #fff;
-}
-div.auto_complete ul {
-    border: 1px solid #888;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    list-style-type: none;
-}
-div.auto_complete ul li {
-    margin: 0;
-    padding: 3px;
-}
-div.auto_complete ul li.selected { 
-    background-color: #ffb; 
-}
-div.auto_complete ul strong.highlight { 
-    color: #800; 
-    margin: 0;
-    padding: 0;
-}
-
-
-/** column browser **/
-
-.cb_item {
-    color: black;
-    padding-left: 2px;
-}
-
-.cb_item_selected {
-    color: white;
-    background-color: #506D91;
-}
-
+#management-content ul { list-style-type: disc; list-style-position: outside; margin: 0 0 15px 20px; }
+#management-content ol { list-style-type: decimal; list-style-position: outside; margin: 0 0 15px 20px; }
 
 table.imagine-management tr:hover { background-color: #fff8c6; }
 table.imagine-management th { background-color: #dedede; text-transform: uppercase; }

data/app/controllers/management/cms_controller.rb

@@ -173,7 +173,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @pg.template ||= @parent.template
     end
     
-    @attrs = CmsPageObject.find(:all, :conditions => [ "obj_type = 'attribute'" ], :order => 'name').map { |attr| attr.name }.uniq
+    @attrs = CmsPageObject.where(:obj_type => 'attribute').uniq.pluck(:name).sort
     
     if params[:mode] == 'ajax_new' || params[:mode] == 'ajax_edit'
       @pg.published_version = -1 if params[:mode] == 'ajax_new'
@@ -186,24 +186,16 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       params[:pg] ||= {}
       
       if params[:pg][:article_date_year]
-        params[:pg][:article_date] = Time.utc(params[:pg].delete(:article_date_year),
-                                                 params[:pg].delete(:article_date_month),
-                                                 params[:pg].delete(:article_date_day))
+        params[:pg][:article_date] = Time.zone.parse("#{params[:pg].delete(:article_date_year)}-#{params[:pg].delete(:article_date_month)}-#{params[:pg].delete(:article_date_day)}")
       end
       if params[:pg][:article_end_date_year]
-        params[:pg][:article_end_date] = Time.utc(params[:pg].delete(:article_end_date_year),
-                                                     params[:pg].delete(:article_end_date_month),
-                                                     params[:pg].delete(:article_end_date_day))
+        params[:pg][:article_end_date] = Time.zone.parse("#{params[:pg].delete(:article_end_date_year)}-#{params[:pg].delete(:article_end_date_month)}-#{params[:pg].delete(:article_end_date_day)}")
       end
       if params[:pg][:published_date_year]
-        params[:pg][:published_date] = Time.utc(params[:pg].delete(:published_date_year),
-                                                   params[:pg].delete(:published_date_month),
-                                                   params[:pg].delete(:published_date_day))
+        params[:pg][:published_date] = Time.zone.parse("#{params[:pg].delete(:published_date_year)}-#{params[:pg].delete(:published_date_month)}-#{params[:pg].delete(:published_date_day)}")
       end
       if params[:pg][:expires]
-        date = Time.utc(params[:pg].delete(:expiration_date_year),
-                           params[:pg].delete(:expiration_date_month),
-                           params[:pg].delete(:expiration_date_day))
+        date = Time.zone.parse("#{params[:pg].delete(:expiration_date_year)}-#{params[:pg].delete(:expiration_date_month)}-#{params[:pg].delete(:expiration_date_day)}")
         params[:pg][:expiration_date] = date if params[:pg][:expires] == 'true'
       end
       
@@ -218,36 +210,43 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       
       if @pg.send(save_function)
         # now try to save tags
-        begin
-          tags_to_delete = @pg.tags
-          params[:tags].split(',').map { |t| t.strip }.reject { |t| t.blank? }.compact.each do |t|
-            @pg.tags.create(:name => t) unless @pg.tags.find_by_name(t)
-            tags_to_delete.reject! { |tag| tag.name == t }
+        # begin
+          existing_tags = @pg.tags.map(&:name)
+          tags_to_delete = @pg.tags.all
+          params[:tags].split(',').map(&:strip).reject(&:blank?).each do |t|
+            if existing_tags.include?(t)
+              # still in use, don't delete
+              tags_to_delete.reject! { |tag| tag.name == t }
+            else
+              # doesn't exist, create
+              @pg.tags.create(:name => t)
+            end
           end
           tags_to_delete.each { |t| t.destroy }
-        rescue Exception => e
-          logger.debug e
-        end
+        # rescue Exception => e
+        #   logger.debug e
+        # end
         
         # now try to save page objects (just attributes in this case)
-        begin
-          objects_to_delete = @pg.objects.find(:all, :conditions => [ "obj_type = 'attribute' or obj_type = 'option'" ])
+        # begin
+          objects_to_delete = @pg.objects.where("obj_type = 'attribute' or obj_type = 'option'").all
           
           (params[:page_objects] || {}).each do |key,val|
-            next if key.blank? || val.blank?
+            next if val.blank?
             
-            key =~ /^obj-(\w+?)-(.+?)$/
-            obj = @pg.objects.find(:first, :conditions => [ "name = ? and obj_type = ?", $2, $1 ])
-            obj ||= @pg.objects.build(:name => $2, :obj_type => $1)
-            obj.content = val
-            obj.save
-            objects_to_delete.reject! { |obj| obj.name == $2 }
+            if key =~ /^obj-(\w+?)-(.+?)$/
+              obj = @pg.objects.where(:name => $2, :obj_type => $1).first
+              obj ||= @pg.objects.build(:name => $2, :obj_type => $1)
+              obj.content = val
+              obj.save
+              objects_to_delete.reject! { |obj| obj.name == $2 }
+            end
           end
           
           objects_to_delete.each { |t| t.destroy }
-        rescue Exception => e
-          logger.debug e
-        end
+        # rescue Exception => e
+        #   logger.debug e
+        # end
         
         render :update do |page|
           case params[:return_to]
@@ -291,7 +290,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   end
   
   def select_page
-    @page_levels = [ '' ].concat((params[:path] || session[:cms_pages_path] || '').split('/').reject { |l| l.empty? })
+    @page_levels = [ '' ].concat((params[:path].blank? ? session[:cms_pages_path] : params[:path]).to_s.split('/').reject { |l| l.blank? })
     @page_levels << ''
     @path = ''
     @page = nil
@@ -368,7 +367,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     elsif request.post?
       CmsPage.transaction do
         # need to revise this later if we implement deletion of page objects
-        old_objs = @pg.objects.find(:all, :conditions => [ 'cms_page_version = ?', @pg.version ])
+        old_objs = @pg.objects.where(:cms_page_version => @pg.version).all
         
         @pg.updated_by = session[:user_id]
         @pg.updated_by_username = session[:user_username]
@@ -395,7 +394,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           # optimize source lists: tags
           if @page_objects["#{key}-sources-tag-count"].to_i > 0
             tags = []
-            for i in 0...@page_objects["#{key}-sources-tag-count"].to_i
+            @page_objects["#{key}-sources-tag-count"].to_i.times do |i|
+              logger.debug "Adding tag: #{@page_objects["#{key}-sources-tag#{i}"]}"
               tags << @page_objects["#{key}-sources-tag#{i}"]
             end
             tags.reject! { |tag| tag.blank? }
@@ -404,10 +404,12 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
               @page_objects["#{key}-sources-tag#{i}"] = tag
             end
           end
+          
           # optimize source lists: folders
           if @page_objects["#{key}-sources-folder-count"].to_i > 0
             folders = []
-            for i in 0...@page_objects["#{key}-sources-folder-count"].to_i
+            @page_objects["#{key}-sources-folder-count"].to_i.times do |i|
+              logger.debug "Adding folder: #{@page_objects["#{key}-sources-folder#{i}"]}"
               folders << @page_objects["#{key}-sources-folder#{i}"]
             end
             folders.reject! { |folder| folder.blank? }
@@ -526,7 +528,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   end
   
   def page_attributes_for_lookup
-    @attrs = CmsPageObject.find(:all, :conditions => [ "obj_type = 'attribute'" ], :order => 'name').map { |attr| attr.name }.uniq
+    @attrs = CmsPageObject.where(:obj_type => 'attribute').uniq.pluck(:name).sort
     headers['content-type'] = 'text/javascript'
     render :layout => false
   end

data/app/sweepers/cms_content_sweeper.rb

@@ -14,7 +14,7 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
     expire_page :controller => 'cms/content', :action => 'show', :content_path => nil
     
     # expire all other pages
-    CmsPage.find_each do |page|
+    CmsPage.select([ :id, :path ]).find_each do |page|
       expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
     end
   end

data/app/views/imagine_cms/_dialogs.html.erb

@@ -9,7 +9,7 @@
     <div>
       <div id="page_browser" style="height: 220px; padding-top: 10px; margin-bottom: 8px;">Loading...</div>
       
-      <input id="page_browser_selection" type="text" class="form" style="width: 420px" />
+      <input id="page_browser_selection" type="text" class="form" style="width: 416px; padding: 2px;" />
       <button onclick="closePageBrowser(); return false;" class="form" style="width: 70px">Select</button>
     </div>
   </div>

data/app/views/imagine_cms/_toolbar.html.erb

@@ -1,4 +1,5 @@
 <%- if params[:action] != 'preview_template' -%>
+  <%= stylesheet_link_tag "imagine_controls" %>
   <style type="text/css">
     #mainCCSToolbar { font-family: Arial; font-size: 12px; font-weight: normal; text-transform: none; line-height: 1.2; color: black; }
     #mainCCSToolbar a { text-transform: none; font-weight: normal; color: black; }

data/app/views/layouts/management.html.erb

@@ -21,8 +21,8 @@
       <script src="/assets/dojo/dojo.js" type="text/javascript"></script>
       <script src="/assets/codepress/codepress.js" type="text/javascript"></script>
     <%- end -%>
-    <%= stylesheet_link_tag    "application", :media => "all" %>
-    <%= stylesheet_link_tag    "management", :media => "all" %>
+    <%= stylesheet_link_tag "application", :media => "all" %>
+    <%= stylesheet_link_tag "management", :media => "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tag %>
   </head>

data/app/views/management/cms/_list_page.html.erb

@@ -1,4 +1,4 @@
-<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page, :authenticity_token => form_authenticity_token.to_s %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit', :authenticity_token => form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page, :authenticity_token => form_authenticity_token.to_s %>'; $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
+<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit' %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page %>'; $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>

data/app/views/management/cms/_list_page_select.html.erb

@@ -1,8 +1,8 @@
-<div id="<%= "cb_item_#{list_page_select.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('page_browser_selection').value = '/<%= list_page_select.path %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages_select', :level => @page_level + 1, :parent_id => list_page_select.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="">
+<div id="<%= "cb_item_#{list_page_select.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('page_browser_selection').value = '/<%= list_page_select.path %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages_select', :level => @page_level + 1, :parent_id => list_page_select.id %>\');', 200);" ondblclick="return false;">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>
-      <td<%= list_page_select.published_version >= 0 ? '' : ' style="color: gray"' %>><%= list_page_select.name %></td>
+      <td<%= list_page_select.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page_select.name %></td>
     </tr>
   </table>
 </div>

data/app/views/management/cms/_page_list.html.erb

@@ -13,14 +13,18 @@
       Select folders and/or tags to indicate which content to pull into this list.
       
       <div id="page_list_<%= key %>-source-list" style="margin: 10px;">
-        <%- for i in 0...@page_objects["#{key}-sources-folder-count"].to_i -%>
+        <%- @page_objects["#{key}-sources-folder-count"].to_i.times do |i| -%>
           <%= render :partial => 'page_list_source_folder', :locals => { :i => i, :key => key } %>
         <%- end -%>
-        <%- for i in 0...@page_objects["#{key}-sources-tag-count"].to_i -%>
+        <%- @page_objects["#{key}-sources-tag-count"].to_i.times do |i| -%>
           <%= render :partial => 'page_list_source_tag', :locals => { :i => i, :key => key } %>
         <%- end -%>
-        <%= text_field(:page_objects, "#{key}-sources-tag-count", :style => 'display: none') %>
-        <%= text_field(:page_objects, "#{key}-sources-folder-count", :style => 'display: none') %>
+        <%-
+          @page_objects["#{key}-sources-tag-count"] ||= 0
+          @page_objects["#{key}-sources-folder-count"] ||= 0
+        -%>
+        <%= text_field(:page_objects, "#{key}-sources-tag-count", :style => 'display: none;') %>
+        <%= text_field(:page_objects, "#{key}-sources-folder-count", :style => 'display: none;') %>
       </div>
       
       <table>

data/app/views/management/cms/_page_list_source_folder.html.erb

@@ -1,5 +1,5 @@
 <%-
-  i ||= 0
+  i = 0 if i.blank?
   @page_objects["#{key}-sources-folder#{i}-expand-folders"] ||= 'true' if @page_objects
 -%>
 <div style="border: 1px solid #f0f0f0;">
@@ -8,13 +8,13 @@
     <tr>
       <td valign="top">Folder <%= i.to_i + 1 %>:</td>
       <td>
-        <%= text_field(:page_objects, "#{key}-sources-folder#{i}", :class => 'form', :style => 'margin: 0; border: 1px solid gray; width: 100%;') %><br/>
+        <%= text_field(:page_objects, "#{key}-sources-folder#{i}", :class => 'form', :style => 'margin: 0; padding: 2px; border: 1px solid gray; width: 98%;') %><br/>
         <%= check_box(:page_objects, "#{key}-sources-folder#{i}-expand-folders", { :class => 'form', :style => '' }, 'true', 'false') %>
         <label for="page_objects_<%= key %>-sources-folder<%= i %>-expand-folders">
           Include pages within subfolders
         </label>
       </td>
-      <td><button class="form_button" onclick="showPageBrowser('<%= "page_objects_#{key}-sources-folder#{i}" %>'); return false;">Select...</button></td>
+      <td valign="top"><button class="form_button" onclick="showPageBrowser('<%= "page_objects_#{key}-sources-folder#{i}" %>'); return false;">Select...</button></td>
     </tr>
   </table>
 </div>

data/app/views/management/cms/_page_list_source_tag.html.erb

@@ -1,4 +1,4 @@
-<% i ||= 0 %>
+<%- i = 0 if i.blank? -%>
 <div style="border: 1px solid #f0f0f0;">
   <table width="100%">
     <col width="70" /><col width="*" /><col width="80" />

data/app/views/management/cms/select_page.html.erb

@@ -54,4 +54,4 @@ EOF
     <% end -%>
   </div>
 </div>
-<%= javascript_tag "cbNumColumns = #{@page_levels.size - 1}; try { $('columnBrowserLevel' + cbNumColumns).scrollIntoView(); } catch (e) {}; $('page_browser_selection').value = '/#{@page.path}';" %>
+<%= javascript_tag "cbNumColumns = #{@page_levels.size - 1}; try { $('columnBrowserContainer').scrollLeft = $('columnBrowserContainer').scrollWidth; } catch (e) {}; $('page_browser_selection').value = '/#{@page.path}';" %>

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.19"
+  VERSION = "3.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -330,6 +330,7 @@ files:
 - app/assets/stylesheets/codepress/languages/sql.css
 - app/assets/stylesheets/codepress/languages/text.css
 - app/assets/stylesheets/cropper.css
+- app/assets/stylesheets/imagine_controls.css
 - app/assets/stylesheets/management.css
 - app/controllers/cms/content_controller.rb
 - app/controllers/management/application_controller.rb