refinerycms 0.9.7.11 → 0.9.7.13

data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb

@@ -13,7 +13,7 @@ class Admin::PagesController < Admin::BaseController
 
   def new
     @page = Page.new
-    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each_with_index do |page_part, index|
+    Page.default_parts.each_with_index do |page_part, index|
       @page.parts << PagePart.new(:title => page_part, :position => index)
     end
   end

data/vendor/plugins/pages/app/models/page.rb

@@ -15,7 +15,6 @@ class Page < ActiveRecord::Base
 
   before_destroy :deletable?
   after_save :reposition_parts!
-
   after_save :invalidate_child_cached_url
 
   # when a dialog pops up to link to a page, how many pages per page should there be
@@ -164,15 +163,27 @@ class Page < ActiveRecord::Base
     self.siblings.reject { |sibling| not sibling.in_menu? }
   end
 
-  # Returns all the top level pages, usually to render the top level navigation.
-  def self.top_level(include_children = false)
-    include_associations = [:parts]
-    include_associations.push(:slugs) if self.class.methods.include? "find_one_with_friendly"
-    include_associations.push(:children) if include_children
-    find_all_by_parent_id(nil,
-                          :conditions => {:show_in_menu => true, :draft => false},
-                          :order => "position ASC",
-                          :include => include_associations)
+  class << self
+    # Accessor to find out the default page parts created for each new page
+    def default_parts
+      RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"])
+    end
+
+    # Returns how many pages per page should there be when paginating pages
+    def per_page(dialog = false)
+      dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
+    end
+
+    # Returns all the top level pages, usually to render the top level navigation.
+    def top_level(include_children = false)
+      include_associations = [:parts]
+      include_associations.push(:slugs) if self.class.methods.include? "find_one_with_friendly"
+      include_associations.push(:children) if include_children
+      find_all_by_parent_id(nil,
+                            :conditions => {:show_in_menu => true, :draft => false},
+                            :order => "position ASC",
+                            :include => include_associations.presence)
+    end
   end
 
   # Accessor method to get a page part from a page.
@@ -186,7 +197,10 @@ class Page < ActiveRecord::Base
     # the way that we call page parts seems flawed, will probably revert to page.parts[:title] in a future release.
     if (super_value = super).blank?
       # self.parts is already eager loaded so we can now just grab the first element matching the title we specified.
-      part = self.parts.detect {|part| (part.title == part_title.to_s) || (part.title.downcase.gsub(" ", "_") == part_title.to_s.downcase.gsub(" ", "_")) }
+      part = self.parts.detect do |part|
+        part.title == part_title.to_s or
+        part.title.downcase.gsub(" ", "_") == part_title.to_s.downcase.gsub(" ", "_")
+      end
 
       return part.body unless part.nil?
     end
@@ -208,11 +222,6 @@ class Page < ActiveRecord::Base
     self.parts.collect {|p| p.body}.join(" ")
   end
 
-  # Returns how many pages per page should there be when paginating pages
-  def self.per_page(dialog = false)
-    dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
-  end
-
   ##
   # Protects generated slugs from title if they are in the list of reserved words
   # This applies mostly to plugin-generated pages.

data/vendor/plugins/pages/app/views/admin/pages/_page.html.erb

@@ -24,9 +24,10 @@
                   :title => t('.confirm_delete_page_title') if page.deletable? %>
     </span>
   </div>
-  <% if (children = page.children).any? -%>
-    <ul class='nested'>
-      <%= render :partial => 'page', :collection => children %>
-    </ul>
-  <% end -%>
+  <ul class='nested'>
+    <% if (children = page.children).any? -%>
+        <%= render :partial => 'page', :collection => children %>
+    <% end -%>
+  </ul>
+
 </li>

data/vendor/plugins/pages/config/locales/nl.yml

@@ -4,8 +4,20 @@ nl:
       title: "Pagina's"
   admin:
     pages:
+      page:
+        confirm_delete_page_title: Verwijder deze pagina
+        confirm_delete_page_message: "Weet je zeker dat je deze pagina wilt verwijderen '{{title}}'?"        
+        view_live: Bekijk deze pagina live <br/><em>(opent in een nieuw venster)</em>
+        edit_this_page: Bewerk deze pagina
+        hidden: verborgen
+        draft: ontwerp
+      form_new_page_parts:
+        title: Titel    
       form_advanced_options:
         title: Titel
+        toggle_advanced_options: Klik om meta tag eigenschappen en menu opties te tonen
+        parent_page: Bovenliggende pagina
+        parent_page_help: "Je kunt een pagina binnen een andere pagina plaatsen door het in de lijst te selecteren. Als je wilt dat dit de pagina geen bovenliggende pagina's heeft, laat dit veld dan leeg."
         create_content_section: Maak een nieuw content sectie aan
         delete_content_section: Verwijder een content sectie
         advanced_options: Uitgebreide opties
@@ -28,11 +40,21 @@ nl:
         save_as_draft: Sla op als concept
         save: Opslaan
         cancel: Annuleren
+        
+        skip_to_first_child: Sla top-level pagina over.
+        skip_to_first_child_label:  Stuur bezoekers door naar de eerste sub-level pagina.
+        skip_to_first_child_help: "Deze optie maakt van deze pagina een link naar de onderliggende pagina. Dit kan handig zijn voor het groeperen van pagina's."
+        link_url: Stuur deze pagina door naar een andere website of pagina.
+        link_url_help: "Als je wilt dat deze pagina doorlinkt naar een andere website of pagina als je er op klikt in de menu, voer dan een URL in. Bijvoorbeeld: http://google.com/"
+        custom_title_help: "Als je wilt dat de pagina een andere titel heeft dan de gene die vertoont wordt in de menu, selecteer dan &apos;Text&apos; en vul het in."
+        show_in_menu_help: "Deselecteer deze optie om de link naar de pagina van de menu te verwijderen. Dit kan handig zijn als je een pagina hebt die mensen niet direct via een link mogen tonen."
+        
       form_advanced_options_seo:
         seo: Zoekmachine optimalisatie
         seo_override_title: Browser titel
         seo_override_title_help: Als u de standaard titel van het browservenster wilt wijzigen, kunt u hier een alternatief invullen.
         meta_keywords_title: Meta zoekwoorden
+        meta_keywords_help: "Voer 5-10 keywords die gerelateerd zijn aan deze pagina. Scheidt deze keywords met comma's."
         meta_description_help: Voeg 5 tot 10 meta zoekwoorden toe. Gebruik een komma om de zoekwoorden te scheiden.
         meta_description_title: Meta omschrijving
         meta_description_help: Voer een compacte (twee a drie zinnen) pagina beschrijving in.
@@ -48,6 +70,34 @@ nl:
         reorder_pages_done: "Klaar met het wijzingen van de volgorde van de pagina's"
         sorry_no_results: Helaas! Er zijn geen resultaten gevonden.
         no_pages_yet: "Er zijn nog geen pagina's. Druk op 'Maak een nieuwe pagina' om de eerste aan te maken."
+    
+    pages_dialogs:
+      not_allowed: Je hebt geen rechten om deze functie te gebruiken.
+      page_link:
+        link_to_this_page: Link naar deze pagina
+      link_to:
+        your_page:
+          tab_name: Jouw pagina
+        web_address:
+          tab_name: Website
+          location: Locatie
+          new_window: Nieuw venster
+          new_window_label: Selecteer deze optie om de link in een nieuw venster te openen.
+          not_sure: Weet je niet zeker wat je in het bovenstaande veld kan invoeren?
+          step1: Zoek de pagina op het internet waar je naartoe wilt linken.
+          step2: "Kopieër het web adres uit het adres balk van je browser en plak het in het bovenstaande veld."
+        email_address:
+          tab_name: Email adres
+          subject_line_optional: Optioneel onderwerp
+          body_optional: Optioneel inhoud
+          not_sure: Niet zeker wat je in de bovenstaande velden moet invullen?
+          step1: "Schrijf of kopieër en plak (bijvoorbeeld uit je adresboek) het email adres in het bovenstaande '<strong>Email Adres</strong>' veld."
+          step2: "Gebruik het bovenstaande '<strong>Optioneel onderwerp</strong>' veld als je het bericht samengesteld wilt hebben met een <strong>voorgeschreven onderwerp regel</strong>."
+          step3: "Gebruik het bovenstaande '<strong>Optioneel inhoud</strong>' veld als je het bericht samengesteld wilt hebben met <strong>voorgeschreven inhoud</strong>."
+        your_resource:
+          tab_name: Jouw bestand
+          link_to_this_resource: Link naar dit bestand
+  
   activerecord:
     attributes:
       page:

data/vendor/plugins/pages/config/locales/ru.yml

