refinerycms 0.9.6.6 → 0.9.6.7

data/VERSION

@@ -1 +1 @@
-0.9.6.6
+0.9.6.7

data/bin/refinery-override

@@ -30,7 +30,7 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
     # copy the controller
     unless controller_with_admin =~ /\*(\*)?/ and !action.nil?
       refinery_controllers = Dir[File.join(REFINERY_ROOT, %w(vendor plugins ** app controllers), "#{controller_with_admin}_controller.rb")]
-      unless refinery_controllers.compact.empty? # the controllers may not exist.
+      if refinery_controllers.compact.any? # the controllers may not exist.
         refinery_controllers.each do |refinery_controller|
           # make the directories
           FileUtils.mkdir_p(copy_to = File.join(RAILS_ROOT, %w(app controllers), admin))

data/db/schema.rb

@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #

data/public/javascripts/refinery/admin.js

@@ -609,25 +609,25 @@ var image_picker = {
 
   , init: function(new_options){
     this.options = $.extend(this.options, new_options);
-    $(this.options.remove_image_button).click(function(e){
-      e.preventDefault();
-      $(this.options.image_display).removeClass('brown_border')
-                                .attr({'src': '', 'width': '', 'height': ''})
-                                .css({'width': 'auto', 'height': 'auto'})
-                                .hide();
-      $(this.options.field).val('');
-      $(this.options.no_image_message).show();
-      $(this).hide();
-    });
+    $(this.options.remove_image_button).click($.proxy(this.remove_image, this));
+    $(this.options.image_toggler).click($.proxy(this.toggle_image, this));
+  }
 
-    if(this.options.image_toggler != null){
-      $(this.options.image_toggler).click(function(e){
-        $(this).html(($(this).html() == 'Show' ? 'Hide' : 'Show'));
-        $(this.options.image_container).toggle();
-        e.preventDefault();
-      });
-    }
+  , remove_image: function(e) {
+    e.preventDefault();
+    $(this.options.image_display).removeClass('brown_border')
+                              .attr({'src': '', 'width': '', 'height': ''})
+                              .css({'width': 'auto', 'height': 'auto'})
+                              .hide();
+    $(this.options.field).val('');
+    $(this.options.no_image_message).show();
+    $(this).hide();
+  }
 
+  , toggle_image: function(e) {
+    $(this.options.image_toggler).html(($(this.options.image_toggler).html() == 'Show' ? 'Hide' : 'Show'));
+    $(this.options.image_container).toggle();
+    e.preventDefault();
   }
 
   , changed: function(image) {

data/vendor/plugins/authentication/app/views/admin/users/index.html.erb

@@ -6,7 +6,7 @@
   </ul>
 </div>
 <div id='records'>
-  <% if @users.size > 0 %>
+  <% if @users.any? %>
     <%= will_paginate @users, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <ul>
       <% @users.each do |user| -%>

data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb

@@ -1,5 +1,5 @@
 <h2>Latest Activity</h2>
-<% unless @recent_activity.empty? %>
+<% if @recent_activity.any? %>
   <table id='recent_activity'>
     <% @recent_activity.each do |change| %>
       <tr class='<%= cycle("on", "") %>'>

data/vendor/plugins/images/app/controllers/admin/images_controller.rb

@@ -28,7 +28,7 @@ class Admin::ImagesController < Admin::BaseController
   end
 
   def new
-    @image = Image.new unless @image.present?
+    @image = Image.new if @image.nil?
 
     @url_override = admin_images_url(:dialog => from_dialog?)
   end
@@ -38,7 +38,7 @@ class Admin::ImagesController < Admin::BaseController
 
     @url_override = admin_images_url(:dialog => from_dialog?, :insert => true)
 
-    unless params[:conditions].blank?
+    if params[:conditions].present?
       extra_condition = params[:conditions].split(',')
 
       extra_condition[1] = true if extra_condition[1] == "true"
@@ -68,8 +68,10 @@ class Admin::ImagesController < Admin::BaseController
         render :action => 'new'
       end
     else
-      @image_id = @image.id
-      @image = nil
+      if @image.valid?
+        @image_id = @image.id
+        @image = nil
+      end
       self.insert
     end
   end

data/vendor/plugins/images/app/models/image.rb

@@ -8,7 +8,19 @@ class Image < ActiveRecord::Base
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
                  :max_size => 50.megabytes
 
-  validates_as_attachment
+   def validate
+     if self.filename.nil?
+       errors.add_to_base("You must choose an image to upload")
+     else
+       [:size, :content_type].each do |attr_name|
+         enum = attachment_options[attr_name]
+         unless enum.nil? || enum.include?(send(attr_name))
+           errors.add_to_base("Images should be smaller than 50 MB in size") if attr_name == :size
+           errors.add_to_base("Your image must be either a JPG, PNG or GIF") if attr_name == :content_type
+         end
+       end
+     end
+   end
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title],

data/vendor/plugins/images/app/views/admin/images/_form.html.erb

@@ -1,4 +1,4 @@
-<%= error_messages_for(:image).gsub("Content type is not included in the list", "Your image must be either a JPG, PNG or GIF") %>
+<%= error_messages_for :image %>
 
 <% form_for [:admin, @image], :url => @url_override || @url,
                               :html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>

data/vendor/plugins/images/app/views/admin/images/index.html.erb

@@ -20,13 +20,13 @@
 <div id='records'>
   <% if searching? %>
     <h2>Search Results for "<%= params[:search] %>"</h2>
-    <% if @images.size > 0 %>
+    <% if @images.any? %>
       <%= render :partial => "#{current_image_view}_view" %>
     <% else %>
       <p>Sorry, no results found.</p>
     <% end %>
   <% else %>
-    <% if @images.size > 0 %>
+    <% if @images.any? %>
       <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>
       <%= render :partial => "#{current_image_view}_view" %>
       <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>

data/vendor/plugins/images/app/views/admin/images/insert.html.erb

@@ -1,20 +1,20 @@
 <div class='clearfix'>
   <div id='dialog_menu_left'>
-    <% unless @images.empty? %>
-      <span id="existing_image_radio" class="radio<%= " selected_radio" if @image.errors.empty? || !@images.empty? %>">
+    <% if @images.any? %>
+      <span id="existing_image_radio" class="radio<%= " selected_radio" if @image.errors.empty? %>">
         <input type='radio' name='image_type' value='existing_image' id='image_type_existing' <%= "checked='true'" if @image.errors.empty? %> />
         <label for='image_type_existing' class='stripped'>Existing Image</label>
       </span>
     <% end %>
-    <span id="upload_image_radio" class="radio<%= " selected_radio" if @image.errors.size > 0 || @images.empty? %>">
-      <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? || !@image.errors.empty? %> />
+    <span id="upload_image_radio" class="radio<%= " selected_radio" if @image.errors.any? or @images.empty? %>">
+      <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? || @image.errors.any? %> />
       <label for='image_type_upload' class='stripped'>New Image</label>
     </span>
   </div>
 
   <div id='dialog_main'>
-    <% unless @images.empty? %>
-      <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" unless @image.errors.empty? %>>
+    <% if @images.any? %>
+      <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
         <input type='hidden' name='selected_image' id='selected_image' />
         <div id='existing_image_area_content' class='clearfix'>
           <ul>
@@ -28,7 +28,7 @@
         <%= images_paginator @images, from_dialog? %>
       </div>
     <% end %>
-    <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" unless @images.empty? %>>
+    <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" if @images.any? and @image.errors.empty? %>>
       <%= render :partial => "form", :locals => {:insert => true} %>
     </div>
   </div>
@@ -47,4 +47,4 @@
       image_dialog.init(<%= @callback.present? ? "self.parent.#{@callback}" : "null" %>);
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb

@@ -19,7 +19,7 @@
     <%= render :partial => "inquiry", :collection => @inquiries %>
   <% else %>
     <h2>Open Inquiries</h2>
-    <% if @open_inquiries.size > 0 -%>
+    <% if @open_inquiries.any? -%>
       <ul>
         <%= render :partial => "inquiry", :collection => @open_inquiries %>
       </ul>
@@ -30,7 +30,7 @@
       </p>
     <% end -%>
     <h2>Closed Inquiries</h2>
-    <% if @closed_inquiries.size > 0 -%>
+    <% if @closed_inquiries.any? -%>
       <ul>
         <%= render :partial => "inquiry", :collection => @closed_inquiries %>
       </ul>

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb

@@ -11,7 +11,7 @@
   </ul>
 </div>
 <div id='records'>
-  <% if @inquiry_settings.size > 0 %>
+  <% if @inquiry_settings.any? %>
     <ul>
       <% @inquiry_settings.each do |setting| -%>
         <li class='clearfix record <%= cycle("on", "on-hover") %>'>

data/vendor/plugins/news/app/views/admin/news_items/index.html.erb

@@ -10,7 +10,7 @@
 </div>
 <div id='records'>
   <%= "<h2>Search Results for \"#{params[:search]}\"</h2>" if searching? %>
-  <% unless @news_items.empty? %>
+  <% if @news_items.any? %>
     <%= will_paginate @news_items, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <ul>
       <%= render :partial => "news_item", :collection => @news_items %>

data/vendor/plugins/news/app/views/news_items/index.html.erb

@@ -1,7 +1,7 @@
 <% content_for :body_content_left do %>
   <%= @page[:body] %>
 
-  <% unless @news_items.empty? %>
+  <% if @news_items.any? %>
     <% @news_items.each do |item| %>
       <h3><%= link_to item.title, news_item_url(item) %></h3>
       <p>

data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb

@@ -2,4 +2,4 @@
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
   <%= link_to page_link.title_with_meta, page_link.url, :title => 'Link to this Page', :rel => page_link.title, :class => 'page_link' %>
 </li>
-<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} unless page_link.children.empty? %>
+<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>

