refinerycms-pages 0.9.9.21 → 0.9.9.22

data/app/controllers/admin/pages_controller.rb

@@ -11,6 +11,10 @@ module Admin
 
     after_filter lambda{::Page.expire_page_caching}, :only => [:update_positions]
 
+    before_filter :restrict_access, :only => [:create, :update, :update_positions, :destroy], :if => proc {|c|
+      defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
+    }
+
     def new
       @page = Page.new
       Page.default_parts.each_with_index do |page_part, index|
@@ -28,8 +32,8 @@ module Admin
 
         # Check whether we need to override e.g. on the pages form.
         unless params[:switch_locale] || @page.nil? || @page.new_record? || @page.slugs.where({
-          :locale => Refinery::I18n.current_locale}
-        ).nil?
+          :locale => Refinery::I18n.current_locale
+        }).nil?
           @page.slug = @page.slugs.first if @page.slug.nil? && @page.slugs.any?
           Thread.current[:globalize_locale] = @page.slug.locale if @page.slug
         end
@@ -50,5 +54,15 @@ module Admin
       end
     end
 
+    def restrict_access
+      if current_user.has_role?(:translator) && !current_user.has_role?(:superuser) &&
+           (params[:switch_locale].blank? || params[:switch_locale] == ::Refinery::I18n.default_frontend_locale.to_s)
+        flash[:error] = t('translator_access', :scope => 'admin.pages')
+        redirect_to :action => 'index' and return
+      end
+
+      return true
+    end
+
   end
 end

data/app/controllers/pages_controller.rb

@@ -20,7 +20,7 @@ class PagesController < ApplicationController
 
     if @page.try(:live?) || (refinery_user? && current_user.authorized_plugins.include?("refinery_pages"))
       # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
-      if @page.skip_to_first_child && (first_live_child = @page.children.order('lft ASC').live.first).present?
+      if @page.skip_to_first_child# && (first_live_child = @page.children.order('lft ASC').live.first).present?
         redirect_to first_live_child.url
       elsif @page.link_url.present?
         redirect_to @page.link_url and return

data/app/models/page.rb

@@ -47,6 +47,7 @@ class Page < ActiveRecord::Base
   attr_accessor :locale # to hold temporarily
   validates :title, :presence => true
 
+  # Docs for acts_as_nested_set https://github.com/collectiveidea/awesome_nested_set
   acts_as_nested_set :dependent => :destroy # rather than :delete_all
 
   # Docs for friendly_id http://github.com/norman/friendly_id
@@ -74,25 +75,25 @@ class Page < ActiveRecord::Base
   after_destroy :expire_page_caching
 
   # Wrap up the logic of finding the pages based on the translations table.
-  scope :with_globalize, lambda {|conditions|
-    if defined?(::Page::Translation)
-      conditions = {:locale => Globalize.locale}.merge(conditions || {})
-      where(:id => ::Page::Translation.where(conditions).select('page_id AS id')).includes(:translations)
-    else
-      where(conditions)
+  if defined?(::Page::Translation)
+    def self.with_globalize(conditions = {})
+      conditions = {:locale => Globalize.locale}.merge(conditions)
+      where(:id => ::Page::Translation.where(conditions).select('page_id AS id')).includes(:children, :slugs)
     end
-  }
+  else
+    def self.with_globalize(conditions = {})
+      where(conditions).includes(:children, :slugs)
+    end
+  end
 
   scope :live, where(:draft => false)
-  scope :by_title, lambda {|t| with_globalize(:title => t)}
+  scope :by_title, proc {|t| with_globalize(:title => t)}
 
   # Shows all pages with :show_in_menu set to true, but it also
   # rejects any page that has not been translated to the current locale.
   # This works using a query against the translated content first and then
   # using all of the page_ids we further filter against this model's table.
-  scope :in_menu, lambda {
-    where(:show_in_menu => true).with_globalize({})
-  }
+  scope :in_menu, proc { where(:show_in_menu => true).with_globalize }
 
   # when a dialog pops up to link to a page, how many pages per page should there be
   PAGES_PER_DIALOG = 14
@@ -290,7 +291,8 @@ class Page < ActiveRecord::Base
       begin
         Rails.cache.delete_matched(/.*pages.*/)
       rescue NotImplementedError
-        warn "**** [REFINERY] The cache store you are using is not compatible with Rails.cache#delete_matched so please disable caching to ensure proper operation. ***"
+        Rails.cache.clear
+        warn "**** [REFINERY] The cache store you are using is not compatible with Rails.cache#delete_matched - clearing entire cache instead ***"
       end
     end
   end

data/app/views/admin/pages/_form_advanced_options_seo.html.erb

@@ -1,24 +1,4 @@
 <div class="hemisquare right_side">
