refinerycms 0.9.8 → 0.9.8.1

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/controllers/admin/plural_name_controller.rb

@@ -1,5 +1,7 @@
 class Admin::<%= class_name.pluralize %>Controller < Admin::BaseController
 
-  crudify :<%= singular_name %>, :title_attribute => :<%= attributes.first.name %>
+  crudify :<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>
+  , :title_attribute => '<%= title.name %>'
+<% end %>
 
 end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/models/singular_name.rb

@@ -1,9 +1,10 @@
 class <%= class_name %> < ActiveRecord::Base
 
   acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>]
-
-  validates_presence_of :<%= attributes.first.name %>
-  validates_uniqueness_of :<%= attributes.first.name %>
+  <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
+  validates_presence_of :<%= title.name %>
+  validates_uniqueness_of :<%= title.name %>
+  <% end -%>
 
 <% attributes.collect{|a| a if a.type.to_s == 'image'}.compact.uniq.each do |a| -%>
   belongs_to :<%= a.name.gsub("_id", "") %><%= ", :class_name => 'Image'" unless a.name =~ /^image(_id)?$/ %>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/admin/plural_name/_form.html.erb

@@ -30,6 +30,7 @@
               :locals => {
                 :f => f,
                 :continue_editing => false,
-                :delete_title => t('admin.<%= plural_name %>.<%= singular_name %>.delete')
+                :delete_title => t('admin.<%= plural_name %>.<%= singular_name %>.delete'),
+                :delete_confirmation => t('shared.admin.delete.message'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>, :title => @<%= singular_name %>.<%= title.name %><% end %>)
               } %>
 <%% end -%>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/admin/plural_name/_singular_name.html.erb

@@ -1,6 +1,6 @@
 <li class='clearfix record <%%= cycle("on", "on-hover") %>' id="<%%= dom_id(<%= singular_name %>) -%>">
   <span class='title'>
-    <%%= <%= singular_name %>.<%= attributes.first.name %> %>
+    <%%= <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? -%>.<%= title.name %><% end %> %>
     <span class="preview">&nbsp;</span>
   </span>
   <span class='actions'>
@@ -11,6 +11,10 @@
          :title => t('.edit') %>
     <%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),
         :class => "cancel confirm-delete",
-        :title => t('.delete') %>
+        :title => t('.delete'),
+        :'data-confirm' => t('shared.admin.delete.message'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>,
+        :title => <%= singular_name %>.<%= title.name %>
+      <% end %>),
+        :'data-method' => :delete %>
   </span>
 </li>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/index.html.erb

@@ -2,7 +2,9 @@
   <ul id="<%= plural_name %>">
     <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
       <li>
-        <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
+        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
+        .<%= title.name %>
+      <% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
       </li>
     <%% end %>
   </ul>

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/show.html.erb

@@ -1,5 +1,7 @@
 <%% content_for :body_content_title do %>
-  <%%= @<%= singular_name %>.<%= attributes.first.name %> %>
+  <%%= @<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
+  .<%= title.name %>
+<% end %> %>
 <%% end %>
 
 <%% content_for :body_content_left do %>
@@ -11,7 +13,7 @@
 <% elsif attribute.type.to_s == 'resource' -%>
     <%%= link_to <%= "'#{attribute.name}'" %>, @<%= singular_name %>.<%= attribute.name %>.url %>
 <% else -%>
-    <%%= @<%= singular_name %>.<%= attribute.name %> %>
+    <%%=raw @<%= singular_name %>.<%= attribute.name %> %>
 <% end -%>
   </div>
   <% end %>
@@ -22,7 +24,9 @@
   <ul id="<%= plural_name %>">
     <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
       <li>
-        <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
+        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
+        .<%= title.name %>
+      <% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
       </li>
     <%% end %>
   </ul>

data/vendor/refinerycms/core/lib/refinery/application_controller.rb

@@ -1,101 +1,111 @@
 require 'action_controller'
 
-class Refinery::ApplicationController < ActionController::Base
+module Refinery::ApplicationController
 
-  helper_method :home_page?,
-                :local_request?,
-                :just_installed?,
-                :from_dialog?,
-                :admin?,
-                :login?
+  def self.included(controller)
+    controller.send :include, InstanceMethods
+    controller.send :include, ClassMethods
+  end
 
-  protect_from_forgery # See ActionController::RequestForgeryProtection
+  module ClassMethods
+    def self.included(c) # Extend controller
+      c.helper_method :home_page?,
+                      :local_request?,
+                      :just_installed?,
+                      :from_dialog?,
+                      :admin?,
+                      :login?
 
-  include Crud # basic create, read, update and delete methods
-  include AuthenticatedSystem
+      c.protect_from_forgery # See ActionController::RequestForgeryProtection
 
-  before_filter :find_pages_for_menu,
-                :show_welcome_page?
+      c.send :include, Crud # basic create, read, update and delete methods
+      c.send :include, AuthenticatedSystem
 
-  after_filter :store_current_location!,
-               :if => Proc.new {|c| c.send(:refinery_user?) rescue false }
+      c.send :before_filter, :find_pages_for_menu,
+                             :show_welcome_page?
 
-  rescue_from ActiveRecord::RecordNotFound,
-              ActionController::UnknownAction,
-              ActionView::MissingTemplate,
-              :with => :error_404
+      c.send :after_filter, :store_current_location!,
+                            :if => Proc.new {|c| c.send(:refinery_user?) rescue false }
 
-  def admin?
-    controller_name =~ %r{^admin/}
+      c.send :rescue_from, ActiveRecord::RecordNotFound,
+                           ActionController::UnknownAction,
+                           ActionView::MissingTemplate,
+                           :with => :error_404
+    end
   end
 
-  def error_404(exception=nil)
-    if (@page = Page.where(:menu_match => "^/404$").includes(:parts, :slugs).first).present?
-      # render the application's custom 404 page with layout and meta.
-      render :template => "/pages/show",
-             :format => 'html',
-             :status => 404
-    else
-      # fallback to the default 404.html page.
-      file = Rails.root.join('public', '404.html')
-      file = Refinery.root.join('vendor', 'refinerycms', 'core', 'public', '404.html') unless file.exist?
-      render :file => file.cleanpath.to_s,
-             :layout => false,
-             :status => 404
+  module InstanceMethods
+    def admin?
+      controller_name =~ %r{^admin/}
     end
-  end
 
-  def from_dialog?
-    params[:dialog] == "true" or params[:modal] == "true"
-  end
+    def error_404(exception=nil)
+      if (@page = Page.where(:menu_match => "^/404$").includes(:parts, :slugs).first).present?
+        # render the application's custom 404 page with layout and meta.
+        render :template => "/pages/show",
+               :format => 'html',
+               :status => 404
+      else
+        # fallback to the default 404.html page.
+        file = Rails.root.join('public', '404.html')
+        file = Refinery.root.join('vendor', 'refinerycms', 'core', 'public', '404.html') unless file.exist?
+        render :file => file.cleanpath.to_s,
+               :layout => false,
+               :status => 404
+      end
+    end
 
-  def home_page?
-    root_url(:only_path => true) == request.path
-  end
+    def from_dialog?
+      params[:dialog] == "true" or params[:modal] == "true"
+    end
 
-  def just_installed?
-    Role[:refinery].users.empty?
-  end
+    def home_page?
+      root_url(:only_path => true) == request.path
+    end
 
-  def local_request?
-    Rails.env.development? or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
-  end
+    def just_installed?
+      Role[:refinery].users.empty?
+    end
 
-  def login?
-    (controller_name =~ /^(user|session)(|s)/ and not admin?) or just_installed?
-  end
+    def local_request?
+      Rails.env.development? or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
+    end
 
-protected
+    def login?
+      (controller_name =~ /^(user|session)(|s)/ and not admin?) or just_installed?
+    end
 
-  # get all the pages to be displayed in the site menu.
-  def find_pages_for_menu
-    @menu_pages = Page.top_level
-  end
+  protected
 
-  # use a different model for the meta information.
-  def present(model)
-    presenter = (Object.const_get("#{model.class}Presenter") rescue ::Refinery::BasePresenter)
-    @meta = presenter.new(model)
-  end
+    # get all the pages to be displayed in the site menu.
+    def find_pages_for_menu
+      @menu_pages = Page.top_level
+    end
 
-  # this hooks into the Rails render method.
-  def render(action = nil, options = {}, &blk)
-    present(@page) unless admin? or @meta.present?
-    super
-  end
+    # use a different model for the meta information.
+    def present(model)
+      presenter = (Object.const_get("#{model.class}Presenter") rescue ::Refinery::BasePresenter)
+      @meta = presenter.new(model)
+    end
 
-  def show_welcome_page?
-    render :template => "/welcome", :layout => "login" if just_installed? and controller_name != "users"
-  end
+    # this hooks into the Rails render method.
+    def render(action = nil, options = {}, &blk)
+      present(@page) unless admin? or @meta.present?
+      super
+    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
+    def show_welcome_page?
+      render :template => "/welcome", :layout => "login" if just_installed? and controller_name != "users"
     end
-  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
+  end
 end

data/vendor/refinerycms/core/lib/refinery/application_helper.rb

@@ -1,195 +1,15 @@
 # Methods added to this helper will be available to all templates in the application.
+Dir[File.expand_path('../helpers/*.rb', __FILE__).to_s].each {|helper| require helper}
+
 module Refinery
   module ApplicationHelper
