imagine_cms 3.0.4 → 3.0.5

data/app/controllers/cms/content_controller.rb

@@ -126,7 +126,7 @@ module Cms # :nodoc:
         test = db_path.last(3)
         
         if test.size == 3
-          if test[0] == 'segment' && !test[1].empty? && !test[2].empty?
+          if test[0] == 'segment' && !test[1].blank? && !test[2].blank?
             @page_list_segment = true
             params[:page_list_name] = db_path.pop
             params[:offset] = db_path.pop
@@ -242,7 +242,7 @@ module Cms # :nodoc:
         # table just for search. (this would be better because it would sort by relevance)
         # @pages.concat CmsPage.find(:all, :conditions => [ 'match (title, search_index) against (?)', params[:q] ])
       end
-      @pages = @pages.uniq.reject { |pg| pg.search_index.empty? }
+      @pages = @pages.uniq.reject { |pg| pg.search_index.blank? }
       
       @pg = CmsPage.new
       @pg.template = CmsTemplate.find_by_name('Search') || CmsTemplate.new

data/app/controllers/management/cms_controller.rb

@@ -173,7 +173,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   #     end
   #     
   #     begin
-  #       if params[:file_content].empty?
+  #       if params[:file_content].blank?
   #         flash[:error] = 'An error occurred, please contact support.'
   #       else
   #         File.open(filename, 'w') { |f| f.write(params[:file_content]) }
@@ -194,7 +194,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   # end
   
   def pages
-    @page_levels = [ '' ].concat((params[:path] || session[:cms_pages_path] || '').split('/').reject { |l| l.empty? })
+    @page_levels = [ '' ].concat((params[:path] || session[:cms_pages_path] || '').split('/').reject { |l| l.blank? })
     @page_levels << ''
     @path = ''
     @page = nil
@@ -276,7 +276,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         # now try to save tags
         begin
           tags_to_delete = @pg.tags
-          params[:tags].split(',').map { |t| t.strip }.reject { |t| t.empty? }.compact.each do |t|
+          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 }
           end
@@ -290,7 +290,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           objects_to_delete = @pg.objects.find(:all, :conditions => [ "obj_type = 'attribute' or obj_type = 'option'" ])
           
           (params[:page_objects] || {}).each do |key,val|
-            next if key.empty? || val.empty?
+            next if key.blank? || val.blank?
             
             key =~ /^obj-(\w+?)-(.+?)$/
             obj = @pg.objects.find(:first, :conditions => [ "name = ? and obj_type = ?", $2, $1 ])
@@ -454,7 +454,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
             for i in 0...@page_objects["#{key}-sources-tag-count"].to_i
               tags << @page_objects["#{key}-sources-tag#{i}"]
             end
-            tags.reject! { |tag| tag.empty? }
+            tags.reject! { |tag| tag.blank? }
             @page_objects["#{key}-sources-tag-count"] = tags.size
             tags.each_with_index do |tag, i|
               @page_objects["#{key}-sources-tag#{i}"] = tag
@@ -466,7 +466,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
             for i in 0...@page_objects["#{key}-sources-folder-count"].to_i
               folders << @page_objects["#{key}-sources-folder#{i}"]
             end
-            folders.reject! { |folder| folder.empty? }
+            folders.reject! { |folder| folder.blank? }
             @page_objects["#{key}-sources-folder-count"] = folders.size
             folders.each_with_index do |folder, i|
               @page_objects["#{key}-sources-folder#{i}"] = folder
@@ -644,10 +644,10 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     case type.to_sym
     when :string
-      @page_objects[key] = options[:content] if @page_objects[key].empty?
+      @page_objects[key] = options[:content] if @page_objects[key].blank?
       text_field(:page_objects, key, options)
     when :text
-      @page_objects[key] = options[:content] if @page_objects[key].empty?
+      @page_objects[key] = options[:content] if @page_objects[key].blank?
       focusOnLoad = !defined?(@cms_text_editor_placed)
       @cms_text_editor_placed = true
       content = ''.html_safe

data/app/helpers/cms_application_helper.rb

@@ -126,7 +126,7 @@ module CmsApplicationHelper
   def first_non_empty(*args)
     while !args.empty?
       ret = args.shift
-      return ret unless ret.to_s.empty?
+      return ret unless ret.to_s.blank?
     end
     return ''
   end