@@ -0,0 +1,97 @@
+ru:
+  plugins:
+    refinery_pages:
+      title: Pages
+  admin:
+    pages_dialogs:
+      not_allowed: You do not have permission to access this feature.
+      page_link:
+        link_to_this_page: Link to this page
+      link_to:
+        your_page:
+          tab_name: Your page
+        web_address:
+          tab_name: Website
+          location: Location
+          new_window: New window
+          new_window_label: Check this box to have the link open in a new browser window.
+          not_sure: Not sure what to put in the box above?
+          step1: Find the page on the web you want to link to.
+          step2: "Copy the web address from your browser's address bar and paste it into the box above."
+        email_address:
+          tab_name: Email address
+          subject_line_optional: Optional subject
+          body_optional: Optional body
+          not_sure: Not sure what to put in the boxes above?
+          step1: "Write or copy and paste (e.g. from your address book) the email address to link to into the '<strong>Email Address</strong>' box above."
+          step2: "Use the '<strong>Subject Line</strong>' box above if you want the message to be composed with a <strong>pre-written subject line</strong>."
+          step3: "Use the <strong>Email Body</strong> box above if you want the message to be composed with a <strong>pre-written message</strong>."
+        your_resource:
+          tab_name: Your file
+          link_to_this_resource: Link to this file
+    pages:
+      page:
+        view_live: View this page live <br/><em>(opens in a new window)</em>
+        edit_this_page: Edit this page
+        confirm_delete_page_title: Delete this page
+        confirm_delete_page_message: "Are you sure you want to delete the page '{{title}}'?"
+        hidden: hidden
+        draft: draft
+      form_new_page_parts:
+        title: Title
+      form_advanced_options:
+        toggle_advanced_options: Click to access meta tag settings and menu options
+        parent_page: Parent page
+        title: Title
+        create_content_section: Create content section
+        delete_content_section: Delete content section
+        advanced_options: Advanced Options
+        explain_page_different_title: If you want the page to have a different title than the one that shows in the menu and browser title then enter it here.
+        parent_id_title: Parent
+        custom_title: Custom title
+        title_type: "Type:"
+        title_types:
+          none: None
+          text: Text
+          image: Image
+        custom_url: Custom URL
+        custom_url_explanation: "Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page. <br/> Note: This URL must point to a location that exists; a new one will not be created."
+        draft: Draft
+        show_in_menu_title: Show in menu
+        show_in_menu_description: Display this page in the site menu
+        show_in_menu_help: "Uncheck this box if you want to remove a page from your site menu. This can be handy if you have a page you want to link people to directly but don&apos;t want to show the page in the menu."
+        draft: Draft
+        save_as_draft: Save as Draft
+        save: Save
+        cancel: Cancel
+        skip_to_first_child: Skip top-level page
+        skip_to_first_child_label: Redirect visitors to the first sub-level page.
+        skip_to_first_child_help: "This option makes this page link to the first page underneath. This can be useful when grouping pages together."
+        link_url: "Forward this page to another website or page"
+        link_url_help: "If you want this page to go to another website or page when you click this page in the menu, enter a URL. e.g. http://google.com otherwise leave it blank"
+        parent_page_help: "You can put a page under another page by selecting it in the list. If you want this page to be a top-level page, just leave it blank."
+        custom_title_help: "If you want the page to have a different title than the one that shows in the menu then select &apos;Text&apos; and enter it here."
+      form_advanced_options_seo:
+        seo: Search Engine Optimization
+        seo_override_title: Browser title
+        seo_override_title_help: "Enter a 5-10 word title that summarizes the contents of this page."
+        meta_keywords_title: Meta keywords
+        meta_keywords_help: Enter 5-10 keywords that relate to this page. Separate keywords by a comma.
+        meta_description_title: Meta description
+        meta_description_help: Enter a concise two or three sentences describing what this page is about.
+        js:
+          content_section:
+            create: Create Content Section
+            already_exists: "A content section with that title already exists, please choose another."
+            title_empty: "You have not entered a title for the content section, please enter one."
+            confirm_delete: "This will remove the content section {{section_name}} when the page is saved and erase all content that has been entered into it, Are you sure?"
+      index:
+        create_new_page: Create New Page
+        reorder_pages: Reorder Pages
+        reorder_pages_done: Done Reordering Pages
+        sorry_no_results: Sorry! There are no results found.
+        no_pages_yet: There are no pages yet.  Click "Create New Page" to add your first page.
+  activerecord:
+    attributes:
+      page:
+        skip_to_first_child: "Skip to first child?"

data/vendor/plugins/refinery/app/views/layouts/admin.html.erb