-    include Refinery::HtmlTruncationHelper
-
-    def t(key, options = {})
-      if (val = super) =~ /class.+?translation_missing/
-        val = val.to_s.gsub(/<span[^>]*>/, 'i18n: ').gsub('</span>', '').gsub(', ', '.')
-      end
-
-      val
-    end
-
-    # This is used to display the title of the current object (normally a page) in the browser's titlebar.
-    #
-    def browser_title(yield_title=nil)
-      [
-        yield_title.present? ? yield_title : nil,
-        @meta.browser_title.present? ? @meta.browser_title : @meta.path,
-        RefinerySetting.find_or_set(:site_name, "Company Name")
-      ].compact.join(" - ")
-    end
-
-    # replace all system images with a thumbnail version of them (handy for all images inside a page part)
-    # for example, <%= content_fu(@page[:body], :preview) %> converts all /system/images to their 'preview' thumbnail
-    def content_fu(content, thumbnail)
-      raise NotImplementedError # todo: implement for new syntax.
-
-      content.scan(/\/system\/images([^\"\ ]*)/).flatten.each do |match|
-        parts = match.split(".")
-        extension = parts.pop
-        content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
-      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, sibling_count = nil)
-      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)
-      page.descendants.any? {|descendant| selected_page?(descendant) }
-    end
-
-    # image_fu is a helper for inserting an image that has been uploaded into a template.
-    # Say for example that we had a @model.image (@model having a belongs_to :image relationship)
-    # and we wanted to display a thumbnail cropped to 200x200 then we can use image_fu like this:
-    # <%= image_fu @model.image, '200x200' %> or with no thumbnail: <%= image_fu @model.image %>
-    def image_fu(image, geometry = nil, options={})
-      if image.present?
-        # 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((thumbnail = image.thumbnail(geometry)).url, {
-          :alt => image.respond_to?(:title) ? image.title : image.image_name,
-          :width => thumbnail.width,
-          :height => thumbnail.height
-        }.merge(options))
-      end
-    end
-
-    # This function helps when including both the jquery and jqueryui libraries.
-    # 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(options={})
-      # Merge in options
-      options = {
-        :caching => RefinerySetting.find_or_set(:use_resource_caching, Rails.root.writable?),
-        :google => RefinerySetting.find_or_set(:use_google_ajax_libraries, false),
-        :jquery_ui => true
-      }.merge(options)
-
-      # render the tags normally unless
-      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');" if options[:jquery_ui]}
-        </script>".html_safe
-      end
-    end
-
-    # you can override the object used for the title by supplying options[:object]
-    # this object must support custom_title_type if you want custom titles.
-    def page_title(options = {})
-      object = options.fetch(:object, @meta)
-      options.delete(:object)
-      options = RefinerySetting.find_or_set(:page_title, {
-        :chain_page_title => false,
-        :ancestors => {
-          :separator => " | ",
-          :class => 'ancestors',
-          :tag => 'span'
-        },
-        :page_title => {
-          :class => nil,
-          :tag => nil,
-          :wrap_if_not_chained => false
-        }
-      }).merge(options)
-
-      title = []
-      objects = (options[:chain_page_title] and object.respond_to?(:ancestors)) ? [object.ancestors, object] : [object]
-
-      objects.flatten.compact.each do |obj|
-        if obj.respond_to?(:custom_title_type)
-          title << case obj.custom_title_type
-            when "text"
-              obj.custom_title
-            when "image"
-              image_fu(obj.custom_title_image, nil, {:alt => obj.title}) rescue obj.title
-            else
-              obj.title
-            end
-        else
-          title << obj.title
-        end
-      end
-
-      final_title = title.pop
-      if (options[:page_title][:wrap_if_not_chained] and title.empty?) and options[:page_title][:tag].present?
-        css = options[:page_title][:class].present? ? " class='#{options[:page_title][:class]}'" : nil
-        final_title = "<#{options[:page_title][:tag]}#{css}>#{final_title}</#{options[:page_title][:tag]}>"
-      end
-
-      if title.empty?
-        return final_title.to_s.html_safe
-      else
-        return "<#{options[:ancestors][:tag]} class='#{options[:ancestors][:class]}'>#{title.join options[:ancestors][:separator]}#{options[:ancestors][:separator]}</#{options[:ancestors][:tag]}>#{final_title}".html_safe
-      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}'>(#{t('shared.admin.help')})</span>".html_safe
-    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 = {})
-      image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge(options)
-    end
-
-    # 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
-      if defined?(::Refinery::I18n) and ::Refinery::I18n.enabled?
-        path = path.split("/#{::I18n.locale}").last
-      end
-
-      current_page?(page) or
-        (path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
-        (path == page.link_url) or
-        (path == page.nested_path)
-    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.fullpath.to_s == '/') ? admin_root_url(:only_path => true) : "/admin#{request.request_uri}/edit"
-                 end rescue admin_root_url(:only_path => true))
-      end
-    end
-
+    include Refinery::Helpers::HtmlTruncationHelper
+    include Refinery::Helpers::ImageHelper
+    include Refinery::Helpers::MenuHelper
+    include Refinery::Helpers::MetaHelper
+    include Refinery::Helpers::ScriptHelper
+    include Refinery::Helpers::SiteBarHelper
+    include Refinery::Helpers::TagHelper
+    include Refinery::Helpers::TranslationHelper
   end
 end