refinerycms 0.9.5.13 → 0.9.5.14

data/vendor/plugins/authentication/init.rb

@@ -4,10 +4,10 @@ Refinery::Plugin.register do |plugin|
   plugin.version = 1.0
   plugin.menu_match = /admin\/users$/
   plugin.activity = {
-    :class => User, 
-    :url_prefix => "edit_", 
-    :title => "login", 
-    :created_image => "user_add.png", 
+    :class => User,
+    :url_prefix => "edit_",
+    :title => "login",
+    :created_image => "user_add.png",
     :updated_image => "user_edit.png"
   }
-end
+end

data/vendor/plugins/authentication/lib/authenticated_system.rb

@@ -6,7 +6,7 @@ module AuthenticatedSystem
       !!current_user
     end
 
-    # Accesses the current user from the session. 
+    # Accesses the current user from the session.
     # Future calls avoid the database because nil is not equal to false.
     def current_user
       @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false

data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb

@@ -45,7 +45,7 @@ class SessionsControllerTest < Test::Unit::TestCase
     post :create, :login => 'quentin', :password => 'test', :remember_me => "0"
     assert_nil @response.cookies["auth_token"]
   end
-  
+
   def test_should_delete_token_on_logout
     login_as :quentin
     get :destroy
@@ -78,7 +78,7 @@ class SessionsControllerTest < Test::Unit::TestCase
     def auth_token(token)
       CGI::Cookie.new('name' => 'auth_token', 'value' => token)
     end
-    
+
     def cookie_for(user)
       auth_token users(user).remember_token
     end

data/vendor/plugins/authentication/test/functional/users_controller_test.rb

@@ -55,14 +55,14 @@ class UsersControllerTest < Test::Unit::TestCase
       assert_response :success
     end
   end
-  
+
   def test_should_sign_up_user_in_pending_state
     create_user
     assigns(:user).reload
     assert assigns(:user).pending?
   end
 
-  
+
   def test_should_sign_up_user_with_activation_code
     create_user
     assigns(:user).reload
@@ -76,7 +76,7 @@ class UsersControllerTest < Test::Unit::TestCase
     assert_not_nil flash[:notice]
     assert_equal users(:aaron), User.authenticate('aaron', 'test')
   end
-  
+
   def test_should_not_activate_user_without_key
     get :activate
     assert_nil flash[:notice]

data/vendor/plugins/authentication/test/test_helper.rb

@@ -16,7 +16,7 @@ class Test::Unit::TestCase
   # don't care one way or the other, switching from MyISAM to InnoDB tables
   # is recommended.
   #
-  # The only drawback to using transactional fixtures is when you actually 
+  # The only drawback to using transactional fixtures is when you actually
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
   self.use_transactional_fixtures = true

data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb

@@ -13,4 +13,4 @@ class Admin::DashboardController < Admin::BaseController
     @recent_activity = @recent_activity.sort{|x,y| y.updated_at <=> x.updated_at}[0..((RefinerySetting.activity_show_limit ||= 15)-1)]
   end
 
-end
+end

data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb

@@ -12,7 +12,7 @@ module Admin::DashboardHelper
     
       message = "<td>#{refinery_icon_tag("#{eval("activity.#{action}_image")}")}</td>"
       message << "<td>#{link} #{record.class.name.titleize.downcase} was #{action}</td>"
-      message << "<td align='right'>#{time_ago_in_words(eval("record.#{action}_at"))} ago</td>"
+      message << "<td class='time_ago'>#{time_ago_in_words(eval("record.#{action}_at")).gsub("about ", "")} ago</td>"
     end
   end
   

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

@@ -1,14 +1,14 @@
 <h2>Latest Activity</h2>
 <% if @recent_activity.size > 0 %>
-	<table id='recent_activity'>
-		<% @recent_activity.each do |change| %>
-	  	<tr class='<%= cycle("on", "") %>'>
-	      <%= activity_message_for change %>
-	  	</tr>
-		<% end %>
-	</table>
+  <table id='recent_activity'>
+    <% @recent_activity.each do |change| %>
+      <tr class='<%= cycle("on", "") %>'>
+        <%= activity_message_for change %>
+      </tr>
+    <% end %>
+  </table>
 <% else %>
-	<p>
-		Nothing has happened yet.
-	</p>
+  <p>
+    Nothing has happened yet.
+  </p>
 <% end %>

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

@@ -1,31 +1,31 @@
 <div class='clearfix'>