data/vendor/plugins/pages/app/views/admin/pages/_list.html.erb

@@ -19,7 +19,7 @@
     <%= h page.title %> <%= "<em>(hidden)</em>" unless page.show_in_menu? %>
     <%= "<em>(draft)</em>" if page.draft? %>
   </div>
-  <% unless (children = page.children).empty? %>
+  <% if (children = page.children).any? %>
     <ul<%= " class='nested'" %>>
       <% children.each do |child| %>
         <%= render :partial => 'list', :locals => {:page => child} %>

data/vendor/plugins/pages/app/views/admin/pages/index.html.erb

@@ -16,7 +16,7 @@
 </div>
 <div id='records' class='tree'>
   <% if searching? %>
-    <% unless @pages.empty? %>
+    <% if @pages.any? %>
       <h2>Search Results for "<%= params[:search] %>"</h2>
       <ul id='sortable_list'>
         <%= render :partial => "sortable_list" %>
@@ -27,7 +27,7 @@
       </p>
     <% end %>
   <% else %>
-    <% unless @pages.empty? %>
+    <% if @pages.any? %>
       <ul id='sortable_list'>
         <%= render :partial => "sortable_list" %>
       </ul>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -8,7 +8,7 @@
   extra_body_content_classes << "no_right" if body_content_right.blank?
 -%>
 <%= render :partial => "/shared/submenu" if !admin? and (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
-<div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" unless extra_body_content_classes.empty? %>'>
+<div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" if extra_body_content_classes.any? %>'>
 <% unless body_content_title.blank? and !(show_empty_sections ||= false) -%>
   <h1 id='body_content_page_title'>
     <%= body_content_title %>

data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb

@@ -1,4 +1,4 @@
-<% unless (children = @page.root.children).empty? -%>
+<% if (children = @page.root.children).any? -%>
   <ul id='submenu'>
     <%= render :partial => "/shared/submenu_branch", :collection => children %>
   </ul>

data/vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb

@@ -1,7 +1,7 @@
 <% if submenu_branch.in_menu? %>
 <li<%= " class='selected'" if selected_page?(submenu_branch) or descendant_page_selected?(submenu_branch) %>>
   <%= link_to submenu_branch.title, submenu_branch.url -%>
-  <% unless (children = submenu_branch.children).empty? %>
+  <% if (children = submenu_branch.children).any? %>
   <ul>
     <%= render :partial => "/shared/submenu_branch", :collection => children %>
   </ul>

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -10,7 +10,7 @@
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
   <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;callback=image_picker_<%= randomiser %>_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='thickbox'>
     <% unless image.nil? -%>
-      <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image"} %>
+      <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image_#{randomiser}"} %>
     <% else -%>
       <img id="current_picked_image_<%= randomiser %>" class="" src="" alt="" style='display: none' />
     <% end -%>
@@ -27,7 +27,7 @@
     // We're so un-object-oriented here. We need to rewrite the jQuery admin.js file to use OO.
     var image_picker_<%= randomiser %>_options = {
       thumbnail: '<%= thumbnail %>'
-      , toggle_image_display: <%= toggle_image_display.to_s %>
+      , image_toggler: '<%= toggle_image_display ? "#current_image_toggler_#{randomiser}" : "null" %>'
       , description: '<%= description %>'
       , field: '#current_image_id_<%= randomiser %>'
       , image_display: '#current_picked_image_<%= randomiser %>'

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb

@@ -17,13 +17,13 @@
 <div id='records'>
   <%% if searching? %>
     <h2>Search Results for "<%%= params[:search] %>"</h2>
-    <%% unless @<%= plural_name %>.empty? %>
+    <%% if @<%= plural_name %>.any? %>
       <%%= render :partial => "<%= singular_name %>", :collection => @<%= plural_name %> %>
     <%% else %>
       <p>Sorry, no results found.</p>
     <%% end %>
   <%% else %>
-    <%% unless @<%= plural_name %>.empty? %>
+    <%% if @<%= plural_name %>.any? %>
       <%%= will_paginate @<%= plural_name %>, :previous_label => '&laquo;', :next_label => '&raquo;' %>
        <ul id='sortable_list'>
         <%%= render :partial => "sortable_list" %>

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb

@@ -6,7 +6,7 @@
   </ul>
 </div>
 <div id='records'>
-  <% unless @refinery_settings.empty? %>
+  <% if @refinery_settings.any? %>
     <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' unless searching? %>
     <ul>
       <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -4,13 +4,13 @@ class Admin::ResourcesController < Admin::BaseController
   before_filter :init_dialog
 
   def new
-    @resource = Resource.new unless @resource.present?
+    @resource = Resource.new if @resource.nil?
 
     @url_override = admin_resources_url(:dialog => from_dialog?)
   end
 
   def create
-    @resource = Resource.create params[:resource]
+    @resource = Resource.create(params[:resource])
 
     unless params[:insert]
       if @resource.valid?
@@ -25,8 +25,10 @@ class Admin::ResourcesController < Admin::BaseController
         render :action => 'new'
       end
     else
-      @resource_id = @resource.id
-      @resource = nil
+      if @resource.valid?
+        @resource_id = @resource.id
+        @resource = nil
+      end
       self.insert
     end
   end
@@ -56,7 +58,7 @@ class Admin::ResourcesController < Admin::BaseController
 
     @url_override = admin_resources_url(:dialog => from_dialog?, :insert => true)
 
-    unless params[:conditions].blank?
+    if params[:conditions].present?
       extra_condition = params[:conditions].split(',')
 
       extra_condition[1] = true if extra_condition[1] == "true"

data/vendor/plugins/resources/app/models/resource.rb

@@ -5,7 +5,18 @@ class Resource < ActiveRecord::Base
                  :size => 0.kilobytes..50.megabytes,
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
 
-  validates_as_attachment
+  def validate
+    if self.filename.nil?
+      errors.add_to_base("You must choose a file to upload")
+    else
+      [:size].each do |attr_name|
+        enum = attachment_options[attr_name]
+        unless enum.nil? || enum.include?(send(attr_name))
+          errors.add_to_base("Files should be smaller than 50 MB in size") if attr_name == :size
+        end
+      end
+    end
+  end
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title, :type_of_content],

data/vendor/plugins/resources/app/views/admin/resources/index.html.erb

@@ -11,13 +11,13 @@
 <div id='records'>
   <% if searching? %>
     <h2>Search Results for "<%= params[:search] %>"</h2>
-    <% if @resources.size > 0 %>
+    <% if @resources.any? %>
         <%= render :partial => "resource", :collection => @resources %>
     <% else %>
       <p>Sorry, no results found.</p>
     <% end %>
   <% else %>
-    <% if @resources.size > 0 -%>
+    <% if @resources.any? -%>
       <%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
       <% if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true) %>
         <% @grouped_resources.each do |container| %>

