refinerycms 0.9.6.34 → 0.9.7

data/vendor/plugins/refinery/lib/generators/refinery/templates/seed.rb

@@ -0,0 +1,15 @@
+User.find(:all).each do |user|
+  user.plugins.create(:name => "<%= class_name.pluralize.underscore.titleize %>",
+                      :position => (user.plugins.maximum(:position) || -1) +1)
+end
+
+page = Page.create(
+  :title => "<%= class_name.pluralize.underscore.titleize %>",
+  :link_url => "/<%= plural_name %>",
+  :deletable => false,
+  :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1),
+  :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
+)
+RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|
+  page.parts.create(:title => default_page_part, :body => nil)
+end

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

@@ -1,5 +1,5 @@
-<%%= error_messages_for :<%= singular_name %> -%>
 <%% form_for [:admin, @<%= singular_name %>] do |f| -%>
+  <%%= f.error_messages %>
   <% attributes.each_with_index do |attribute, index| %>
   <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
@@ -17,7 +17,7 @@
       :resource => @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %>,
     } %>
 <% elsif attribute.field_type.to_s == "text_area" -%>
-    <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' -%>
+    <%%= f.text_area :<%= attribute.name %>, :rows => 20, :class => 'wymeditor widest' -%>
 <% else -%>
     <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%><%= ", :class => 'larger'" if (index == 0 && attribute.field_type == :text_field) -%> -%>
 <% end -%>

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

@@ -2,16 +2,15 @@
   <span class='title'>
     <%%=h <%= singular_name %>.<%= attributes.first.name %> %>
     <span class="preview">&nbsp;</span>
-
-    <span class='actions'>
-      <%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_url(<%= singular_name %>),
-          :title => 'View this <%= $title_name.downcase %><br/><em>Opens in a new window</em>',
-          :target => "_blank" %>
-      <%%= link_to refinery_icon_tag("application_edit.png"), edit_admin_<%= singular_name %>_path(<%= singular_name %>),
-           :title => 'Edit this <%= $title_name.downcase %>' %>
-      <%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),
-          :class => "cancel confirm-delete",
-          :title => 'Remove this <%= $title_name.downcase %> forever' %>
-    </span>
+  </span>
+  <span class='actions'>
+    <%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_url(<%= singular_name %>),
+        :title => t('.view_live'),
+        :target => "_blank" %>
+    <%%= link_to refinery_icon_tag("application_edit.png"), edit_admin_<%= singular_name %>_path(<%= singular_name %>),
+         :title => t('.edit') %>
+    <%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),
+        :class => "cancel confirm-delete",
+        :title => t('.delete') %>
   </span>
 </li>

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

@@ -8,19 +8,19 @@
     </li>
   <%% if !searching? and <%= class_name %>.count > 1 %>
     <li>
-      <%%= link_to "Reorder <%= $title_name.pluralize %>", admin_<%= plural_name %>_url, :id => "reorder_action", :class => "reorder_icon" %>
-      <%%= link_to "Done Reordering <%= $title_name.pluralize %>", admin_<%= plural_name %>_url, :id => "reorder_action_done", :style => "display: none;", :class => "reorder_icon" %>
+      <%%= link_to t('refinery.reorder', :what => "<%= $title_name.pluralize %>"), admin_<%= plural_name %>_url, :id => "reorder_action", :class => "reorder_icon" %>
+      <%%= link_to t('refinery.reorder_done', :what => "<%= $title_name.pluralize %>"), admin_<%= plural_name %>_url, :id => "reorder_action_done", :style => "display: none;", :class => "reorder_icon" %>
     </li>
   <%% end %>
   </ul>
 </div>
 <div id='records'>
   <%% if searching? %>
-    <h2>Search Results for "<%%= params[:search] %>"</h2>
+    <h2><%%= t('admin.search_results_for', :query => params[:search]) %></h2>
     <%% if @<%= plural_name %>.any? %>
       <%%= render :partial => "<%= singular_name %>", :collection => @<%= plural_name %> %>
     <%% else %>
-      <p>Sorry, no results found.</p>
+      <p><%%= t('.search_no_results') %></p>
     <%% end %>
   <%% else %>
     <%% if @<%= plural_name %>.any? %>
@@ -32,8 +32,7 @@
     <%% else %>
       <p>
         <strong>
-          There are no <%= $title_name.pluralize.downcase %> yet.
-          Click "Create New <%= $title_name %>" to add your first <%= $title_name.downcase %>.
+          <%%= t('.no_items_yet') %>
         </strong>
       </p>
     <%% end %>

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

@@ -18,7 +18,7 @@
 <%% end %>
 
 <%% content_for :body_content_right do %>
-  <h2>Other <%= $title_name.pluralize %></h2>
+  <h2><%%= t('.other') %></h2>
   <ul id="<%= plural_name %>">
     <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
       <li>

data/vendor/plugins/refinery/lib/refinery.rb

@@ -1,7 +1,7 @@
 module Refinery
 
   class << self
-    attr_accessor :is_a_gem, :root, :s3_backend
+    attr_accessor :is_a_gem, :root, :s3_backend, :base_cache_key
     def is_a_gem
       @is_a_gem ||= false
     end
@@ -13,6 +13,27 @@ module Refinery
     def s3_backend
       @s3_backend ||= false
     end
+
+    def base_cache_key
+      @base_cache_key ||= "refinery"
+    end
+
+    def version
+      ::Refinery::Version.to_s
+    end
+  end
+
+  class Version
+    MAJOR = 0
+    MINOR = 9
+    TINY = 7
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+
+    def self.to_s
+      STRING
+    end
   end
 
 end

data/vendor/plugins/refinery/lib/refinery/activity.rb

@@ -9,7 +9,7 @@ module Refinery
         :class => nil,
         :conditions => nil,
         :created_image => "add.png",
-        :limit => 10,
+        :limit => 7,
         :nested_with => [],
         :order => 'updated_at DESC',
         :title => nil,

data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb

@@ -2,7 +2,8 @@ class Refinery::AdminBaseController < ApplicationController
 
   layout proc { |controller| "admin#{"_dialog" if controller.from_dialog?}" }
 
-  before_filter :correct_accept_header, :login_required, :restrict_plugins, :restrict_controller
+  before_filter :redirect_if_old_url, :correct_accept_header, :login_required, :restrict_plugins, :restrict_controller
+  after_filter :store_location?, :except => [:new, :create, :edit, :update, :destroy, :update_positions] # for redirect_back_or_default
 
   helper_method :searching?
 
@@ -16,30 +17,58 @@ class Refinery::AdminBaseController < ApplicationController
 
 protected
 