-	<div id='records'>
-		<%= render :partial => "recent_activity" %>
-	</div>
-	<div id='actions'>
-		<h2>Common Tasks</h2>
-		<ul>
-			<% if Refinery::Plugins.active.titles.include?("Pages") %>
-				<li>
-					<%= link_to "Add a new page", new_admin_page_url, :class => "add_icon" %>
-				</li>
-				<li>
-					<%= link_to "Update a page", admin_pages_url, :class => "edit_icon" %>
-				</li>
-			<% end %>
-			<% if Refinery::Plugins.active.titles.include?("Resources") %>
-				<li>
-					<%= link_to "Upload a file", new_admin_resource_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
-				</li>
-			<% end %>
-			<% if Refinery::Plugins.active.titles.include?("Images") %>
-				<li>
-					<%= link_to "Upload an image", new_admin_image_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
-				</li>
-			<% end %>
-			<li>
-				<%= link_to "See home page", root_url, :class => "go_icon", :target => "_blank" %>
-			</li>
-		</ul>
-	</div>
-</div>
+  <div id='records'>
+    <%= render :partial => "recent_activity" %>
+  </div>
+  <div id='actions'>
+    <h2>Common Tasks</h2>
+    <ul>
+      <% if Refinery::Plugins.active.titles.include?("Pages") %>
+        <li>
+          <%= link_to "Add a new page", new_admin_page_url, :class => "add_icon" %>
+        </li>
+        <li>
+          <%= link_to "Update a page", admin_pages_url, :class => "edit_icon" %>
+        </li>
+      <% end %>
+      <% if Refinery::Plugins.active.titles.include?("Resources") %>
+        <li>
+          <%= link_to "Upload a file", new_admin_resource_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
+        </li>
+      <% end %>
+      <% if Refinery::Plugins.active.titles.include?("Images") %>
+        <li>
+          <%= link_to "Upload an image", new_admin_image_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
+        </li>
+      <% end %>
+      <li>
+        <%= link_to "See home page", root_url, :class => "go_icon", :target => "_blank" %>
+      </li>
+    </ul>
+  </div>
+</div>

data/vendor/plugins/dashboard/config/routes.rb

@@ -1,5 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-  map.namespace(:admin) do |admin| 
+  map.namespace(:admin) do |admin|
     admin.resources :dashboard
   end
-end
+end

data/vendor/plugins/dashboard/init.rb

@@ -1,7 +1,7 @@
 Refinery::Plugin.register do |plugin|
-	plugin.directory = directory
-	plugin.title = "Dashboard"
-	plugin.description = "Gives an overview of activity in Refinery"
-	plugin.version = 1.0
-	plugin.always_allow_access = true
-end
+  plugin.directory = directory
+  plugin.title = "Dashboard"
+  plugin.description = "Gives an overview of activity in Refinery"
+  plugin.version = 1.0
+  plugin.always_allow_access = true
+end

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

@@ -1,10 +1,10 @@
 class Admin::ImagesController < Admin::BaseController
-  
+
   include Admin::ImagesHelper
 
   crudify :image, :order => "created_at DESC", :conditions => "parent_id is NULL", :sortable => false
   before_filter :change_list_mode_if_specified
-  
+
   def index
     if searching?
       @images = Image.paginate_search params[:search],
@@ -16,7 +16,7 @@ class Admin::ImagesController < Admin::BaseController
                                                :order => "created_at DESC",
                                                :conditions => "parent_id IS NULL"
     end
-    
+
     if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)
       @grouped_images = []
       @images.each do |image|
@@ -26,12 +26,12 @@ class Admin::ImagesController < Admin::BaseController
       end
     end
   end
-  
+
   def new
     @image = Image.new
     @url_override = admin_images_url(:dialog => from_dialog?)
   end
-  
+
   def insert
     self.new if @image.nil?
     @dialog = from_dialog?
@@ -40,22 +40,22 @@ class Admin::ImagesController < Admin::BaseController
     @update_image = params[:update_image]
     @thumbnail = params[:thumbnail]
     @callback = params[:callback]
-		@conditions = params[:conditions]
+    @conditions = params[:conditions]
     @url_override = admin_images_url(:dialog => @dialog, :insert => true)
 
-		unless params[:conditions].blank?
-			extra_condition = params[:conditions].split(',')
-			
-			extra_condition[1] = true if extra_condition[1] == "true"
-			extra_condition[1] = false if extra_condition[1] == "false"
-			extra_condition[1] = nil if extra_condition[1] == "nil"
-	    paginate_images({extra_condition[0].to_sym => extra_condition[1]})
-		else
-			paginate_images
-		end
+    unless params[:conditions].blank?
+      extra_condition = params[:conditions].split(',')
+
+      extra_condition[1] = true if extra_condition[1] == "true"
+      extra_condition[1] = false if extra_condition[1] == "false"
+      extra_condition[1] = nil if extra_condition[1] == "nil"
+      paginate_images({extra_condition[0].to_sym => extra_condition[1]})
+    else
+      paginate_images
+    end
     render :action => "insert"
   end
-  
+
   def create
     @image = Image.create(params[:image])
     unless params[:insert]
@@ -77,16 +77,16 @@ class Admin::ImagesController < Admin::BaseController
       @image = nil
       self.insert
     end
-  end	
-  
+  end
+
 protected
 
