refinerycms-pages 2.1.5 → 3.0.0

data/app/models/refinery/page_part.rb

@@ -1,16 +1,18 @@
 module Refinery
   class PagePart < Refinery::Core::BaseModel
 
-    attr_accessible :title, :content, :position, :body, :refinery_page_id
     belongs_to :page, :foreign_key => :refinery_page_id
 
-    validates :title, :presence => true, :uniqueness => {:scope => :refinery_page_id}
+    before_validation :set_default_slug
+
+    validates :title, :presence => true
+    validates :slug, :presence => true, :uniqueness => {:scope => :refinery_page_id}
     alias_attribute :content, :body
 
-    translates :body if respond_to?(:translates)
+    translates :body
 
     def to_param
-      "page_part_#{title.downcase.gsub(/\W/, '_')}"
+      "page_part_#{slug.downcase.gsub(/\W/, '_')}"
     end
 
     def body=(value)
@@ -19,14 +21,37 @@ module Refinery
       normalise_text_fields
     end
 
-    self.translation_class.send :attr_accessible, :locale if self.respond_to?(:translation_class)
+    def slug_matches?(other_slug)
+      slug.present? && (# protecting against the problem that occurs when have two nil slugs
+        slug == other_slug.to_s ||
+        parameterized_slug == parameterize(other_slug.to_s)
+      )
+    end
+
+    def title_matches?(other_title)
+      Refinery.deprecate("Refinery::PagePart#title_matches?", when: "3.1", replacement: "slug_matches?")
+      slug_matches?(other_title.to_s.parameterize.underscore)
+    end
+
+    protected
 
-  protected
     def normalise_text_fields
-      if body.present? && body !~ %r{^<}
+      if body? && body !~ %r{^<}
         self.body = "<p>#{body.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>"
       end
     end
 
+    private
+    def parameterize(string)
+      string.downcase.gsub(" ", "_")
+    end
+
+    def parameterized_slug
+      parameterize(slug)
+    end
+
+    def set_default_slug
+      self.slug = title.to_s.parameterize.underscore.presence if self.slug.blank?
+    end
   end
 end

data/app/presenters/refinery/pages/content_presenter.rb

@@ -12,16 +12,17 @@ module Refinery
       end
 
       def blank_section_css_classes(can_use_fallback = true)
-        @sections.reject {|section| section.has_content?(can_use_fallback)}.map(&:not_present_css_class)
+        @sections.reject { |section| section.has_content?(can_use_fallback)}
+                 .map(&:not_present_css_class)
       end
 
       def hide_sections(*ids_to_hide)
         ids_to_hide.flatten!
-        @sections.select {|section| ids_to_hide.include?(section.id)}.each(&:hide) if ids_to_hide.any?
+        @sections.select { |section| ids_to_hide.include?(section.id)}.each(&:hide) if ids_to_hide.any?
       end
 
       def hidden_sections
-        @sections.select {|section| section.hidden? }
+        @sections.select(&:hidden?)
       end
 
       def fetch_template_overrides
@@ -47,7 +48,8 @@ module Refinery
     private
 
       def sections_html(can_use_fallback)
-        @sections.map { |section| section.wrapped_html(can_use_fallback) }.compact.join("\n").html_safe
+        @sections.map { |section| section.wrapped_html(can_use_fallback) }
+                 .compact.join("\n").html_safe
       end
 
       def add_section_if_missing(options)
@@ -55,7 +57,7 @@ module Refinery
       end
 
       def has_section?(id)
-        @sections.detect {|section| section.id == id}
+        @sections.detect { |section| section.id == id}
       end
     end
   end

data/app/presenters/refinery/pages/menu_presenter.rb

@@ -11,15 +11,19 @@ module Refinery
       include ActiveSupport::Configurable
 
       config_accessor :roots, :menu_tag, :list_tag, :list_item_tag, :css, :dom_id,
-                      :max_depth, :selected_css, :first_css, :last_css
+                      :max_depth, :active_css, :selected_css, :first_css, :last_css, :list_tag_css,
+                      :link_tag_css
       self.dom_id = 'menu'
       self.css = 'menu clearfix'
       self.menu_tag = :nav
       self.list_tag = :ul
       self.list_item_tag = :li