-  # never take the backend down for maintenance.
-  def take_down_for_maintenance?;end
+  #TODO Add language
+  def error_404(exception=nil)
+    if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
+      params[:action] = 'error_404'
+      @page[:body] = @page[:body].gsub(/href=(\'|\")\/(\'|\")/, "href='/refinery'").gsub("home page", "Dashboard")
+      render :template => "/pages/show", :status => 404
+    else
+      # fallback to the default 404.html page.
+      render :file => Rails.root.join("public", "404.html").cleanpath.to_s, :layout => false, :status => 404
+    end
+  end
+
+  def find_or_set_locale
+    if (params[:set_locale].present? and ::Refinery::I18n.locales.include?(params[:set_locale].to_sym))
+      ::Refinery::I18n.current_locale = params[:set_locale].to_sym
+      redirect_to url_for({:controller => controller_name, :action => action_name}) and return
+    else
+      I18n.locale = ::Refinery::I18n.current_locale
+    end
+  end
+
+  def group_by_date(records)
+    new_records = []
+
+    records.each do |record|
+      key = record.created_at.strftime("%Y-%m-%d")
+      record_group = new_records.collect{|records| records.last if records.first == key }.flatten.compact << record
+      (new_records.delete_if {|i| i.first == key}) << [key, record_group]
+    end
 
-  def error_404
-    @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
-    @page[:body] = @page[:body].gsub(/href=(\'|\")\/(\'|\")/, "href='/admin'").gsub("home page", "Dashboard")
-    render :template => "/pages/show", :status => 404
+    new_records
   end
 
   def restrict_plugins
     Refinery::Plugins.set_active( current_user.authorized_plugins ) if current_user.respond_to? :plugins
   end
 
+  #TODO Translate
   def restrict_controller
-    if Refinery::Plugins.active.reject {|plugin| params[:controller] !~ Regexp.new(plugin.menu_match) }.empty?
-      flash[:error] = "You do not have permission to access this feature."
+    if Refinery::Plugins.active.reject { |plugin|
+      params[:controller] !~ Regexp.new(plugin.menu_match) and
+      params[:controller] !~ Regexp.new(plugin.menu_match.to_s.gsub('admin\/', 'refinery/'))
+    }.empty?
       logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}' but was rejected."
-      redirect_back_or_default(admin_root_url)
+      error_404
     end
   end
 
   # Override method from application_controller. Not needed in this controller.
   def find_pages_for_menu; end
 
+
 private
   # This fixes the issue where Internet Explorer browsers are presented with a basic auth dialogue
   # rather than the xhtml one that they *can* accept but don't think they can.
@@ -53,4 +82,21 @@ private
     end
   end
 
+  # Just a simple redirect for old urls.
+  def redirect_if_old_url
+    redirect_to request.path.gsub('admin', 'refinery') if request.path =~ /^(|\/)admin/
+  end
+
+  # Check whether it makes sense to return the user to the last page they
+  # were at instead of the default e.g. admin_pages_url
+  # right now we just want to snap back to index actions and definitely not to dialogues.
+  def store_location?
+    store_location unless action_name !~ /index/ or request.xhr? or from_dialog?
+  end
+
+  # Override authorized? so that only users with the Refinery role can admin the website.
+  def authorized?
+    refinery_user?
+  end
+
 end

data/vendor/plugins/refinery/lib/refinery/application_controller.rb

@@ -1,12 +1,13 @@
 class Refinery::ApplicationController < ActionController::Base
 
-  helper_method :home_page?, :local_request?, :just_installed?, :from_dialog?, :admin?
+  helper_method :home_page?, :local_request?, :just_installed?, :from_dialog?, :admin?, :login?
   protect_from_forgery # See ActionController::RequestForgeryProtection
 
   include Crud # basic create, read, update and delete methods
   include AuthenticatedSystem
 
-  before_filter :take_down_for_maintenance?, :find_pages_for_menu, :show_welcome_page?
+  before_filter :find_or_set_locale, :find_pages_for_menu, :show_welcome_page?
+  after_filter :store_current_location!, :if => Proc.new {|c| c.send(:refinery_user?) }
 
   rescue_from ActiveRecord::RecordNotFound, ActionController::UnknownAction, ActionView::MissingTemplate, :with => :error_404
 
@@ -44,22 +45,29 @@ class Refinery::ApplicationController < ActionController::Base
   end
 
   def just_installed?
-    !User.exists?
+    Role[:refinery].users.empty?
   end
 
   def local_request?
-    ENV["RAILS_ENV"] == "development" or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
+    Rails.env.development? or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
   end
 
-  def wymiframe
-    render :template => "/wymiframe", :layout => false
+  def login?
+    (controller_name =~ /^(user|session)(|s)/ and not admin?) or just_installed?
   end
 
 protected
 
+  def default_url_options(options={})
+    Refinery::I18n.enabled? ? { :locale => I18n.locale } : {}
+  end
+
   # get all the pages to be displayed in the site menu.
   def find_pages_for_menu
-    @menu_pages = Page.top_level(include_children=true)
+    if (@menu_pages = Rails.cache.read(cache_key = "#{Refinery.base_cache_key}_menu_pages")).nil?
+      @menu_pages = Page.top_level(include_children = true)
+      Rails.cache.write(cache_key, @menu_pages) if @menu_pages.present?
+    end
   end
 
   # use a different model for the meta information.
@@ -74,20 +82,37 @@ protected
     super
   end
 
+  def find_or_set_locale
+    if ::Refinery::I18n.enabled?
+      if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
+        ::I18n.locale = locale
+      elsif locale.present? and ::Refinery::I18n.current_locale != ::I18n.default_locale
+        params[:locale] = I18n.locale = I18n.default_locale
+        redirect_to(params, :message => "The locale '#{locale.to_s}' is not supported.") and return
+      else
+        ::I18n.locale = ::Refinery::I18n.current_locale
+      end
+    end
+  end
+
   def show_welcome_page?
     render :template => "/welcome", :layout => "admin" if just_installed? and controller_name != "users"
   end
+
   # todo: make this break in the next major version rather than aliasing.
   alias_method :show_welcome_page, :show_welcome_page?
 
   def take_down_for_maintenance?
-    if RefinerySetting.find_or_set(:down_for_maintenance, false)
-      if (@page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])).present?
-        find_pages_for_menu
-        render :template => "/pages/show", :status => 503
-      else
-        render :text => "Our website is currently down for maintenance. Please try back soon."
-      end
+    logger.warn("*** Refinery::ApplicationController::take_down_for_maintenance has now been deprecated from the Refinery API. ***")
+  end
+
+private
+  def store_current_location!
+    if admin?
+      # ensure that we don't redirect to AJAX or POST/PUT/DELETE urls
+      session[:refinery_return_to] = request.path if request.get? and !request.xhr? and !from_dialog?
+    elsif defined?(@page) and @page.present?
+      session[:website_return_to] = @page.url
     end
   end
 

data/vendor/plugins/refinery/lib/refinery/application_helper.rb

@@ -1,7 +1,7 @@
 # Methods added to this helper will be available to all templates in the application.
 module Refinery::ApplicationHelper
 
-  include Refinery::HtmlTruncationHelper rescue puts "#{__FILE__}:#{__LINE__} Could not load hpricot"
+  include Refinery::HtmlTruncationHelper
 
   # This is used to display the title of the current object (normally a page) in the browser's titlebar.
   #
@@ -20,11 +20,21 @@ module Refinery::ApplicationHelper
       parts = match.split(".")
       extension = parts.pop
       content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
-    end
+    end unless content.blank?
 
     return content
   end
 
+  # This was extracted from REFINERY_ROOT/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb
+  # to remove the complexity of that template by reducing logic in the view.
+  def css_for_menu_branch(menu_branch, menu_branch_counter)
+    css = []
+    css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
+    css << "first" if menu_branch_counter == 0
+    css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
+    css
+  end
+
   # Determines whether any page underneath the supplied page is the current page according to rails.
   # Just calls selected_page? for each descendant of the supplied page.
   def descendant_page_selected?(page)
@@ -45,10 +55,10 @@ module Refinery::ApplicationHelper
 
       # call rails' image tag function with default alt, width and height options.
       # if any other options were supplied these are merged in and can replace the defaults.
-      image_tag(image_thumbnail.public_filename, {:alt => image.title,
+      image_tag(image_thumbnail.public_filename, {:alt => image.respond_to?(:title) ? image.title : image.filename,
                                                   :width => image_thumbnail.width,
                                                   :height => image_thumbnail.height
-                                                 }.merge!(options))
+                                                 }.merge(options))
     end
   end
 
@@ -56,16 +66,26 @@ module Refinery::ApplicationHelper
   # If you use this function then whenever we update or relocate the version of jquery or jquery ui in use
   # we will update the reference here and your existing application starts to use it.
   # Use <%= jquery_include_tags %> to include it in your <head> section.
-  def jquery_include_tags(use_caching = RefinerySetting.find_or_set(:use_resource_caching, false),
-                          use_google = RefinerySetting.find_or_set(:use_google_ajax_libraries, true))
+  def jquery_include_tags(options={})
+    # Merge in options
+    options = { :caching => RefinerySetting.find_or_set(:use_resource_caching, Rails.root.join('public', 'javascripts', 'cache').writable?),
+                :google => RefinerySetting.find_or_set(:use_google_ajax_libraries, false),
+                :jquery_ui => true
+              }.merge(options)
+
     # render the tags normally unless
-    unless use_google and !local_request?
-      javascript_include_tag 'jquery', 'jquery-ui-1.8.min.js', :cache => (use_caching ? "cache/libraries" : nil)
+    unless options[:google] and !local_request?
+      if options[:jquery_ui]
+        javascript_include_tag  "jquery#{"-min" if Rails.env.production?}", "jquery-ui-custom-min",
+                                :cache => (options[:caching] ? "cache/jquery" : nil)
+      else
+        javascript_include_tag "jquery#{"-min" if Rails.env.production?}"
+      end
     else
       "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
       <script type='text/javascript'>
         google.load('jquery', '1.4');
-        google.load('jqueryui', '1.8');
+        #{"google.load('jqueryui', '1.8');" if options[:jquery_ui]}
       </script>"
     end
   end
@@ -92,7 +112,7 @@ module Refinery::ApplicationHelper
     title = []
     objects = (options[:chain_page_title] and object.respond_to?(:ancestors)) ? [object.ancestors, object] : [object]
 
-    objects.flatten.each do |obj|
+    objects.flatten.compact.each do |obj|
       if obj.respond_to?(:custom_title_type)
         title << case obj.custom_title_type
           when "text"
@@ -120,6 +140,12 @@ module Refinery::ApplicationHelper
     end
   end
 
+  # Returns <span class='help' title='Your Input'>(help)</span>
+  # Remember to wrap your block with <span class='label_with_help'></span> if you're using a label next to the help tag.
+  def refinery_help_tag(title='')
+    "<span class='help' title='#{title}'>(help)</span>"
+  end
+
   # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
   # They are all 16x16 so this is the default but is able to be overriden with supplied options.
   def refinery_icon_tag(filename, options = {})
@@ -128,9 +154,14 @@ module Refinery::ApplicationHelper
 
   # Determine whether the supplied page is the currently open page according to Rails.
   def selected_page?(page)
+    # ensure we match the path without the locale.
+    path = request.path
+    path = path.split("/#{I18n.locale}").last if ::Refinery::I18n.enabled?
+
     current_page?(page) or
-      (request.path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
-      (request.path == page.link_url)
+      (path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
+      (path == page.link_url) or
+      (path == page.nested_path)
   end
 
   # Old deprecated function. TODO: Remove
@@ -138,4 +169,23 @@ module Refinery::ApplicationHelper
     logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
   end
 
+  # Generates the link to determine where the site bar switch button returns to.
+  def site_bar_switch_link
+    link_to_if(admin?, t('.switch_to_your_website'),
+              (if session.keys.include?(:website_return_to) and session[:website_return_to].present?
+                session[:website_return_to]
+               else
+                root_url(:only_path => true)
+               end)) do
+      link_to t('.switch_to_your_website_editor'),
+              (if session.keys.include?(:refinery_return_to) and session[:refinery_return_to].present?
+                session[:refinery_return_to]
+               elsif defined?(@page) and @page.present? and !@page.home?
+                 edit_admin_page_url(@page, :only_path => true)
+               else
+                 (request.request_uri.to_s == '/') ? admin_root_url(:only_path => true) : "/admin#{request.request_uri}/edit"
+               end rescue admin_root_url(:only_path => true))
+    end
+  end
+
 end