@@ -4,15 +4,13 @@
   <body<%= " class='login #{::Refinery::I18n.current_locale}'" unless logged_in? %><%= " class='splash #{::Refinery::I18n.current_locale}'" if logged_in? and action_name == "index" %>>
     <%= render :partial => '/shared/site_bar'  %>
     <div id='tooltip_container'></div>
-    <div id='header'>
-      <div id='header_content'>
-        <% if logged_in? %>
-          <%= render :partial => "/admin/menu" %>
-        <% else %>
-          <h1><%= yield :header %></h1>
-        <% end %>
-      </div>
-    </div>
+    <header>
+      <% if logged_in? %>
+        <%= render :partial => "/admin/menu" %>
+      <% else %>
+        <h1><%= yield :header %></h1>
+      <% end %>
+    </header>
     <div id="page_container">
       <div id="page">
         <div id="content" class="clearfix">

data/vendor/plugins/refinery/app/views/layouts/application.html.erb

@@ -6,7 +6,7 @@
     <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id='page_container'>
       <div id='page'>
-        <div id='header' class='clearfix'>
+        <div id='header'>
           <%= render :partial => "/shared/header" %>
         </div>
         <div id='body' class='clearfix'>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -5,8 +5,8 @@
 
   sections = [
     {:yield => :body_content_title, :fallback => page_title, :id => 'body_content_page_title', :title => true},
-    {:yield => :body_content_left, :fallback => @page.present? ? @page[:body] : nil},
-    {:yield => :body_content_right, :fallback => @page.present? ? @page[:side_body] : nil}
+    {:yield => :body_content_left, :fallback => @page.present? ? @page[Page.default_parts.first.to_sym] : nil},
+    {:yield => :body_content_right, :fallback => @page.present? ? @page[Page.default_parts.second.to_sym] : nil}
   ].reject {|section| hide_sections.include?(section[:yield]) }
 
   css = []

data/vendor/plugins/refinery/app/views/shared/_footer.html.erb

@@ -1,5 +1,5 @@
-<div id='footer_content'>
+<footer>
   <p>
     Copyright &copy; <%= Time.now.year %> <%= RefinerySetting[:site_name] %>
   </p>
-</div>
+</footer>

data/vendor/plugins/refinery/app/views/shared/_head.html.erb

@@ -9,7 +9,7 @@
   <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
   <%= "<!--[if IE 7]>#{stylesheet_link_tag 'ie7'}<![endif]-->" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
   <link rel="shortcut icon" href="/favicon.ico" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta charset="utf-8">
   <%= "<meta name=\"keywords\" content=\"#{h @meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>
   <%= "<meta name=\"description\" content=\"#{h @meta.meta_description}\" />" if @meta.meta_description.present? -%>
   <%= yield :head_libraries %>

data/vendor/plugins/refinery/app/views/shared/_header.html.erb

@@ -1,4 +1,4 @@
-<div id='header_content'>
+<header>
   <h1><%= link_to RefinerySetting[:site_name], root_url(:only_path => true) %></h1>
   <%= render :partial => "/shared/menu" %>
-</div>
+</header>

data/vendor/plugins/refinery/app/views/shared/_menu.html.erb

@@ -8,13 +8,15 @@
     if (collection ||= @menu_pages).any?
 -%>
       <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
-        <%= render :partial => "/shared/menu_branch",
-                   :collection => collection,
-                   :locals => {
-                     :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
-                     :sibling_count => collection.size - 1
-                   }
-        -%>
+        <ul>
+          <%= render :partial => "/shared/menu_branch",
+                     :collection => collection,
+                     :locals => {
+                       :hide_children => hide_children ||= RefinerySetting.find_or_set(:menu_hide_children, false),
+                       :sibling_count => collection.size - 1
+                     }
+          -%>
+        </ul>
       </nav>
   <%
     end

data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb

@@ -1,21 +1,23 @@
 <%
-  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter)).any? ? " class='#{css.join(' ')}'" : nil
+  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any? ? " class='#{css.join(' ')}'" : nil
   dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil
 -%>
-<div<%= css -%><%= dom_id -%>>
+<li<%= css -%><%= dom_id -%>>
   <%= link_to menu_branch.title, menu_branch.url %>
 
   <% unless hide_children or
             menu_branch.parent_id.present? or
             (children = menu_branch.children.reject{|c| !c.in_menu?}).empty? %>
     <nav class='clearfix'>
-      <%=
-        render :partial => "/shared/menu_branch",
-               :collection => children,
-               :locals => {
-                 :hide_children => hide_children,
-                 :sibling_count => children.size - 1
-               } -%>
+      <ul>
+        <%=
+          render :partial => "/shared/menu_branch",
+                 :collection => children,
+                 :locals => {
+                   :hide_children => hide_children,
+                   :sibling_count => children.size - 1
+                 } -%>
+      </ul>
     </nav>
   <% end %>
-</div>
+</li>

data/vendor/plugins/refinery/app/views/shared/_site_bar.html.erb

@@ -7,8 +7,8 @@
       <script type='text/javascript'>
         if (typeof($) == 'function') {
           $(document).ready(function() {
-            logo = $('#site_bar_content #site_bar_refinery_cms_logo');
-            $(logo).css('left', ($('#site_bar_content').width() / 2) - ($(logo).width() / 2));
+            $logo = $('#site_bar_content #site_bar_refinery_cms_logo');
+            $logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));
 
             if ($.isFunction($('#editor_switch a').corner)) {
               $('#editor_switch a').corner('6px');

data/vendor/plugins/refinery/config/locales/nl.yml

@@ -25,6 +25,9 @@ nl:
       log_out: Afmelden
       switch_to_your_website: Ga naar de website
       switch_to_your_website_editor: Ga terug naar de editor
+    message:
+      close: Sluiten
+      close_this_message: Sluit dit bericht
     admin:
       message:
         close: sluiten
@@ -37,11 +40,15 @@ nl:
         cancel: Annuleer
         or_continue: of
         cancel_lose_changes: "Als u annuleert, zullen alle wijzingen voor '{{object_name}}' niet worden opgeslagen!"
+        delete: Verwijder
+        previous: Vorige
+        next: Volgende
       image_picker:
         none_selected: "Er is op dit moment geen {{what}} geselecteerd. Klik a.u.b. hier om er een toe te voegen."
         remove_current: "Verwijder de huidige {{what}}"
         change: Klik hier om de afbeelding te wijzigen
         image: afbeelding
+        show: Toon
       resource_picker:
         none_selected: "Er is op dit moment geen {{what}} geselecteerd. Klik a.u.b. hier om er een toe te voegen."
         current: "Huidige {{what}}"

data/vendor/plugins/refinery/config/locales/ru.yml

@@ -0,0 +1,61 @@
+ru:
+  welcome:
+    there_are_no_users: "Ни одного пользователя не создано. Вы будите первым."
+    remember_admin_location: "Запомнить администратора как:" 
+    lets_start: "Ок, давайте введем настройки для входа в систему..."
+    continue: "Далее..."
+  admin:
+    menu:
+      reorder_menu: "Поменять порядок"
+      reorder_menu_done: "Порядок изменен"
+    search: "Поиск"
+    search_submit: "Далее"
+    search_results_for: "Результаты поиска для '{{query}}'"
+    search_no_results: "Ничего не найдено"
+    images:
+      existing_image:
+        submit_insert: "Встатвить"
+  refinery:
+    other: "Иначе {{what}}"
+    reorder: "Поменять порядок {{what}}"
+    reorder_done: "Закончено {{what}}"
+    crudify:
+      created: "{{what}} создан(а)."
+      updated: "{{what}} отредактирован(а)."
+      destroyed: "{{what}} уничтожен(а)."
+  shared:
+    site_bar:
+      log_out: "Выйти"
+      switch_to_your_website: "Перейти на сайт"
+      switch_to_your_website_editor: "Прейти в администарторскую"
+    admin:
+      message:
+        close: "Закрыть"
+      continue_editing:
+        save_and_continue_editing: "Сохранить и продолжить"
+      form_actions:
+        or: "или"
+        save: "Сохранить"
+        or_cancel: "или"
+        cancel: "Отмена"
+        or_continue: "или"
+        cancel_lose_changes: "Cancelling will lose all changes you've made to this {{object_name}}"
+        delete: "Удалить"
+        previous: "Предпросмотр"
+        next: "Следующее"
+      image_picker:
+        none_selected: "There is currently no {{what}} selected, please click here to add one."
+        remove_current: "Remove current {{what}}"
+        change: Click here to pick a image
+        image: image
+        show: Show
+      resource_picker:
+        none_selected: "There is currently no {{what}} selected, please click here to add one."
+        current: "Current {{what}}"
+        download_current: "Download current {{what}}"
+        opens_in_new_window: Opens in a new window
+        remove_current: "Remove current {{what}}"
+        resource: resource
+    message:
+      close: Close
+      close_this_message: Close this message