@@ -337,12 +337,12 @@ module CmsApplicationHelper
         instance_tags_require << @page_objects["#{key}-sources-tag#{i}"]
       end
     end
-    include_tags = instance_tags_include.map { |t| t.strip }.reject { |t| t.empty? }
-    exclude_tags = instance_tags_exclude.map { |t| t.strip }.reject { |t| t.empty? }
-    require_tags = instance_tags_require.map { |t| t.strip }.reject { |t| t.empty? }
+    include_tags = instance_tags_include.map { |t| t.strip }.reject { |t| t.blank? }
+    exclude_tags = instance_tags_exclude.map { |t| t.strip }.reject { |t| t.blank? }
+    require_tags = instance_tags_require.map { |t| t.strip }.reject { |t| t.blank? }
     
     if include_tags.empty?
-      include_tags = (options[:include_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.empty? }
+      include_tags = (options[:include_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
       include_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -351,7 +351,7 @@ module CmsApplicationHelper
       end
     end
     if exclude_tags.empty?
-      exclude_tags = (options[:exclude_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.empty? }
+      exclude_tags = (options[:exclude_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
       exclude_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -360,7 +360,7 @@ module CmsApplicationHelper
       end
     end
     if require_tags.empty?
-      require_tags = (options[:require_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.empty? }
+      require_tags = (options[:require_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
       require_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -375,7 +375,7 @@ module CmsApplicationHelper
       folders << HashObject.new(:src => @page_objects["#{key}-sources-folder#{i}"].strip,
                                 :expand_folders => @page_objects["#{key}-sources-folder#{i}-expand-folders"])
     end
-    folders = folders.reject { |f| f.src.empty? }
+    folders = folders.reject { |f| f.src.blank? }
     
     if folders.empty?
       folders = (options[:folders] || '').split(',').map do |f|
@@ -396,7 +396,7 @@ module CmsApplicationHelper
         
         obj
       end
-      folders = folders.reject { |f| f.src.empty? }
+      folders = folders.reject { |f| f.src.blank? }
       
       @page_objects["#{key}-sources-folder-count"] = folders.size
       folders.each_with_index do |f, i|

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

@@ -71,7 +71,7 @@
   </tr>
   <tr>
     <td>Published Version:</td>
-    <td><%= select :pg, :published_version, [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{ts_to_str pg.updated_on}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.empty? }", pg.version ] }), {}, :class => 'form', :style => 'width: 100%' %></td>
+    <td><%= select :pg, :published_version, [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{ts_to_str pg.updated_on}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }), {}, :class => 'form', :style => 'width: 100%' %></td>
   </tr>
   <tr>
     <td>Publish Date:</td>
@@ -107,7 +107,7 @@
         A thumbnail cannot be added until you save this page.
       <%- else -%>
       <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
-        <%- if @pg.thumbnail_path.empty? -%>
+        <%- if @pg.thumbnail_path.blank? -%>
           no thumbnail image selected
         <%- else -%>
           <%= image_tag(@pg.thumbnail_path, :onclick => "jQuery('#pg_thumbnail_path').show();") %>
@@ -128,7 +128,7 @@
         A feature image cannot be added until you save this page.
       <%- else -%>
       <div id="feature_image_preview" style="width: 385px; overflow: auto;">
-        <%- if @pg.feature_image_path.empty? -%>
+        <%- if @pg.feature_image_path.blank? -%>
           no feature image selected
         <%- else -%>
           <%= image_tag(@pg.feature_image_path, :onclick => "jQuery('#pg_feature_image_path').show();") %>

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

@@ -5,16 +5,3 @@
   <li><%= link_to 'Templates', :action => 'templates' %></li>
   <li><%= link_to 'Snippets', :action => 'snippets' %></li>
 </ul>
-
-<b>Admin</b>
-<br/>
-<div style="width: 400px">
-  Warning: For expert users only. The master files are not versioned and all changes take effect immediately. There is no undo.
-</div>
-<ul style="margin-top: 4px">
-  <li><%= link_to 'Edit Master Template', :action => 'edit_master', :id => 'template' %></li>
-  <li><%= link_to 'Edit Master Web Stylesheet', :action => 'edit_master', :id => 'web_stylesheet' %></li>
-  <li><%= link_to 'Edit Master Print Stylesheet', :action => 'edit_master', :id => 'print_stylesheet' %></li>
-  <li><%= link_to 'Edit Master IE Stylesheet', :action => 'edit_master', :id => 'ie_stylesheet' %></li>
-  <li><%= link_to 'Edit Master IE6 Stylesheet', :action => 'edit_master', :id => 'ie6_stylesheet' %></li>
-</ul>

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

@@ -39,8 +39,8 @@ EOF
   <div id="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
     <%- @page_levels.each_with_index do |name, i| -%>
       <%-
-        if !name.empty?
-          @path << '/' if !@path.empty?
+        if !name.blank?
+          @path << '/' if !@path.blank?
           @path << name
         end
         @parent = @page

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

@@ -20,8 +20,8 @@ EOF
   <div id="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
     <% @page_levels.each_with_index do |name, i| %>
       <%
-        if !name.empty?
-          @path << '/' if !@path.empty?
+        if !name.blank?
+          @path << '/' if !@path.blank?
           @path << name
         end
         @parent = @page

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

@@ -50,8 +50,8 @@
            <select name="version" style="font-size: 8pt; width: 210px" onchange="location.href = this.value;">
             <!-- FIXME: using "p" here inserts a paragraph in most cases! -->
             <%- @pg.versions.reverse.each do |pg| -%>
-              <option value="<%= "#{@pg.path.empty? ? '' : '/' + @pg.path}/version/#{pg.version}" %>"<%= (params[:version] || @pg.published_version).to_i == pg.version ? ' selected="selected"' : '' %>>
-                <%= "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{ " by #{pg.updated_by_username}" unless pg.updated_by_username.empty? }" + (pg.version == @pg.published_version ? ' [PUBLISHED]' : '') %>
+              <option value="<%= "#{@pg.path.blank? ? '' : '/' + @pg.path}/version/#{pg.version}" %>"<%= (params[:version] || @pg.published_version).to_i == pg.version ? ' selected="selected"' : '' %>>
+                <%= "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{ " by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }" + (pg.version == @pg.published_version ? ' [PUBLISHED]' : '') %>
               </option>
             <%- end -%>
           </select>
@@ -70,7 +70,7 @@
                                :complete => "$('set_page_version_loading').hide();" + (@pg ? "$('pg_published_version_container').style.borderColor = ($('pg_published_version').value == '0' || $('pg_published_version').value == '#{@pg.versions.last.version}') ? '#EBEBEB' : 'red';" : '')) do -%>
               <div id="pg_published_version_container" style="border-color: <%= @pg && (@pg.published_version == 0 || @pg.published_version == @pg.versions.last.version) ? '#EBEBEB' : 'red' %>; border-style: solid; border-width: 2px;">
               <select name="pg[published_version]" id="pg_published_version" style="font-size: 8pt; width: 210px;" onchange="this.form.onsubmit();">
-                <%- [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.empty? }", pg.version ] }).each do |label, version| %>
+                <%- [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }).each do |label, version| %>
                 <option value="<%= version %>"<%= (@pg && @pg.published_version == version.to_i) ? ' selected="selected"' : '' %>><%= label %></option>
                 <%- end -%>
               </select>

data/app/views/util/_calendar_days.html.erb

@@ -46,7 +46,7 @@
             <td>
               <div class="<%= @css_prefix %>event_rollover_body" style="border-width: 0 1px 0 1px; border-style: solid; padding: 7px 7px 0 7px; margin-<%= @popout_direction == 'right' ? 'left' : 'right' %>: 12px;">
                 <b><%= evt[:name] %></b>
-                <%= '<br/>' + evt[:html] unless evt[:html].empty? %>
+                <%= '<br/>' + evt[:html] unless evt[:html].blank? %>
               </div>
             </td>
           </tr>

data/lib/extensions/action_controller.rb

@@ -85,7 +85,7 @@ module ActionControllerExtensions
           
           # make options specified in snippets and templates accessible to
           # page list segments and rss feeds
-          @page_objects["#{key}-template"] = options[:template] if @page_objects["#{key}-template"].empty?
+          @page_objects["#{key}-template"] = options[:template] if @page_objects["#{key}-template"].blank?
           
           render_page_list_segment(name, pages, options, html_options)
         end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails