refinerycms-pages 2.0.10 → 2.1.0

data/app/models/refinery/page_part.rb

@@ -4,7 +4,7 @@ module Refinery
     attr_accessible :title, :content, :position, :body, :refinery_page_id
     belongs_to :page, :foreign_key => :refinery_page_id
 
-    validates :title, :presence => true
+    validates :title, :presence => true, :uniqueness => {:scope => :refinery_page_id}
     alias_attribute :content, :body
 
     translates :body if respond_to?(:translates)

data/{lib → app/presenters}/refinery/pages/content_page_presenter.rb

@@ -7,7 +7,7 @@ module Refinery
     class ContentPagePresenter < ContentPresenter
       def initialize(page, page_title)
         super()
-        add_default_title_section(page_title) if page_title.present?
+        add_default_title_section(page_title) if page_title.present? && Pages.show_title_in_body
         add_page_parts(page.parts) if page
         add_default_post_page_sections
       end
@@ -21,10 +21,6 @@ module Refinery
       def add_default_post_page_sections
         add_section_if_missing(:id => :body)
         add_section_if_missing(:id => :side_body)
-
-        # Deprecated in 2.1
-        add_section_if_missing(:id => :body_content_left)
-        add_section_if_missing(:id => :body_content_right)
       end
 
       def add_page_parts(parts)

data/{lib → app/presenters}/refinery/pages/content_presenter.rb

@@ -47,21 +47,7 @@ module Refinery
     private
 
       def sections_html(can_use_fallback)
-        @sections.map do |section|
-          # Remove in 2.1
-          check_deprecated_sections(section)
-          section.wrapped_html(can_use_fallback)
-        end.compact.join("\n").html_safe
-      end
-
-      def check_deprecated_sections(section)
-        if section.has_content?
-          if section.id == :body_content_left
-            Refinery.deprecate "content_for :body_content_left", :when => '2.1.0', :replacement => "content_for :body"
-          elsif section.id == :body_content_right
-            Refinery.deprecate "content_for :body_content_right", :when => '2.1.0', :replacement => "content_for :side_body"
-          end
-        end
+        @sections.map { |section| section.wrapped_html(can_use_fallback) }.compact.join("\n").html_safe
       end
 
       def add_section_if_missing(options)

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

@@ -0,0 +1,118 @@
+require 'active_support/core_ext/string'
+require 'active_support/configurable'
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/url_helper'
+
+module Refinery
+  module Pages
+    class MenuPresenter
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::UrlHelper
+      include ActiveSupport::Configurable
+
+      config_accessor :roots, :menu_tag, :list_tag, :list_item_tag, :css, :dom_id,
+                      :max_depth, :selected_css, :first_css, :last_css
+      self.dom_id = 'menu'
+      self.css = 'menu clearfix'
+      self.menu_tag = :nav
+      self.list_tag = :ul
+      self.list_item_tag = :li
+      self.selected_css = :selected
+      self.first_css = :first
+      self.last_css = :last
+      def roots
+        config.roots.presence || collection.roots
+      end
+
+      attr_accessor :context, :collection
+      delegate :output_buffer, :output_buffer=, :to => :context
+
+      def initialize(collection, context)
+        @collection = collection
+        @context = context
+      end
+
+      def to_html
+        render_menu(roots) if roots.present?
+      end
+
+      private
+      def render_menu(items)
+        content_tag(menu_tag, :id => dom_id, :class => css) do
+          render_menu_items(items)
+        end
+      end
+
+      def render_menu_items(menu_items)
+        if menu_items.present?
+          content_tag(list_tag) do
+            menu_items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
+              buffer << render_menu_item(item, index)
+            end
+          end
+        end
+      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_items(menu_item_children(menu_item))
+          buffer
+        end
+      end
+
+      # Determines whether any item underneath the supplied item is the current item according to rails.
+      # Just calls selected_item? for each descendant of the supplied item
+      # unless it first quickly determines that there are no descendants.
+      def descendant_item_selected?(item)
+        item.has_children? && item.descendants.any?(&method(:selected_item?))
+      end
+
+      def selected_item_or_descendant_item_selected?(item)
+        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
+
+        # 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)
+
+        # 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)}
+
+        # Now use all possible vectors to try to find a valid match
+        [path, URI.decode(path)].include?(url) || path == "/#{item.original_id}"
+      end
+
+      def menu_item_css(menu_item, index)
+        css = []
+
+        css << selected_css if selected_item_or_descendant_item_selected?(menu_item)
+        css << first_css if index == 0
+        css << last_css if index == menu_item.shown_siblings.length
+
+        css.reject(&:blank?).presence
+      end
+
+      def menu_item_children(menu_item)
+        within_max_depth?(menu_item) ? menu_item.children : []
+      end
+
+      def within_max_depth?(menu_item)
+        !max_depth || menu_item.depth < max_depth
+      end
+
+    end
+  end
+end