+      self.active_css = :active
       self.selected_css = :selected
       self.first_css = :first
       self.last_css = :last
+      self.list_tag_css = 'nav'
+
       def roots
         config.roots.presence || collection.roots
       end
@@ -45,7 +49,7 @@ module Refinery
 
       def render_menu_items(menu_items)
         if menu_items.present?
-          content_tag(list_tag) do
+          content_tag(list_tag, :class => list_tag_css) do
             menu_items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
               buffer << render_menu_item(item, index)
             end
@@ -53,10 +57,14 @@ module Refinery
         end
       end
 
+      def render_menu_item_link(menu_item)
+        link_to(menu_item.title, context.refinery.url_for(menu_item.url), :class => link_tag_css)
+      end
+
       def render_menu_item(menu_item, index)
         content_tag(list_item_tag, :class => menu_item_css(menu_item, index)) do
           buffer = ActiveSupport::SafeBuffer.new
-          buffer << link_to(menu_item.title, context.refinery.url_for(menu_item.url))
+          buffer << render_menu_item_link(menu_item)
           buffer << render_menu_items(menu_item_children(menu_item))
           buffer
         end
@@ -70,26 +78,20 @@ module Refinery
       end
 
       def selected_item_or_descendant_item_selected?(item)
+        Refinery.deprecate('Refinery::Pages::MenuPresenter#selected_item_or_descendant_item_selected?', when: '3.1')
         selected_item?(item) || descendant_item_selected?(item)
       end
 
       # Determine whether the supplied item is the currently open item according to Refinery.
       def selected_item?(item)
-        path = context.request.path
-        path = path.force_encoding('utf-8') if path.respond_to?(:force_encoding)
-
         # Ensure we match the path without the locale, if present.