-	def paginate_images(conditions={})
-	  @images = Image.paginate 	:page => (@paginate_page_number ||= params[:page]),
-	                           	:conditions => {:parent_id => nil}.merge!(conditions),
-	                           	:order => 'created_at DESC',
-	                           	:per_page => Image.per_page(from_dialog?),
-															:include => :thumbnails
-	end
-  
-end
+  def paginate_images(conditions={})
+    @images = Image.paginate   :page => (@paginate_page_number ||= params[:page]),
+                               :conditions => {:parent_id => nil}.merge!(conditions),
+                               :order => 'created_at DESC',
+                               :per_page => Image.per_page(from_dialog?),
+                              :include => :thumbnails
+  end
+
+end

data/vendor/plugins/images/app/helpers/admin/images_helper.rb

@@ -1,17 +1,17 @@
 module Admin::ImagesHelper
-	
-	def image_views
-		RefinerySetting.find_or_set(:image_views, [:grid, :list])
-	end
 
-	def current_image_view
-	  RefinerySetting.find_or_set(:preferred_image_view, :list)
-	end
+  def image_views
+    RefinerySetting.find_or_set(:image_views, [:grid, :list])
+  end
 
-	def change_list_mode_if_specified
-	  unless params[:action] != "index" or params[:view].blank? or !image_views.include? params[:view].to_sym
-	    RefinerySetting[:preferred_image_view] = params[:view]
-	  end
-	end
-	
-end
+  def current_image_view
+    RefinerySetting.find_or_set(:preferred_image_view, :list)
+  end
+
+  def change_list_mode_if_specified
+    unless params[:action] != "index" or params[:view].blank? or !image_views.include? params[:view].to_sym
+      RefinerySetting[:preferred_image_view] = params[:view]
+    end
+  end
+
+end

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

@@ -1,11 +1,11 @@
 class Image < ActiveRecord::Base
-  
+
   has_many :pages
 
-  has_attachment :content_type => :image, 
+  has_attachment :content_type => :image,
                  :storage => :file_system,
                  :path_prefix => 'public/system/images',
-                 :processor => 'Rmagick', 
+                 :processor => 'Rmagick',
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
                  :max_size => 5.megabytes
 
@@ -17,21 +17,21 @@ class Image < ActiveRecord::Base
    unless self.filename.nil?
      [:size].each do |attr_name|
        enum = attachment_options[attr_name]
-       
+
        errors.add_to_base("Files should be smaller than 50 MB in size") unless enum.nil? || enum.include?(send(attr_name))
      end
    end
 
   end
-  
+
   def title
     self.filename.gsub(/\.\w+$/, '').titleize
   end
-  
+
   def self.per_page(dialog = false)
     size = (dialog ? 18 : 20)
   end
-  
+
   def self.last_page(images, dialog=false)
     page = unless images.size <= self.per_page(dialog)
       (images.size / self.per_page(dialog).to_f).ceil
@@ -39,13 +39,13 @@ class Image < ActiveRecord::Base
       nil # this must be nil, it can't be 0 as there apparently isn't a 0th page.
     end
   end
-  
+
   def self.thumbnails
     find(:all, :conditions => "parent_id not null")
   end
-  
+
   def self.originals
     find_all_by_parent_id(nil)
   end
-  
-end
+
+end

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

@@ -1,31 +1,31 @@
 <%= error_messages_for :image %>
 
 <% form_for [:admin, @image], :url => @url_override || @url, 
-															:html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>
-	<div class='field'>
-		<%= f.label :uploaded_data, 'Image' %>
-		<% if params[:action] =~ /(edit)|(update)/ %>
-			Use current image
-			<em>or</em>, replace it with this one... 
-		<% end %>
-		<%= f.file_field :uploaded_data %>
-	</div>
+                              :html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>
+  <div class='field'>
+    <%= f.label :uploaded_data, 'Image' %>
+    <% if params[:action] =~ /(edit)|(update)/ %>
+      Use current image
+      <em>or</em>, replace it with this one... 
+    <% end %>
+    <%= f.file_field :uploaded_data %>
+  </div>
 
-	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (from_dialog? and !@thickbox)} %>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@thickbox or params[:action] == "insert")} %>
 
   <% if @thickbox %>
-  	<input type='hidden' name='thickbox' value='<%= @thickbox %>' />
-  	<input type='hidden' name='field' value='<%= @field %>' />
-  	<input type='hidden' name='update_image' value='<%= @update_image %>' />
-  	<input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
-  	<input type='hidden' name='callback' value='<%= @callback %>' />
-		<input type='hidden' name='conditions' value='<%= @conditions %>' />
-	<% end %>
+    <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
+    <input type='hidden' name='field' value='<%= @field %>' />
+    <input type='hidden' name='update_image' value='<%= @update_image %>' />
+    <input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
+    <input type='hidden' name='callback' value='<%= @callback %>' />
+    <input type='hidden' name='conditions' value='<%= @conditions %>' />
+  <% end %>
 <% end %>
 
 <% if params[:action] =~ /(edit)|(update)/ %>
-	<div style='float: right; width: 25%;'>
-		<label>Current Image</label>
-		<%= image_fu @image, :medium, { :class => "brown_border" } %>
-	</div>
+  <div style='float: right; width: 25%;'>
+    <label>Current Image</label>
+    <%= image_fu @image, :medium, { :class => "brown_border" } %>
+  </div>
 <% end %>