data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb

@@ -1,29 +1,33 @@
 <div class='clearfix'>
   <div id='dialog_menu_left'>
-    <% unless @resources.empty? %>
-      <span id='existing_resource_radio' class='radio<%= " selected_radio" if @resource.errors.empty? and @resources.size > 0 %>'>
+    <% if @resources.any? %>
+      <span id='existing_resource_radio' class='radio<%= " selected_radio" if @resource.errors.empty? %>'>
         <input type='radio' name='resource_type' value='existing_resource' id='resource_type_existing' <%= "checked='true'" if @resource.errors.empty? %> />
         <label for='resource_type_existing' class='stripped'>Existing File</label>
       </span>
     <% end %>
-    <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.size > 0 or @resources.empty? %>'>
-      <input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or !@resource.errors.empty? %> />
+    <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.any? or @resources.empty? %>'>
+      <input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or @resource.errors.any? %> />
       <label for='resource_type_upload' class='stripped'>New File</label>
     </span>
   </div>
 
   <div id='dialog_main'>
-    <% unless @resources.empty? %>
-      <div id='existing_resource_area' class='dialog_area' <%= "style='display:none;'" unless @resource.errors.empty? %>>
+    <% if @resources.any? %>
+      <div id='existing_resource_area' class='dialog_area' <%= "style='display:none;'" if @resource.errors.any? %>>
         <input type='hidden' name='linked_resource' id='linked_resource' />
         <div id='existing_resource_area_content' class='clearfix'>
           <div id='pages_list'>
             <ul class='link_list'>
               <% @resources.each do |resource| -%>
-                <% resource_linked = (resource.public_filename == params[:current_link]) unless params[:current_link].blank? %>
+                <% resource_linked = (resource.public_filename == params[:current_link]) if params[:current_link].present? %>
                 <li<%= " class='linked'" if resource_linked %>>
-                  <%= link_to "#{resource.title} (#{resource.public_filename})", resource.public_filename, :title => 'Link to this Resource',
-                              :rel => resource.title, :class => 'page_link', :id => "resource_#{resource.id}" %>
+                  <%= link_to "#{resource.title} (#{resource.public_filename})",
+                              resource.public_filename,
+                              :title => 'Link to this Resource',
+                              :rel => resource.title,
+                              :class => 'page_link',
+                              :id => "resource_#{resource.id}" %>
                 </li>
               <% end %>
             </ul>
@@ -36,7 +40,7 @@
                           :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog?} unless @thickbox %>
       </div>
     <% end %>
-    <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" unless @resources.empty? %>>
+    <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.any? and @resource.errors.empty? %>>
       <%= render :partial => "form", :locals => {:insert => true} %>
     </div>
   </div>
@@ -46,10 +50,10 @@
     <%= submit_tag 'Insert', :id => "submit_button" %>
 
     <%= will_paginate @resources,
-                          :previous_label => '&laquo; Previous',
-                          :next_label => 'Next &raquo;',
-                          :renderer => Refinery::LinkRenderer,
-                          :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? } %>
+                      :previous_label => '&laquo; Previous',
+                      :next_label => 'Next &raquo;',
+                      :renderer => Refinery::LinkRenderer,
+                      :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? } %>
   </div>
 <% end %>
 

data/vendor/plugins/themes/app/views/admin/themes/index.html.erb

@@ -13,18 +13,17 @@
 <div id='records'>
   <% if searching? %>
     <h2>Search Results for "<%= params[:search] %>"</h2>
-    <% if @themes.size > 0 %>
+    <% if @themes.any? %>
         <%= render :partial => "theme", :collection => @themes %>
     <% else %>
       <p>Sorry, no results found.</p>
     <% end %>
   <% else %>
-    <% if @themes.size > 0 -%>
+    <% if @themes.any? -%>
       <%= will_paginate @themes, :previous_label => '&laquo;', :next_label => '&raquo;' %>
       <ul id='image_grid'>
         <%= render :partial => "theme", :collection => @themes %>
       </ul>
-
       <%= will_paginate @themes, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <% else -%>
       <p>
@@ -32,4 +31,4 @@
       </p>
     <% end -%>
   <% end %>
-</div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.6
+  version: 0.9.6.7
 platform: ruby
 authors: 
 - Resolve Digital