data/app/sweepers/refinery/pages/page_sweeper.rb

@@ -0,0 +1,29 @@
+module Refinery
+  module Pages
+    class PageSweeper < ActionController::Caching::Sweeper
+      observe Page
+
+      def after_save(page)
+        expire_cache!
+      end
+
+      def after_destroy(page)
+        expire_cache!
+      end
+
+      protected
+      def cache_directory
+        page_cache_directory
+      end
+
+      def caching
+        @caching ||= Caching.new(cache_directory)
+      end
+
+      def expire_cache!
+        caching.expire!
+      end
+
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
-<%= form_for [refinery, :admin, @page], :url => (refinery.admin_page_path(@page.nested_url) if @page.persisted?) do |f| %>
+<%= form_for [refinery, :admin, @page],
+             :url => (refinery.admin_page_path(@page.nested_url) if @page.persisted?) do |f| %>
 
   <%= render '/refinery/admin/error_messages', :object => @page, :include_object_name => true %>
 
-  <%= render 'locale_picker', :current_locale => Globalize.locale if Refinery.i18n_enabled? %>
+  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale %>
 
   <div class="field">
     <%= f.label :title %>
@@ -36,7 +37,6 @@
 
 <% content_for :javascripts do %>
   <script>
-    var refinery_page_preview_url = '<%= @page.persisted? ? refinery.preview_page_path(@page.uncached_nested_url) : refinery.preview_pages_path %>';
     $(document).ready(function(){
       page_options.init(
         <%= Refinery::Pages.new_page_parts.to_s %>
@@ -49,7 +49,7 @@
         var prev_url = form.attr('action');
         var prev_target = form.attr('target');
         form.attr({
-          'action': refinery_page_preview_url
+          'action': '<%= @page.persisted? ? refinery.pages_admin_preview_page_path(@page.nested_url) : refinery.pages_admin_preview_pages_path %>'
           , 'target': '_blank'
         });
         form.submit();

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

@@ -1,16 +1,6 @@
-<div id='more_options_field'>
-  <p>
-    <%= link_to t('.advanced_options'), "#",
-                :id => 'toggle_advanced_options',
-                :title => t('.toggle_advanced_options') %>
-  </p>
-  <span id='draft_field'>
-    <%= f.check_box :draft %>
-    <%= f.label :draft, t('.save_as_draft'),
-                :class => "stripped" %>
-  </span>
-</div>
-<div id='more_options' style="display:none;">
+<%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
+
+<div id="more_options" style="display:none;">
   <div class="hemisquare">
     <h2><%= t('.page_options') %></h2>
     <div class='field'>
@@ -30,7 +20,6 @@
                    template_options(:layout_template, @page) %>
     </div>
     <% end %>
-    <% if Refinery::Pages.use_view_templates %>
     <div class='field'>
       <span class='label_with_help'>
         <%= f.label :view_template, t('.view_template') %>
@@ -39,7 +28,6 @@
       <%= f.select :view_template, @valid_view_templates.map { |t| [t.titleize, t] },
                    template_options(:view_template, @page) %>
     </div>
-    <% end %>
 
     <div class='field'>
       <span class='label_with_help'>
@@ -75,9 +63,6 @@
       <% content_for :javascripts do %>
       <script>
         $(document).ready(function(){
-          link_tester.init('<%= refinery.test_url_admin_pages_dialogs_path %>',
-                           '<%= refinery.test_email_admin_pages_dialogs_path %>');
-
           link_tester.validate_url_textbox("#page_link_url")
         });
       </script>

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

@@ -30,7 +30,7 @@
         <%= link_to part.title, "##{@page.persisted? ? part.to_param : "page_part_new_#{part_index}"}" %>
       </li>
     <% end %>
-    <% ::Refinery::Pages.tabs.each_with_index do |tab, tab_index| %>
+    <% ::Refinery::Pages.tabs_for_template(@page.view_template).each_with_index do |tab, tab_index| %>
       <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
         <%= link_to tab.name.titleize, "#custom_tab_#{tab_index}" %>
       </li>
@@ -45,7 +45,7 @@
                  :part_index => (part_index += 1),
                  :new_part => @page.new_record? -%>
     <% end %>
-    <% ::Refinery::Pages.tabs.each_with_index do |tab, tab_index| %>
+    <% ::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 %>
       </div>

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

@@ -10,12 +10,12 @@
       <%= page_title_with_translations page %>
       <%= page_meta_information page %>
     </span>
-    <% if Refinery.i18n_enabled? && Refinery::I18n.frontend_locales.many? %>
+    <% 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' %>
+                      :class => 'locale' if translation.title.present? %>
         <% end %>
       </span>
     <% end %>
@@ -30,11 +30,11 @@
                   :title => t('new', :scope => 'refinery.admin.pages') %>
 
       <%= link_to refinery_icon_tag('application_edit.png'),
-                  refinery.edit_admin_page_path(page.uncached_nested_url, :switch_locale => (page.translations.first.locale unless page.translated_to_default_locale?)),
+                  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.uncached_nested_url),
+                  refinery.admin_page_path(page.nested_url),
                   :class => "cancel confirm-delete",
                   :title => t('delete', :scope => 'refinery.admin.pages'),
                   :data => {
@@ -46,7 +46,7 @@
                   :method => :delete if page.deletable? %>
     </span>
   </div>
-  <ul class='nested' data-ajax-content="<%= refinery.admin_children_pages_path(page.uncached_nested_url) %>">
+  <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 %>
   </ul>
 </li>

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

@@ -1,6 +1,4 @@
-<% if searching? %>
-  <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
-<% end %>
+<%= render 'refinery/admin/search_header', :url => refinery.admin_pages_path %>
 <% if @pages.any? %>
   <%= render 'sortable_list' %>
 <% else %>

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

@@ -1,4 +1,4 @@
 <ul id='sortable_list'>
-  <%= render :partial => 'page', :collection => @pages.select{|p| p.parent_id.nil?}  %>
+  <%= render :partial => 'page', :collection => @pages.roots  %>
 </ul>
 <%= render '/refinery/admin/sortable_list', :continue_reordering => !!local_assigns[:continue_reordering] %>

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

@@ -6,4 +6,4 @@
 <section id='actions'>
   <%= render 'actions' %>
 </section>
-<%= render '/refinery/admin/make_sortable', :tree => true if @pages.many? -%>
+<%= render '/refinery/admin/make_sortable', :tree => true, :replace_contents_after_update => true if @pages.many? -%>

data/app/views/refinery/admin/pages_dialogs/link_to.html.erb

@@ -119,8 +119,6 @@
 <% content_for :javascripts do %>
   <script>
     $(document).ready(function(){
-      link_tester.init('<%= refinery.test_url_admin_pages_dialogs_path %>',
-                       '<%= refinery.test_email_admin_pages_dialogs_path %>');
       link_dialog.init();
 
       $('.link_list a').click(function(e){

data/config/locales/bg.yml

@@ -45,16 +45,13 @@ bg:
           create_content_section: Добавяне на секция за съдържание
           delete_content_section: Изтриване на секция за съдържание
         form_advanced_options:
-          toggle_advanced_options: Достъп до настройките за етикета "meta" и менюто
           page_options: Настройки на страница
           parent_page: Родителска страница
-          advanced_options: Разширени настройки
           menu_title: Заглавие в менюто
           custom_slug: Кратко заглавие по избор
           show_in_menu_title: Показване в менюто
           show_in_menu_description: Показване на тази страница в менюто на сайта
           show_in_menu_help: Махнете отметката от това поле, ако искате страницата да не се показва в менюто на сайта. Това е удобно, ако искате дадена страница да бъде достъпвана директно без да бъде показвана в менюто.
-          save_as_draft: Запис като чернова
           skip_to_first_child: Пропускане на страницата като родителска
           skip_to_first_child_label: Пренасочване на посетителите към първата страница от по-ниско ниво.
           skip_to_first_child_help: Тази настройка предоставя възможност страницата да бъде свързана с друга, намираща се под нея. Това е полезно при групиране на страници.
@@ -63,14 +60,6 @@ bg:
           parent_page_help: Можете да поставите страница под друга като я изберете от списъка. Ако искате тази страница да бъде на най-горно ниво, оставете полето празно.
           menu_title_help: Ако искате в менюто да се показва различно заглавие на страницата, въведете го тук.
           custom_slug_help: Краткото заглавие (slug) представлява лесно четим идентификатор, който се използва при създаването на уеб адреса на страницата. Например 'за-нас'. За да замените краткото заглавие, което автоматично се генерира от Refinery, въведете Вашето тук.
-        form_advanced_options_seo:
-          seo: Оптимизация за търсачки
-          seo_override_title: Заглавие в браузъра
-          seo_override_title_help: Въведете заглавие от 5 до 10 символа, което да синтезира съдържанието на тази страница.
-          meta_keywords_title: Ключови думи за етиката "meta"
-          meta_keywords_help: Въведете от 5 до 10 ключови думи, които описват тази страница, разделени със запетая.
-          meta_description_title: Описание за етикета "meta"
-          meta_description_help: Въведете няколко кратки изречения, които да описват тази страница.
         actions:
           create_new_page: Добавяне на нова страница
           reorder_pages: Пренареждане на страниците

data/config/locales/cs.yml

@@ -34,6 +34,7 @@ cs:
       pages:
         delete: Smazat tuto stránku
         edit: Upravit tuto stránku
+        new: Přidat podstránku
         page:
           view_live_html: Zobrazit tuto stránku <br/><em>(otevře se v novém okně)</em>
           hidden: skrytá
@@ -44,15 +45,12 @@ cs:
           create_content_section: Přidat sekci
           delete_content_section: Smazat sekci
         form_advanced_options:
-          toggle_advanced_options: Zpřístupní nastavení menu a meta tagů
           page_options: Nastavení stránky
           parent_page: Nadřazená stránka
-          advanced_options: Rozšířené nastavení
           custom_title: Titulek
           show_in_menu_title: Zobrazit v menu
           show_in_menu_description: Zobrazit tuto stránku v menu webu
           show_in_menu_help: Odškrtněte pokud chcete odstranit odkaz na tuto stránku z menu webu.
-          save_as_draft: Uložit jako pracovní verzi
           skip_to_first_child: Přeskočit na první dceřinou stránku
           skip_to_first_child_label: Přesměruje návštěvníka na první dceřinou stránku.
           skip_to_first_child_help: Tato stránka se nezobrazí, místo toho bude odkaz na ní přesměrován na její první dceřinou stránku. To se může hodit pro seskupování stránek.

data/config/locales/da.yml

@@ -34,38 +34,48 @@ da:
       pages:
         delete: Slet siden permanent
         edit: Redigér siden
+        new: Tilføj en ny underside
+        expand_collapse: Udvid eller sammenfold undersider
         page:
           view_live_html: Vis siden live <br/><em>(åbner i et nyt vindue)</em>
           hidden: skjult
           draft: kladde
+        form:
+          preview: Preview
+          preview_changes: Se dine ændringer før du udgiver dem
         form_new_page_parts:
           title: Titel
         form_page_parts:
           create_content_section: Tilføj indholdselement
           delete_content_section: Slet indholdselement
+          reorder_content_section: Redigér rækkefølgen af indholdselement
         form_advanced_options:
-          toggle_advanced_options: Tilgå meta tags og menuindstillinger
           page_options: Side indstillinger
           parent_page: Overordnet side
-          advanced_options: Avancerede indstillinger
-          custom_title: Brugerdefineret titel
+          menu_title: Menutitel
+          custom_slug: Brugerdefineret slug
           show_in_menu_title: Vis i menuen
           show_in_menu_description: Vis siden i menuen på sitet
           show_in_menu_help: Afkryds ikke, hvis du vil fjerne siden fra menuen på sitet. Dette kan benyttes, hvis du vil have en side, du kan linke til direkte, men som ikke skal vises i menuen.
-          save_as_draft: Gem som kladde
           skip_to_first_child: Spring øverste sideniveau over
           skip_to_first_child_label: Videresend besøgende til den første underliggende side.
           skip_to_first_child_help: Dette vil vise den første underliggende side i stedet for denne side. Kan benyttes når man vil gruppere sider.
           link_url: Videresend besøgende til andet website eller anden side
           link_url_help: Hvis du vil have denne side går til et andet website eller en anden side, når besøgende klikker på den i menuen, skal du indtaste URLen, fx http://google.com
           parent_page_help: Du kan placere siden under en anden side ved at vælge den i listen. Hvis siden skal ligge på øverste niveau skal du ikke vælge noget.
-          custom_title_help: Hvis siden skal have en anden titel end i menuen, så vælg &apos;Tekst&apos; og indtast titlen her.
+          menu_title_help: Hvis siden skal have en anden titel i menuen, så vælg &apos;Tekst&apos; og indtast titlen her.
+          custom_slug_help: En slug er et letlæseligt id, som bruges til at lave en sides fulde internetadresse (URL), fx &apos;om-os&apos. For at overskrive den slug der automatisk bliver oprettet af Refinery, kan du skrive din brugerdefinerede slug her.
+          layout_template: Layout template
+          layout_template_help: You can choose a different layout template for this page
+          view_template: View template
+          view_template_help: You can choose a different view template for this page
         actions:
           create_new_page: Tilføj en ny side
           reorder_pages: Redigér rækkefølgen af siderne
           reorder_pages_done: Gem rækkefølgen
         records:
           no_pages_yet: Der er ingen sider endnu. Klik på "Tilføj en ny side" for at oprette den første."
+          translator_access: Du har ikke tilstrækkelige rettigheder til at ændre siden på det valgte sprog.
   activerecord:
     models:
       refinery/page: side