-        if %r{^/#{::I18n.locale}/} === path
-          path = path.split(%r{^/#{::I18n.locale}}).last.presence || "/"
-        end
+        path = match_locale_for(encoded_path)
 
         # First try to match against a "menu match" value, if available.
-        return true if item.try(:menu_match).present? && path =~ Regexp.new(item.menu_match)
+        return true if menu_match_is_available?(item, path)
 
         # Find the first url that is a string.
-        url = [item.url]
-        url << ['', item.url[:path]].compact.flatten.join('/') if item.url.respond_to?(:keys)
-        url = url.last.match(%r{^/#{::I18n.locale.to_s}(/.*)}) ? $1 : url.detect{|u| u.is_a?(String)}
+        url = find_url_for(item)
 
         # Now use all possible vectors to try to find a valid match
         [path, URI.decode(path)].include?(url) || path == "/#{item.original_id}"
@@ -98,7 +100,8 @@ module Refinery
       def menu_item_css(menu_item, index)
         css = []
 
-        css << selected_css if selected_item_or_descendant_item_selected?(menu_item)
+        css << active_css if descendant_item_selected?(menu_item)
+        css << selected_css if selected_item?(menu_item)
         css << first_css if index == 0
         css << last_css if index == menu_item.shown_siblings.length
 
@@ -113,6 +116,29 @@ module Refinery
         !max_depth || menu_item.depth < max_depth
       end
 
+      def encoded_path
+        path = context.request.path
+        path.force_encoding('utf-8') if path.respond_to?(:force_encoding)
+        path
+      end
+
+      def match_locale_for(path)
+        if %r{^/#{::I18n.locale}/} === path
+          path.split(%r{^/#{::I18n.locale}}).last.presence || "/"
+        else
+          path
+        end
+      end
+
+      def menu_match_is_available?(item, path)
+        item.try(:menu_match).present? && path =~ Regexp.new(item.menu_match)
+      end
+
+      def find_url_for(item)
+        url = [item.url]
+        url << ['', item.url[:path]].compact.flatten.join('/') if item.url.respond_to?(:keys)
+        url.last.match(%r{^/#{::I18n.locale.to_s}(/.*)}) ? $1 : url.detect{ |u| u.is_a?(String) }
+      end
     end
   end
-end
+end

data/app/presenters/refinery/pages/page_part_section_presenter.rb

@@ -6,13 +6,7 @@ module Refinery
       def initialize(page_part)
         super()
         self.fallback_html = page_part.body.html_safe if page_part.body
-        self.id = convert_title_to_id(page_part.title) if page_part.title
-      end
-
-    private
-
-      def convert_title_to_id(title)
-        title.to_s.gsub(/\ /, '').underscore.to_sym
+        self.id = page_part.slug.to_sym if page_part.slug
       end
     end
   end

data/app/presenters/refinery/pages/section_presenter.rb

@@ -50,15 +50,11 @@ module Refinery
     protected
 
       def content_html(can_use_fallback)
-        if override_html.present?
-          override_html
-        else
-          html_from_fallback(can_use_fallback)
-        end
+        override_html.presence || html_from_fallback(can_use_fallback)
       end
 
       def html_from_fallback(can_use_fallback)
-        fallback_html if fallback_html.present? && can_use_fallback
+        fallback_html.presence if can_use_fallback
       end
 
     private

data/app/views/refinery/admin/pages/_actions.html.erb

@@ -1,21 +1,12 @@
 <ul>
+  <li><%= render '/refinery/admin/search', url: refinery.admin_pages_path -%></li>
   <li>
-    <%= render '/refinery/admin/search', :url => refinery.admin_pages_path %>
-  </li>
-  <li>
-    <%= link_to t('.create_new_page'), refinery.new_admin_page_path,
-                :class => "add_icon" %>
+    <%= action_label :add, refinery.new_admin_page_path, t('.create_new_page') %>
   </li>
 <% if @pages.many? and !searching? %>
   <li>
-    <%= link_to t('.reorder_pages'), refinery.admin_pages_path,
-                :id => "reorder_action",
-                :class => "reorder_icon" %>
-
-    <%= link_to t('.reorder_pages_done'), refinery.admin_pages_path,
-                :id => "reorder_action_done",
-                :style => "display: none;",
-                :class => "reorder_icon" %>
+    <%= action_label :reorder, refinery.admin_pages_path, t('.reorder_pages'), id: 'reorder_action'%>
+    <%= action_label :reorder_done, refinery.admin_pages_path, t('.reorder_pages_done'), id: 'reorder_action_done', class: 'hidden'%>
   </li>
 <% end %>
 </ul>

data/app/views/refinery/admin/pages/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for [refinery, :admin, @page],
-             :url => (refinery.admin_page_path(@page.nested_url) if @page.persisted?) do |f| %>
+             :url => (refinery.admin_update_page_path(@page.nested_url) if @page.persisted?) do |f| %>
 
   <%= render '/refinery/admin/error_messages', :object => @page, :include_object_name => true %>
 
@@ -45,18 +45,15 @@
       );
 
       $("#preview-button").click(function(e) {
-        var form = $(this).parents('form');
-        var prev_url = form.attr('action');
-        var prev_target = form.attr('target');
-        form.attr({
+        var $form = $(this).parents('form');
+        var prev_url = $form.attr('action');
+        var prev_target = $form.attr('target') || '';
+        $form.attr({
           'action': '<%= @page.persisted? ? refinery.pages_admin_preview_page_path(@page.nested_url) : refinery.pages_admin_preview_pages_path %>'
           , 'target': '_blank'
         });
-        form.submit();
-        form.attr({
-          'action': prev_url
-          , 'target': prev_target
-        });
+        $form.submit();
+        $form.attr({'action': prev_url, 'target': prev_target});
         e.preventDefault();
       });
     });

data/app/views/refinery/admin/pages/_form_advanced_options.html.erb

@@ -6,7 +6,7 @@
     <div class='field'>
       <span class='label_with_help'>
         <%= f.label :parent_id, t('.parent_page') %>
-        <%= refinery_help_tag t('.parent_page_help') %>
+        <%= refinery_help_tag t('.parent_page_help')%>
       </span>
       <%= f.select :parent_id, parent_id_nested_set_options(@page), :include_blank => true %>
     </div>
@@ -16,7 +16,7 @@
         <%= f.label :layout_template, t('.layout_template') %>
         <%= refinery_help_tag t('.layout_template_help') %>
       </span>
-      <%= f.select :layout_template, @valid_layout_templates,
+      <%= f.select :layout_template, valid_layout_templates,
                    template_options(:layout_template, @page) %>
     </div>
     <% end %>
@@ -25,7 +25,7 @@
         <%= f.label :view_template, t('.view_template') %>
         <%= refinery_help_tag t('.view_template_help') %>
       </span>
-      <%= f.select :view_template, @valid_view_templates.map { |t| [t.titleize, t] },
+      <%= f.select :view_template, valid_view_templates.map { |t| [t.titleize, t] },
                    template_options(:view_template, @page) %>
     </div>
 
@@ -78,6 +78,8 @@
       <%= f.label :show_in_menu, t('.show_in_menu_description'),
                   :class => "stripped" %>
     </div>
+
+    <%= render 'form_extra_fields_for_more_options', :f => f %>
   </div>
 
   <%= render 'form_advanced_options_seo', :f => f %>

data/app/views/refinery/admin/pages/_form_extra_fields_for_more_options.html.erb

@@ -0,0 +1 @@
+<%# Intentionally empty, useful override point to add extra fields. %>

data/app/views/refinery/admin/pages/_form_new_page_parts.html.erb

@@ -2,6 +2,10 @@
   <div class='field'>
     <label for='new_page_part_title'><%= t('.title')  %></label>
     <input id='new_page_part_title' value='' class='larger widest' />
+
+    <label for='new_page_part_slug'><%= t('.slug')  %></label>
+    <input id='new_page_part_slug' value='' class='larger widest' />
+
     <input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
   </div>
   <%= render '/refinery/admin/form_actions', :f => f,
@@ -10,3 +14,7 @@
              :cancel_button_id => "new_page_part_cancel",
              :hide_delete => true %>
 </div>
+
+<% content_for :after_javascript_libraries do %>
+  <%= javascript_include_tag 'speakingurl' %>
+<% end %>

data/app/views/refinery/admin/pages/_form_page_parts.html.erb

@@ -1,28 +1,17 @@
 <% if ::Refinery::Pages.new_page_parts %>
   <ul id="page_parts_controls">
-    <li>
-      <%= link_to refinery_icon_tag('arrow_switch.png'), '#',
-                  :id => 'reorder_page_part',
-                  :title => t('.reorder_content_section') %>
-      <%= link_to refinery_icon_tag('tick.png'), "",
-                  :id => 'reorder_page_part_done',
-                  :title => t('.reorder_content_section_done'),
-                  :style => "display: none;" %>
+     <li>
+      <%= action_icon(:reorder_h, '#', t('.reorder_content_section'), id: 'reorder_page_part' ) %>
+      <%= action_icon(:reorder_done, '#',  t('.reorder_content_section_done'), id: 'reorder_page_part_done')%>
     </li>
     <li>
-      <%= link_to refinery_icon_tag('add.png'), '#',
-                  :id => 'add_page_part',
-                  :title => t('.create_content_section') %>
-    </li>
+      <%= action_icon(:add, '#', t('.create_content_section'), id: 'add_page_part')%>
     <li>
-      <%= link_to refinery_icon_tag('delete.png'), '#',
-                  :title => t('.delete_content_section'),
-                  :class => 'delete_page_part',
-                  :name => t('.delete_content_section'),
-                  :id => 'delete_page_part' %>
+      <%= action_icon(:delete_section, '#', t('.delete_content_section'), id: 'delete_page_part', class: 'delete_page_part' )  %>
     </li>
   </ul>
 <% end %>
+
 <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
   <ul id='page_parts'>
     <% @page.parts.each_with_index do |part, part_index| %>
@@ -41,13 +30,13 @@
     <% part_index = -1 %>
     <%= f.fields_for :parts do |p| %>
       <%= render 'page_part_field',
-                 :part => p.object,
-                 :part_index => (part_index += 1),
-                 :new_part => @page.new_record? -%>
+                 part: p.object,
+                 part_index: (part_index += 1),
+                 new_part: @page.new_record? -%>
     <% end %>
     <% ::Refinery::Pages.tabs_for_template(@page.view_template).each_with_index do |tab, tab_index| %>
       <div class='page_part' id='<%= "custom_tab_#{tab_index}" %>'>
-        <%= render tab.partial, :f => f %>
+        <%= render tab.partial, f: f %>
       </div>
     <% end %>
   </div>

data/app/views/refinery/admin/pages/_page.html.erb

@@ -1,52 +1,52 @@
-<li class='clearfix record icons' id="<%= dom_id(page) -%>">
+<% # setup params for various action links
+  add_url =   refinery.new_admin_page_path(parent_id: page.id)
+  edit_url =  refinery.admin_edit_page_path(page.nested_url, switch_locale: (page.translations.first.locale unless page.translated_to_default_locale?))
+  delete_url = refinery.admin_delete_page_path(page.nested_url)
+  delete_options = {
+     class: "cancel confirm-delete",
+            data: {confirm: t('message',  scope: 'refinery.admin.delete', title: page_title_with_translations(page))}
+          }
+ %>
+
+  <li class='clearfix record items' id="<%= dom_id(page) -%>">
   <div class='clearfix'>
     <% if page.children.present? %>
-      <span class="icon toggle <%= 'expanded' if Refinery::Pages.auto_expand_admin_tree %>" title="<%= t('expand_collapse', :scope => 'refinery.admin.pages') %>"></span>
+      <span class="item icon toggle <%= 'expanded' if Refinery::Pages.auto_expand_admin_tree %>"
+        title="<%= t('expand_collapse', scope: 'refinery.admin.pages')%>">
+      </span>
     <% else %>
-      <span class="icon"></span>
+      <span class="item"></span>
     <% end %>
 
     <span class='title <%= 'toggle' if page.children.present? %>'>
       <%= page_title_with_translations page %>
       <%= page_meta_information page %>
     </span>
+
     <% if Refinery::I18n.frontend_locales.many? %>
       <span class='locales'>
-        <% page.translations.sort_by{|t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
-          <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-                      refinery.edit_admin_page_path(page.nested_url, :switch_locale => translation.locale),
-                      :class => 'locale' if translation.title.present? %>
+        <% page.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+          <% if translation.title.present? %>
+            <%= link_to refinery.admin_edit_page_path(page.nested_url, switch_locale: translation.locale),
+                        class: 'locale', title: translation.locale.upcase do %>
+
+              <div class="<%=translation.locale %> locale_marker">
+                <%= locale_text_icon(translation.locale.upcase) %>
+              </div>
+            <% end %>
+          <% end %>
         <% end %>
       </span>
     <% end %>
 
     <span class='actions'>
-      <%= link_to refinery_icon_tag('application_go.png'),
-                  page.url,
-                  :target => "_blank",
-                  :title => t('.view_live_html') %>
-      <%= link_to refinery_icon_tag('page_add.png'),
-                  refinery.new_admin_page_path(:parent_id => page.id),
-                  :title => t('new', :scope => 'refinery.admin.pages') %>
-
-      <%= link_to refinery_icon_tag('application_edit.png'),
-                  refinery.edit_admin_page_path(page.nested_url, :switch_locale => (page.translations.first.locale unless page.translated_to_default_locale?)),
-                  :title => t('edit', :scope => 'refinery.admin.pages') %>
-
-      <%= link_to refinery_icon_tag('delete.png'),
-                  refinery.admin_page_path(page.nested_url),
-                  :class => "cancel confirm-delete",
-                  :title => t('delete', :scope => 'refinery.admin.pages'),
-                  :data => {
-                    :confirm => t('message',
-                      :scope => 'refinery.admin.delete',
-                      :title => page_title_with_translations(page)
-                    )
-                  },
-                  :method => :delete if page.deletable? %>
+      <%= action_icon(:preview, page.url,   t('.view_live_html')) %>
+      <%= action_icon(:add,     add_url,    t('new',    scope: 'refinery.admin.pages' ) ) %>
+      <%= action_icon(:edit,    edit_url ,  t('edit',   scope: 'refinery.admin.pages' ) ) %>
+      <%= action_icon(:delete,  delete_url, t('delete', scope: 'refinery.admin.pages' ), delete_options ) if page.deletable? %>
     </span>
   </div>
   <ul class='nested' data-ajax-content="<%= refinery.admin_children_pages_path(page.nested_url) %>">
-    <%= render(:partial => 'page', :collection => page.children) if Refinery::Pages.auto_expand_admin_tree %>
+    <%= render(partial: 'page', collection: page.children) if Refinery::Pages.auto_expand_admin_tree %>
   </ul>
 </li>