-  <h2><%= t('.seo') %></h2>
-  <div class='field'>
-    <span class='label_with_help'>
-     <%= f.label :browser_title, t('.seo_override_title') %>
-     <%= refinery_help_tag t('.seo_override_title_help')%>
-    </span>
-    <%= f.text_field :browser_title, :class => 'widest' %>
-  </div>
-  <div class='field'>
-    <span class='label_with_help'>
-     <%= f.label :meta_keywords, t('.meta_keywords_title') %>
-     <%= refinery_help_tag t('.meta_keywords_help') %>
-    </span>
-    <%= f.text_field :meta_keywords, :class => 'widest' %>
-  </div>
-  <div class='field'>
-    <span class='label_with_help'>
-     <%= f.label :meta_description, t('.meta_description_title') %>
-     <%= refinery_help_tag t('.meta_description_help') %>
-    </span>
-    <%= f.text_area :meta_description, :class => 'widest', :rows => 7 %>
-  </div>
+  <%= render :partial => '/seo_meta/form',
+             :locals => { :form => f } %>
 </div>

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

@@ -7,7 +7,7 @@
         <span class='preview'>
           <% ([page.translation.try(:locale)] | locales).each do |locale| %>
             <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '16x11'),
-                        edit_admin_page_url(page, :switch_locale => locale),
+                        edit_admin_page_path(page, :switch_locale => locale),
                         :class => 'locale' %>
           <% end %>
         </span>
@@ -18,9 +18,9 @@
       <%= link_to refinery_icon_tag('application_go.png'), page.url,
                   :target => "_blank",
                   :title => t('.view_live_html') %>
-      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_page_url(page),
+      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_page_path(page),
                   :title => t('edit', :scope => 'admin.pages') %>
-      <%= link_to refinery_icon_tag('delete.png'), admin_page_url(page),
+      <%= link_to refinery_icon_tag('delete.png'), admin_page_path(page),
                   :class => "cancel confirm-delete",
                   :title => t('delete', :scope => 'admin.pages'),
                   :confirm => t('message', :scope => 'shared.admin.delete', :title => page.title_with_meta.gsub(/\ ?<em>.*<\/em>/, "")),
@@ -28,10 +28,6 @@
     </span>
   </div>
   <ul class='nested'>
-    <%= render :partial => 'page',
-               :collection => page.children,
-               :locals => {
-                 :collection => collection
-               } if page.has_descendants? %>
+    <%= render :partial => 'page', :collection => page.children %>
   </ul>
 </li>

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

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

data/app/views/admin/pages_dialogs/_page_link.html.erb

@@ -6,8 +6,9 @@
               :rel => page_link.title,
               :class => 'page_link' }.merge(link_args) %>
 </li>
-<%= render :partial => 'page_link', :collection => page_link.children,
+<%= render :partial => 'page_link',
+           :collection => page_link.children,
            :locals => {
              :child => (child ||= 0) + 1,
              :link_to_arguments => link_args
-           } if page_link.has_descendants? -%>
+           } -%>

data/config/locales/cs.yml

@@ -63,14 +63,6 @@ cs:
         link_url_help: Pokud chcete aby po kliknutí na odkaz na tutu stránku byl návštěvník přesměrován na jiný web, vložte adresu (např. http://google.com), jinak nechte prázdné
         parent_page_help: Můžete umístit tuto stránku v hierarchii pod jinou stránku. Pokud nevyberete nic, bude tato stránka umístěna na první úrovni.
         custom_title_help: Pokud chcete aby stránka měla jiný titulek než ten který se zobrazuje v menu vyberte 'Text' a vložte jej zde.
-      form_advanced_options_seo:
-        seo: Optimalizace pro vyhledávače
-        seo_override_title: Titulek prohlížeče
-        seo_override_title_help: Vložte titulek délky 5-10 slov, který vystihuje obsah stránky.
-        meta_keywords_title: Klíčová slova
-        meta_keywords_help: Vložte 5-10 klíčových slov oddělených čárkou, které se vztahují k obsahu stránky.
-        meta_description_title: Popisek
-        meta_description_help: Vložte 2-3 krátké věty shrnující obsah stránky.
       actions:
         create_new_page: Přidat novou stránku
         reorder_pages: Přeuspořádat stránky

data/config/locales/da.yml

@@ -63,14 +63,6 @@ da:
         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 'Tekst' og indtast titlen her.
-      form_advanced_options_seo:
-        seo: Søgemaskineoptimering
-        seo_override_title: Browser titel
-        seo_override_title_help: Indtast en titel på 5-10 ord, der summerer sidens indhold.
-        meta_keywords_title: Meta keywords
-        meta_keywords_help: Indtast 5-10 nøgleord der er relaterede til siden. Adskil nøgleordene med kommaer.
-        meta_description_title: Meta description
-        meta_description_help: Indtast to eller tre sætninger, der beskriver siden.
       actions:
         create_new_page: Tilføj en ny side
         reorder_pages: Redigér rækkefølgen af siderne

data/config/locales/de.yml

@@ -63,14 +63,6 @@ de:
         link_url_help: Wenn diese Seite zu einer anderen Seite weitergeleitet werden soll, geben Sie hier eine Adresse an, sonst lassen Sie dieses Feld leer.
         parent_page_help: Sie können eine Seite einer anderen unterordnen, indem Sie diese aus der Liste wählen. Soll die Seite auf die oberste Ebene, lassen Sie dieses Feld leer.
         custom_title_help: Wenn die Seite einen anderen Titel haben soll, als der im Menü angezeigte, so wählen Sie 'Text' und geben Sie ihn hier ein.
-      form_advanced_options_seo:
-        seo: Suchmaschinenoptimierung
-        seo_override_title: Browsertitel
-        seo_override_title_help: Geben Sie einen 5-10 Wörter langen Titel an, den der Inhalt der Seite beschreibt.
-        meta_keywords_title: Meta-Schlüsselwörter
-        meta_keywords_help: Geben Sie 5-10 Schlüsselwörter für diese Seite an. Trennen Sie Schlüsselwörter mit einem Komma.
-        meta_description_title: Meta-Beschreibung
-        meta_description_help: Beschreiben Sie in knappen zwei oder drei Sätzen, um was es sich bei dieser Seite handelt.
       actions:
         create_new_page: Neue Seite anlegen
         reorder_pages: Seiten umsortieren

data/config/locales/el.yml

@@ -63,14 +63,6 @@ el:
         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 'Text' 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.
       actions:
         create_new_page: Προσθήκη νέας σελίδας
         reorder_pages: Αναδιάταξη σελιδών

data/config/locales/en.yml

@@ -63,20 +63,13 @@ en:
         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 'Text' 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.
       actions:
         create_new_page: Add new page
         reorder_pages: Reorder pages
         reorder_pages_done: Done reordering pages
       records:
         no_pages_yet: There are no pages yet. Click "Add new page" to add your first page.
+      translator_access: You do not have the required permission to modify pages in this language.
   activerecord:
     models:
       page: page

data/config/locales/es.yml

@@ -64,14 +64,6 @@ es:
         link_url_help: "Si quieres que esta página envíe a otra web o página entonces pulsa esta página en el menú y introduce una URL (por ej: http://google.com). En caso contrario déjalo en blanco."
         parent_page_help: Puedes incluir una página dentro de otra seleccionándola en la lista. Si quieres que sea una página de primer nivel, déjalo en blanco.
         custom_title_help: Si quieres que la página tenga un título diferente al que aparece en el menú selecciona 'Texto' y teclea el título que prefieres.
-      form_advanced_options_seo:
-        seo: Optimización para motores de búsqueda (SEO)
-        seo_override_title: Título del navegador
-        seo_override_title_help: Introduce un título de 5-10 palabras que resuma los contenidos de la página.
-        meta_keywords_title: Palabras clave (meta keyboards)
-        meta_keywords_help: Introduce 5-10 palabras clave relacionadas con esta página, separadas por comas.
-        meta_description_title: Meta-descripción
-        meta_description_help: Describe en dos o tres frases de qué tema trata esta página.
       actions:
         create_new_page: Crear nueva página
         reorder_pages: Reordenar páginas

data/config/locales/fi.yml

@@ -63,23 +63,16 @@ fi:
         link_url_help: "Jos haluat tämän sivun uudelleenohjaavan käyttäjän toiselle nettisivustolle tai sivulle, kirjoita URL (esim. http://google.com) tai jätä muuten tyhjäksi"
         parent_page_help: "Voit asettaa sivun toisen sivun alisivuksi valitsemalla yläsivun valikosta. Jos haluat tämän sivun olevan pääsivu, jätä sivu valitsematta."
         custom_title_help: "Jos haluat sivun näyttävän eri otsikon valikossa, valitse 'Teksti' ja kirjoita se tähän."
-      form_advanced_options_seo:
-        seo: Hakukoneoptimointi
-        seo_override_title: Otsikko
-        seo_override_title_help: Kirjoita 5-10 sanan otsikko joka tiivistää tämän sivun sisällön.
-        meta_keywords_title: Avainsanat
-        meta_keywords_help: "Kirjoita 5-10 avainsanaa, jotka littyvät tähän sivuun. Erottele ne pilkulla."
-        meta_description_title: Kuvaus
-        meta_description_help: Kirjoita ytimekäs kahden tai kolmen lauseen kuvaus tästä sivusta.
       actions:
         create_new_page: Lisää uusi sivu
-        reorder_pages: Uudelleenjärjestele sivuja
-        reorder_pages_done: Valmis
+        reorder_pages: Muuta sivujen järjestystä
+        reorder_pages_done: Tallenna
       records:
         no_pages_yet: Sivuja ei ole vielä. Paina "Lisää uusi sivu-" painiketta lisätäksesi ensimmäisen sivun.
+      translator_access: Sinulla ei ole lupaa muokata sivuja tällä kielellä.
   activerecord:
     models:
-      page: page
+      page: sivu
     attributes:
       page:
         title: Otsikko

data/config/locales/fr.yml

@@ -63,14 +63,6 @@ fr:
         link_url_help: "Si vous souhaitez que cette page mène à un autre site internet ou à une autre page lorsque l'on clique dessus dans le menu, entrez une URL '(par exemple http://google.com)'. Sinon laissez ce champ vide."
         parent_page_help: "Vous pouvez placer une page sous une autre page en la sélectionnant dans la liste. Si vous voulez que cette page soit une page parente, laissez ce champ vide."
         custom_title_help: "Si vous voulez que la page ait un titre différent de celui qui apparaît dans le menu, sélectionnez 'Text' et entrez-le ici."
-      form_advanced_options_seo:
-        seo: Optimisations pour les moteurs de recherche (SEO)
-        seo_override_title: Titre du navigateur
-        seo_override_title_help: Entrez entre 5 et 10 mots qui résument votre page.
-        meta_keywords_title: Mots clefs
-        meta_keywords_help: Entrez entre 5 et 10 mots clefs en relation avec votre page (Séparer les mots clefs par des virgules).
-        meta_description_title: Description
-        meta_description_help: Entrez deux ou trois phrases concises décrivants le sujet de votre page.
       actions:
         create_new_page: Créer une nouvelle page
         reorder_pages: Réordonner les pages

data/config/locales/it.yml

@@ -73,13 +73,6 @@ it:
         parent_page_help: "Si può fare in modo che questa pagina sia figlia di un'altra pagina selezionandola dalla lista; se invece si desidera che questa pagina sia una pagina di primo livello, lasciare in bianco."
         custom_title_help: "Se si desidera che la pagina abbia un titolo diverso da quello mostrato nel menu, selezionare 'Testo' e inserirlo qui."
       form_advanced_options_seo:
-        seo: Ottimizzazione Motori di Ricerca
-        seo_override_title: Titolo del Browser
-        seo_override_title_help: È possibile inserire un testo per il titolo della barra del browser che sovrascriverà il valore predefinito
-        meta_keywords_title: Parole chiave
-        meta_keywords_help: Inserisci 5-10 parole chiave che riguardano questa pagina, separate da una virgola.
-        meta_description_title: Descrizione
-        meta_description_help: Inserire due o tre frasi concise che descrivono questa pagina.
         js:
           content_section:
             create: Crea sezione dei contenuti

data/config/locales/jp.yml

@@ -61,14 +61,6 @@ jp:
         link_url_help: メニューでこのページへのリンクをクリックした時、他のウェブサイトやページに転送するようにするにはURL（例 http://google.com）を書き入れます。そうでない場合は空欄のままにします。
         parent_page_help: リストから選んで、ページを他のページの下に置く事が出来ます。空にするとこのページは一番上の階層のページとして扱われます。
         custom_title_help: このページにメニューに表示されているもの以外のタイトルを付けたい時にはここに書いて下さい。
-      form_advanced_options_seo:
-        seo: 検索エンジン最適化
-        seo_override_title: ブラウザのタイトル
-        seo_override_title_help: このページの内容を要約する短いタイトルを入れて下さい。
-        meta_keywords_title: メタキーワード
-        meta_keywords_help: このページに関係のあるキーワードを5つから10個ほど入れて下さい。区切りの記号はコンマです。
-        meta_description_title: メタの説明
-        meta_description_help: このページの内容を説明する簡潔な文章を二三入れて下さい。
       actions:
         create_new_page: 新規ページを追加
         reorder_pages: ページを並べ替える

data/config/locales/lolcat.yml

@@ -62,14 +62,6 @@ lolcat:
         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 OTHERWIZE LEEF IT BLANK
         parent_page_help: U CAN PUT PAEG UNDR ANOTHR PAEG BY SELECTIN IT IN DA LIST. IF U WANTS DIS PAEG 2 BE TOP-LEVEL PAEG, JUS LEEF IT BLANK.
         custom_title_help: IF U WANTS TEH PAEG 2 HAS DIFFERENT TITLE THAN TEH WAN DAT SHOWS IN DA MENU DEN SELECT 'TEXT' AN ENTR IT HER.
-      form_advanced_options_seo:
-        seo: SEARCH ENGINE OPTIMIZASHUN
-        seo_override_title: BROWSR TITLE
-        seo_override_title_help: ENTR 5-10 WERD TITLE DAT SUMMARIZEZ TEH CONTENTS OV DIS PAEG.
-        meta_keywords_title: META KEYWORDZ
-        meta_keywords_help: ENTR 5-10 KEYWORDZ DAT RELATE 2 DIS PAEG. SEPARATE KEYWORDZ BY COMMA.
-        meta_description_title: META DESCRIPSHUN
-        meta_description_help: ENTR CONCIZE 2 OR 3 SENTENCEZ DESCRIBIN WUT DIS PAEG IZ BOUT.
       actions:
         create_new_page: ADD NEW PAEG
         reorder_pages: REORDR PAGEZ

data/config/locales/lt.yml

@@ -64,14 +64,6 @@ lt:
         link_url_help: "Jei norite, kad šis puslapis vestų į kitą svetainę ar puslapį, kai jį paspaudžiate meniu, tai įveskite adresą pvz. http://google.com arba palikite tuščią"
         parent_page_help: "Galite sukurti puslapį, po kitu puslapių, tai pasirinkite jį sąraše. Jei norite, kad šis puslapis taptų aukščiausio lygio puslapiu, tiesiog palikite tuščią."
         custom_title_help: "Jei norite, kad puslapio antraštė būtų kitokia, nei naudojama meniu, tai pasirinkite 'Tekstas' ir įveskite antraštę."
-      form_advanced_options_seo:
-        seo: Paieškos variklių optimizacija
-        seo_override_title: Naršyklės antraštė
-        seo_override_title_help: "Įveskite 5-10 žodžių santrauką, kuri nusako šio puslapio turinį."
-        meta_keywords_title: Meta raktažodžiai
-        meta_keywords_help: "Įveskite 5-10 raktinių žodžių, kurie susiję su šiuo puslapiu. Atskirkite raktinius žodžius kableliais."
-        meta_description_title: Meta aprašymas
-        meta_description_help: Įveskite rišlius du ar tris sakinius nusakančius apie ką šis puslapis.
       actions:
         create_new_page: Pridėti naują puslapį
         reorder_pages: Keisti puslapių tvarką

data/config/locales/lv.yml

@@ -65,14 +65,6 @@ lv:
         link_url_help: Ja vēlaties, lai šī lapa novirzītu apmeklētājus uz citu interneta saiti vai jūsu saita lapu, tad ievadiet saiti, piemēram, http://google.lv, pretējā gadījumā atstājot šo lauku tukšu
         parent_page_help: Jūs varat novietot lapu zem citas lapas, izvēloties to no sarkasta. Ja jūs velaties, lai šī lapa būtu augšējā līmenī - atstājiet lauku tukšu.
         custom_title_help: Ja vēlaties, lai lapai būtu cits nosaukums nekā tas ir izvēlnē, tad izvēlieties 'Teksts' un ievadiet to izveidotajā laukā.
-      form_advanced_options_seo:
-        seo: Optimizēšana Interneta Meklētājiem
-        seo_override_title: Nosaukums pārlūkā
-        seo_override_title_help: Ievadiet 5-10 nosaukuma vārdus, kuri apkopo šīs lapas saturu.
-        meta_keywords_title: Meta atslēgvārdi
-        meta_keywords_help: Ievadiet 5-10 atslēgvārdus, kuriem ir saistība ar šo lapu. Atslēgvārdus atdaliet ar komatu
-        meta_description_title: Meta apraksts
-        meta_description_help: Īsi, divos vai trijos teikumos, aprakstiet šīs lapas saturu.
       actions:
         create_new_page: Izveidot jaunu lapu
         reorder_pages: Pārkārtot lapas

data/config/locales/nb.yml

@@ -63,14 +63,6 @@ nb:
         link_url_help: "Dersom du ønsker å bli sendt til en annen side eller en ekstern webside når du trykker på den i menyen, legg inn en adresse her. F.eks. http://google.com . La ellers feltet stå tomt."
         parent_page_help: Du kan plassere en side under en annen side ved å velge den fra listen. Om du ønsker at siden skal være en toppnivå side så lar du dette valget stå blankt.
         custom_title_help: "Dersom du ønsker at siden skal ha en annen tittel enn den som vises i menyen så kan du velge 'Tekst' og skrive inn tittelen her."
-      form_advanced_options_seo:
-        seo: Søkemotoroptimalisering (SEO)
-        seo_override_title: Nettleser tittel
-        seo_override_title_help: Skriv inn en tittel på 5-10 ord som oppsummerer innholdet på siden.
-        meta_keywords_title: Meta stikkord
-        meta_keywords_help: Skriv inn 5-10 stikkord som relaterer til denne siden. Separer stikkordene med komma.
-        meta_description_title: Meta beskrivelse
-        meta_description_help: Skriv en kort beskrivelse på to eller tre setninger som forteller hva denne siden inneholder.
       actions:
         create_new_page: Legg til ny side
         reorder_pages: Endre rekkefølgen

data/config/locales/nl.yml

@@ -63,14 +63,6 @@ nl:
         link_url_help: Als je wilt dat deze pagina naar een andere website, of pagina verwijst, wanneer je deze pagina in het menu selecteerd, vul dan een adres in. Laat het leeg om de pagina zelf te laten zien.
         parent_page_help: Je kunt een pagina onder een andere pagina hangen, door de "ouder" pagina te selecteren in deze lijst. Als het een "top level" pagina moet worden, kunt u de lege optie selecteren.
         custom_title_help: If you want the page to have a different title than the one that shows in the menu then select 'Text' and enter it here.
-      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: 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.
       actions:
         create_new_page: Maak een nieuwe pagina
         reorder_pages: "Wijzig de volgorde van de pagina's"

data/config/locales/pl.yml

@@ -64,14 +64,6 @@ pl:
         link_url_help: Jeżeli chcesz, aby ta strona prowadziła do innej strony lub witryny kiedy klikniesz ją w menu, wpisz tu adres URL, na przykład http://google.com.W innym wypadku pozostaw to pole pustym.
         parent_page_help: Możesz umieścić tę stronę pod inną wybierając stronę nadrzędną z listy. Jeżeli ta strona ma być stroną najwyższego poziomu pozostaw to pole pustym.
         custom_title_help: Jeżeli chcesz aby ta strona miała inny tytuł niż ten widoczny w menu wybierz 'Tekst' i wpisz go tutaj.
-      form_advanced_options_seo:
-        seo: Optymalizacja dla wyszukiwarek
-        seo_override_title: Tytuł w przeglądarce
-        seo_override_title_help: Wpisz 5-10 słów które podsumowują zawartość tej strony.
-        meta_keywords_title: Słowa kluczowe meta
-        meta_keywords_help: Wpisz 5-10 słów kluczowych związanych z zawartością tej strony. Rozdziel słowa kluczowe przecinkiem.
-        meta_description_title: Opis meta
-        meta_description_help: Podaj dwu-trzyzdaniowy opis tego, o czym jest ta strona.
       actions:
         create_new_page: Dodaj nową stronę
         reorder_pages: Zmień kolejność stron

data/config/locales/pt-BR.yml

@@ -64,14 +64,6 @@ pt-BR:
         link_url_help: "Se você quer que esta página seja redicionada para outro site ou página quando você clicar nesta página no menu, digite a URL. ex. http://google.com ou deixe em branco."
         parent_page_help: "Se você quer colocar está página a baixo de outra página no menu, selecione qual página aqui ou deixe em branco caso queria a página na raiz do menu."
         custom_title_help: "Se você quer que a página tenha um título diferente do que é mostrado no menu então selecione 'Texto' e digite o novo título."
-      form_advanced_options_seo:
-        seo: Otimização de Motor de Busca
-        seo_override_title: Título para a busca
-        seo_override_title_help: Digite de 5 a 10 palvras pequenas que resumem o conteúdo desta página.
-        meta_keywords_title: Palavras-chave
-        meta_keywords_help: Digite de 5 a 10 palavras-chave presentes nesta página. Separe elas com vírgula.
-        meta_description_title: Meta descrição
-        meta_description_help: Digite duas ou três sentenças concisas descrevendo sobre o que é essa página.
       actions:
         create_new_page: Criar uma nova página
         reorder_pages: Reordenar as Páginas

data/config/locales/rs.yml

@@ -63,14 +63,6 @@ rs:
         link_url_help: Ako želiš da ova strana vodi na drugi websajt ili stranu kada klikneš na stranu u meniju, upiši URL (npr. http://google.com), u suprotnom ostavi prazno
         parent_page_help: Možeš postaviti stranu ispod druge strane, tako što ćeš je izabrati na listi. Ako želiš da ova strana bude na glavnom nivou ostavi prazno.
         custom_title_help: Ako želiš da strana ima drugačiji naslov od onog koji piše u meniju, onda izaberi 'Tekst' i upiši ga ovde.
-      form_advanced_options_seo:
-        seo: Optimizacija za pretraživače(SEO)
-        seo_override_title: Naslov u brauzeru
-        seo_override_title_help: Unesi naslov koji objašnjava sadržaj strane.
-        meta_keywords_title: Ključne reči
-        meta_keywords_help: Unesi 5 do 10 reči, odvojene zarezom, koje ukazuju na sadržaj ove strane.
-        meta_description_title: Opis
-        meta_description_help: Unesi opis sadržaja ove strane u dve do tri rečenice.
       actions:
         create_new_page: Dodaj novu stranu
         reorder_pages: Promeni redosled strana

data/config/locales/ru.yml

@@ -72,14 +72,6 @@ ru:
         link_url_help: "Если вы хотите, чтобы при переходе на эту страницу пользователь переадресовывался на другой сайт или страницу, введите адрес, например, http://google.com, иначе оставьте поле пустым"
         parent_page_help: "Вы можете поместить эту страницу под другую, выбрав ее в списке. Если вы хотите, чтобы эта страница была самого верхнего уровня, оставьте выбранное пустым"
         custom_title_help: "Если вы хотите, чтобы страница имела заголовок, отличный от того, что в меню или в заголовке браузера, выберите «Текст» и введите его здесь."
-      form_advanced_options_seo:
-        seo: Поисковая оптимизация
-        seo_override_title: Заголовок браузера
-        seo_override_title_help: "Введите заголовок из 5–10 слов, которые описывают текст на этой странице."
-        meta_keywords_title: Ключевые слова
-        meta_keywords_help: "Введите 5–10 ключевых слов, которые относятся к этой странице, разделяя запятой."
-        meta_description_title: Описание
-        meta_description_help: "Введите два-три коротких предложения, описывающих страницу."
       actions:
         create_new_page: Создать новую страницу
         reorder_pages: Изменить порядок страниц

data/config/locales/sk.yml

@@ -63,14 +63,6 @@ sk:
         link_url_help: Ak chcete, aby po kliknutí na odkaz na tútu stránku bol návštevník presmerovaný na iný web, vložte adresu (napr. http://google.com), inak ponechajte prázdne.
         parent_page_help: Môžete umiestniť túto stránku v hierarchii pod inú stránku. Ak nevyberiete nič, bude táto stránka umiestnená na prvej úrovni.
         custom_title_help: Ak chcete aby stránka mala iný titulok než ten ktorý sa zobrazuje v menu vyberte 'Text' a vložte ho tu.
-      form_advanced_options_seo:
-        seo: Optimalizácia pre vyhľadávanie
-        seo_override_title: Titulok prehliadača
-        seo_override_title_help: Vložte titulok dĺžky 5-10 slov, ktorý vystihuje obsah stránky.
-        meta_keywords_title: Kľúčové slová (Meta keywords)
-        meta_keywords_help: Vložte 5-10 kľúčových slov oddelených čiarkou, ktoré sa vzťahujú k obsahu stránky.
-        meta_description_title: Popis (Meta description)
-        meta_description_help: Vložte 2-3 krátke vety sumarizujúce obsah stránky.
       actions:
         create_new_page: Pridať novú stránku
         reorder_pages: Zmeniť usporiadanie stránok

data/config/locales/sl.yml

@@ -62,14 +62,6 @@ sl:
         link_url_help: "Če želite da stran kaže na drugo spletno stran ali stran, ko boste kliknili na njo v meniju, vnesite URL naslov npr. http://google.com v nasprotnem primeru pustite prazno."
         parent_page_help: "Stran lahko postavite pod neko drugo, tako da jo izberite iz seznama. Če želite da je ta stran na najvišjem nivoju, pustite prazno."
         custom_title_help: "Če želite da ima stran drugačen naslov od tistega, ki se prikaže v meniju potem izberite 'Tekst' in ga vnesite tukaj."
-      form_advanced_options_seo:
-        seo: Optimitizacija za spletne iskalnike
-        seo_override_title: Naslov brskalnika
-        seo_override_title_help: "Če želite povoziti privzeti naslov brskalnika, ga spremenite tukaj."
-        meta_keywords_title: Meta ključne besede
-        meta_keywords_help: Vnesite 5-10 ključnih besed, ki se navezujejo na to spletno stran. Ključne besede ločite z vejicami.
-        meta_description_title: Meta opis
-        meta_description_help: V dveh do treh stavkih jedernato opišite kaj ta stran predstavlja.
       actions:
         create_new_page: Dodaj novo stran
         reorder_pages: Spremeni vrstni red Strani

data/config/locales/sv.yml

@@ -63,14 +63,6 @@ sv:
         link_url_help: Om du vill att den här sidan vidarebefodrar till en annan sida när du väljer den i menyn, fyll i en URL. Tex. http://www.google.com/. Annars lämna tom.
         parent_page_help: Du kan låta sidor bli undersidor till varandra. Om du vill att den här sidan ska vara en toppnivåsida, lämna tom.
         custom_title_help: Om du vill att sidan har en annan huvudrubrik än den som visas i menyn, välj Text, och fyll i här.
-      form_advanced_options_seo:
-        seo: Optimering för sökmotorer
-        seo_override_title: Titel i webbläsaren
-        seo_override_title_help: Fyll i en titel med 5 till 10 ord som summerar innehållet på den här sidan.
-        meta_keywords_title: Meta nyckelord
-        meta_keywords_help: Fyll i 5 till 10 nyckelord som relaterar till den här sidan. Separera dina nyckelord med komma-tecken.
-        meta_description_title: Meta beskrivning
-        meta_description_help: Fyll i konkret vad sidan handlar om. Använd en, två eller tre meningar.
       actions:
         create_new_page: Lägg till en ny sida
         reorder_pages: Ändra ordning på sidor

data/config/locales/vi.yml

@@ -63,14 +63,6 @@ vi:
         link_url_help: Nếu bạn muốn khi ấn vào trang này trên menu, người dùng sẽ được đưa tới một trang kháchay website khác, bạn hãy nhập vào một địa chỉ (ví dụ http://google.com), nếu không để trống ô này.
         parent_page_help: Bạn có thể đặt trang này ở dưới (làm con) một trang khác bằng cách chọn trang cha từ danh sách dưới đây. Hãy để trống nếu bạn muốn trang này là trang ở lớp ngoài cùng.
         custom_title_help: Nếu bạn muốn trang này có một tiêu đề khác tiêu đề hiện trong menu, hãy chọn 'Chữ' và nhập vào đây.
-      form_advanced_options_seo:
-        seo: Tối ưu hóa công cụ tìm kiếm
-        seo_override_title: Tiêu đề trình duyệt
-        seo_override_title_help: Nhập 5-10 từ tóm tắt nội dung trang này.
-        meta_keywords_title: Meta keywords
-        meta_keywords_help: Nhập 5-10 từ khóa liên quan tới trang này, phân cách bằng dấu phẩy.
-        meta_description_title: Meta description
-        meta_description_help: Nhập vào 2-3 câu thật súc tích mô tả trang này nói về gì.
       actions:
         create_new_page: Tạo trang mới
         reorder_pages: Sắp xếp lại các trang

data/config/locales/zh-CN.yml

@@ -63,14 +63,6 @@ zh-CN:
         link_url_help: 如果您想要在菜单中点这个页面就跳到其他网站或是页面的话, 在这里输入网址, 例如 http://google.com, 不然就留空
         parent_page_help: 您可以在列表中让一个页面依附在另一个页面之下. 如果您想要让这个页面为第一层页面, 就不要填写.
         custom_title_help: 如果您想要此页面在菜单里有个不一样的名称, 请选择 '文字' , 然后在这里输入.
-      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/zh-TW.yml

@@ -63,14 +63,6 @@ zh-TW:
         link_url_help: 如果您想要在選單中點選這個頁面就跳到另外一個網站或是頁面的話, 在這裡輸入網址, 例如 http://google.com, 不然就空白不填
         parent_page_help: 您可以在列表中讓一個頁面依附在另一個頁面之下. 如果您想要讓這個頁面是第一層的頁面, 就不要填這個欄位.
         custom_title_help: 如果您想要這個頁面有個跟選單中不同的名稱, 請選擇 '文字' , 然後在這裡輸入.
-      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/features/manage_pages.feature

@@ -45,3 +45,4 @@ Feature: Manage Pages
     Then I should see "'test' was successfully removed."
     And I should have 0 pages
     And I should have 0 page_parts
+

data/features/step_definitions/page_steps.rb

@@ -50,3 +50,7 @@ end
 Then /^I should have (\d+) page_parts$/ do |count|
   PagePart.count.should == count.to_i
 end
+
+Given /^I have frontend locales "?([^\"]*)"?/ do |locales|
+  RefinerySetting.set(:i18n_translation_frontend_locales, {:value => locales.split(', '), :scoping => 'refinery'})
+end

data/features/translate_pages.feature

@@ -0,0 +1,40 @@
+@refinerycms @pages @pages-translate @i18n
+Feature: Translate Pages
+  In order to make the content on my website accessible in many countries
+  As a translator
+  I want to translate manage pages
+
+  Background:
+    Given A Refinery user exists
+    And I am a logged in Refinery Translator
+    And I have pages titled Home, About
+
+  Scenario: Pages List
+    When I go to the list of pages
+    Then I should see "Home"
+    And I should see "About"
+
+  Scenario: Add page to main locale
+    When I go to the list of pages
+    And I follow "Add new page"
+    And I fill in "Title" with "Pickles are Cucumbers Soaked in Evil"
+    And I press "Save"
+    Then I should see "You do not have the required permission to modify pages in this language"
+    And I should have 2 pages
+
+  Scenario: Add page to second locale
+    Given I have frontend locales en, fr
+    When I go to the list of pages
+    And I follow "Add new page"
+    And I follow "Fr" within "#switch_locale_picker"
+    And I fill in "Title" with "Pickles sont Concombres Trempé dans le Mal"
+    And I press "Save"
+    Then I should see "'Pickles sont Concombres Trempé dans le Mal' was successfully added."
+    And I should have 3 pages
+
+  Scenario: Delete page from main locale
+    Given I only have a page titled "test"
+    When I go to the list of pages
+    And I follow "Remove this page forever"
+    Then I should see "You do not have the required permission to modify pages in this language."
+    And I should have 1 pages

data/lib/gemspec.rb

@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'refinerycms-core',            '= #{::Refinery::Version}'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'seo_meta',                    '~> 1.0.5'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'awesome_nested_set',          '~> 2.0'
+  s.add_dependency 'seo_meta',                    '~> 1.1'
 end
 EOF
 

data/lib/refinery/pages/admin/instance_methods.rb

@@ -4,7 +4,7 @@ module Refinery
       module InstanceMethods
 
         def error_404(exception=nil)
-          if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
+          if (@page = Page.where(:menu_match => "^/404$").includes(:parts, :slugs).first).present?
             params[:action] = 'error_404'
             # change any links in the copy to the admin_root_path
             # and any references to "home page" to "Dashboard"

data/lib/refinery/pages/instance_methods.rb

@@ -15,7 +15,7 @@ module Refinery
 
     protected
       def find_pages_for_menu
-        @menu_pages = ::Page.live.in_menu.order('lft ASC').includes(:slugs, :children)
+        @menu_pages = ::Page.roots.live.in_menu.order('lft ASC').includes(:children)
       end
 
       def render(*args)
@@ -25,11 +25,9 @@ module Refinery
 
     private
       def store_current_location!
-        unless admin?
-          session[:website_return_to] = url_for(@page.url) if @page.try(:present?)
-        else
-          super
-        end
+        return super if admin?
+
+        session[:website_return_to] = url_for(@page.url) if @page.try(:present?)
       end
 
     end

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.21}
+  s.version           = %q{0.9.9.22}
   s.summary           = %q{Pages engine for Refinery CMS}
   s.description       = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-05-03}
+  s.date              = %q{2011-05-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -97,6 +97,7 @@ Gem::Specification.new do |s|
     'features/step_definitions/page_steps.rb',
     'features/support',
     'features/support/paths.rb',
+    'features/translate_pages.feature',
     'features/visit_pages.feature',
     'lib',
     'lib/gemspec.rb',
@@ -118,9 +119,9 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core',            '= 0.9.9.21'
+  s.add_dependency 'refinerycms-core',            '= 0.9.9.22'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'seo_meta',                    '~> 1.0.5'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'awesome_nested_set',          '~> 2.0'
+  s.add_dependency 'seo_meta',                    '~> 1.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.21
+  version: 0.9.9.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-22 00:00:00 +12:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,18 +46,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0.beta
+        version: 0.1.0.beta2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: moretea-awesome_nested_set
+  name: awesome_nested_set
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.4"
+        version: "2.0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -67,7 +68,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: "1.1"
   type: :runtime
   version_requirements: *id005
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.
@@ -142,6 +143,7 @@ files:
 - features/manage_pages.feature
 - features/step_definitions/page_steps.rb
 - features/support/paths.rb
+- features/translate_pages.feature
 - features/visit_pages.feature
 - lib/gemspec.rb
 - lib/generators/refinerycms_pages_generator.rb
@@ -153,6 +155,7 @@ files:
 - license.md
 - refinerycms-pages.gemspec
 - spec/models/page_spec.rb
+has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -176,10 +179,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Pages engine for Refinery CMS
 test_files: []
 
-has_rdoc: