refinerycms-pages 2.0.8 → 2.0.9

data/app/controllers/refinery/admin/pages_controller.rb

@@ -27,6 +27,43 @@ module Refinery
         render :layout => false
       end
 
+      def update
+        if @page.update_attributes(params[:page])
+          flash.notice = t(
+            'refinery.crudify.updated',
+            :what => "'#{@page.title}'"
+          )
+
+          unless from_dialog?
+            unless params[:continue_editing] =~ /true|on|1/
+              redirect_back_or_default(refinery.admin_pages_path)
+            else
+              unless request.xhr?
+                redirect_to :back
+              else
+                render :partial => 'save_and_continue_callback', :locals => {
+                  :new_refinery_page_path => refinery.admin_page_path(@page.uncached_nested_url),
+                  :new_page_path => refinery.preview_page_path(@page.uncached_nested_url)
+                }
+              end
+            end
+          else
+            self.index
+            @dialog_successful = true
+            render :index
+          end
+        else
+          unless request.xhr?
+            render :action => 'edit'
+          else
+            render :partial => '/refinery/admin/error_messages', :locals => {
+              :object => @page,
+              :include_object_name => true
+            }
+          end
+        end
+      end
+
     protected
 
       def find_page

data/app/controllers/refinery/pages_controller.rb

@@ -102,7 +102,7 @@ module Refinery
     end
 
     def write_cache?
-      if Refinery::Pages.cache_pages_full
+      if Refinery::Pages.cache_pages_full && !refinery_user?
         cache_page(response.body, File.join('', 'refinery', 'cache', 'pages', request.path.sub("//", "/")).to_s)
       end
     end

data/app/models/refinery/page.rb

@@ -58,8 +58,7 @@ module Refinery
     before_save { |m| m.translation.save }
     before_create :ensure_locale, :if => proc { ::Refinery.i18n_enabled? }
     before_destroy :deletable?
-    after_save :reposition_parts!, :invalidate_cached_urls, :expire_page_caching
-    after_update :invalidate_cached_urls
+    after_save :reposition_parts!, :expire_page_caching
     after_destroy :expire_page_caching
 
     class << self
@@ -187,12 +186,6 @@ module Refinery
           return true # so that other callbacks process.
         end
       end
-
-      def rebuild_with_invalidate_cached_urls!
-        rebuild_without_invalidate_cached_urls!
-        find_each { |page| page.send :invalidate_cached_urls }
-      end
-      alias_method_chain :rebuild!, :invalidate_cached_urls
     end
 
     # The canonical page for this particular page.
@@ -441,17 +434,6 @@ module Refinery
     alias_method_chain :normalize_friendly_id, :marketable_urls
 
     private
-    def invalidate_cached_urls
-      return true unless Refinery::Pages.marketable_urls
-
-      [self, children].flatten.each do |page|
-        ((Refinery.i18n_enabled? && Refinery::I18n.frontend_locales) || [::I18n.locale]).each do |locale|
-          Rails.cache.delete(page.url_cache_key(locale))
-          Rails.cache.delete(page.path_cache_key(locale))
-        end
-      end
-    end
-    alias_method :invalidate_child_cached_url, :invalidate_cached_urls
 
     # Make sures that a translation exists for this page.
     # The translation is set to the default frontend locale.

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

@@ -36,6 +36,7 @@
 
 <% 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 %>
@@ -48,7 +49,7 @@
         var prev_url = form.attr('action');
         var prev_target = form.attr('target');
         form.attr({
-          'action': '<%= @page.persisted? ? refinery.preview_page_path(@page.uncached_nested_url) : refinery.preview_pages_path %>'
+          'action': refinery_page_preview_url
           , 'target': '_blank'
         });
         form.submit();

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

@@ -2,7 +2,7 @@
 <% if (locales ||= Refinery::I18n.frontend_locales).present? and locales.many? %>
   <ul id='switch_locale_picker' class='clearfix'>
     <% locales.each do |locale| %>
-      <li<%= " class='selected'" if locale.to_s == local_assigns[:current_locale].to_s %>>
+      <li<%= " class='selected'".html_safe if locale.to_s == local_assigns[:current_locale].to_s %>>
         <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => "32x22"),
                     refinery.url_for(:switch_locale => locale) %>
       </li>

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

@@ -1,5 +1,5 @@
 <div class='page_part' id='<%= new_part ? "page_part_new_#{part_index}" : part.to_param %>'>
   <%= hidden_field_tag "page[parts_attributes][#{part_index}][title]", part.title if new_part %>
-  <%= text_area_tag "page[parts_attributes][#{part_index}][body]", sanitize(part.body), :rows => 20, :class => 'wymeditor widest' %>
+  <%= text_area_tag "page[parts_attributes][#{part_index}][body]", part.body, :rows => 20, :class => 'wymeditor widest' %>
   <%= hidden_field_tag "page[parts_attributes][#{part_index}][position]", part_index %>
 </div>

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

@@ -0,0 +1,3 @@
+<%= render '/refinery/message' %>
+<%= hidden_field_tag 'new_action', local_assigns[:new_refinery_page_path] %>
+<script>refinery_page_preview_url = '<%= local_assigns[:new_page_path] %>';</script>

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

@@ -1,31 +1,31 @@
-<div class='clearfix dialog_link_to'>
-  <div id='dialog_menu_left'>
-    <span id='your_page_radio' class='radio<%= " selected_radio" if @page_area_selected %>'>
-      <input type='radio' name='link_to' value='your_page' id='link_to_your_page' <%= "checked='true'" if @page_area_selected %> />
-      <label for='link_to_your_page' class='stripped'><%= t('.your_page.tab_name') %></label>
+<div class="clearfix dialog_link_to">
+  <div id="dialog_menu_left">
+    <span id="your_page_radio" class="radio<%= ' selected_radio' if @page_area_selected %>">
+      <input type="radio" name="link_to" value="your_page" id="link_to_your_page" <%= 'checked="true"'.html_safe if @page_area_selected %> />
+      <label for="link_to_your_page" class="stripped"><%= t('.your_page.tab_name') %></label>
     </span>
-    <span id='web_address_radio' class='radio<%= " selected_radio" if @web_address_area_selected %>'>
-      <input type='radio' name='link_to' value='web_address' id='link_to_web_address' <%= "checked='true'" if @web_address_area_selected %> />
-      <label for='link_to_web_address' class='stripped'><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
+    <span id="web_address_radio" class="radio<%= ' selected_radio' if @web_address_area_selected %>">
+      <input type="radio" name="link_to" value="web_address" id="link_to_web_address" <%= 'checked="true"'.html_safe if @web_address_area_selected %> />
+      <label for="link_to_web_address" class="stripped"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
     </span>
 
-    <span id='email_address_radio' class='radio<%= " selected_radio" if @email_address_area_selected %>'>
-      <input type='radio' name='link_to' value='email_address' id='link_to_email_address' <%= "checked='true'" if @email_address_area_selected %> />
-      <label for='link_to_email_address' class='stripped'><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
+    <span id="email_address_radio" class="radio<%= ' selected_radio' if @email_address_area_selected %>">
+      <input type="radio" name="link_to" value="email_address" id="link_to_email_address" <%= 'checked="true"'.html_safe if @email_address_area_selected %> />
+      <label for="link_to_email_address" class="stripped"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
     </span>
     <% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
-      <span id="resource_file_radio" class="radio<%= " selected_radio" if @resource_area_selected %>">
-        <input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= "checked='true'" if @resource_area_selected %> />
+      <span id="resource_file_radio" class="radio<%= ' selected_radio' if @resource_area_selected %>">
+        <input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= 'checked="true"'.html_safe if @resource_area_selected %> />
         <label for="link_to_resource_file" class="stripped"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.your_resource') %></label>
       </span>
     <% end %>
   </div>
 
-  <div id='dialog_main'>
-    <div id='your_page_area' class='dialog_area' <%= "style='display: none'" unless @page_area_selected %>>
-      <input type='hidden' name='selected_image' id='selected_image' />
-      <div id='your_page_content' class='clearfix'>
-        <div id='pages_list' class='pages_list'>
+  <div id="dialog_main">
+    <div id="your_page_area" class="dialog_area" <%= ' class="linked"'.html_safe unless @page_area_selected %>>
+      <input type="hidden" name="selected_image" id="selected_image" />
+      <div id="your_page_content" class="clearfix">
+        <div id="pages_list" class="pages_list">
           <ul class="link_list">
             <%= render :partial => 'page_link', :collection => @pages,
                        :locals => {
@@ -37,13 +37,13 @@
         </div>
       </div>
     </div>
-    <div id='web_address_area' <%= "style='display: none'" unless @web_address_area_selected %> class='dialog_area'>
-      <div id='web_address_content'>
-        <label for='web_address_text'><%= t('location', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
+    <div id="web_address_area" <%= 'style="display: none"'.html_safe unless @web_address_area_selected %> class="dialog_area">
+      <div id="web_address_content">
+        <label for="web_address_text"><%= t('location', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
         <%= text_field :web_address, :text, :value => @web_address_text, :style => "width: 70%" %>
         <label><%= t('new_window', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
-        <input type='checkbox' name='web_address_target_blank' id='web_address_target_blank' <%= "checked='checked'" if @web_address_target_blank %> />
-        <label for='web_address_target_blank' class='stripped'><%= t('new_window_label', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
+        <input type="checkbox" name="web_address_target_blank" id="web_address_target_blank" <%= 'checked="checked"'.html_safe if @web_address_target_blank %> />
+        <label for="web_address_target_blank" class="stripped"><%= t('new_window_label', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></label>
         <p>
           <strong><%= t('not_sure', :scope => 'refinery.admin.pages_dialogs.link_to.web_address') %></strong>
         </p>
@@ -53,20 +53,20 @@
         </ol>
       </div>
     </div>
-    <div id='email_address_area' <%= "style='display: none'" unless @email_address_area_selected %> class='dialog_area'>
-      <div id='email_address_content'>
-        <div class='field'>
-          <label for='email_address_text'><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
+    <div id="email_address_area" <%= 'style="display: none"'.html_safe unless @email_address_area_selected %> class="dialog_area">
+      <div id="email_address_content">
+        <div class="field">
+          <label for="email_address_text"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
           <%= text_field :email_address, :text, :value => @email_address_text, :style => "width: 70%" %>
         </div>
 
-        <div class='field'>
-          <label for='email_default_subject_text'><%= t('subject_line_optional', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
+        <div class="field">
+          <label for="email_default_subject_text"><%= t('subject_line_optional', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
           <%= text_field :email_default_subject, :text, :value => @email_default_subject_text, :style => "width: 70%" %>
         </div>
 
-        <div class='field'>
-          <label for='email_default_body_text'><%= t('body_optional', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
+        <div class="field">
+          <label for="email_default_body_text"><%= t('body_optional', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
           <%= text_area :email_default_body, :text, :value => @email_default_body_text, :style => "width: 70%", :rows => '' %>
         </div>
 
@@ -87,12 +87,12 @@
       </div>
     </div>
     <% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
-      <div id="resource_file_area"<%= " style='display:none'" unless @resource_area_selected %> class="dialog_area">
-        <div id='resources_list' class='pages_list'>
+      <div id="resource_file_area"<%= ' style="display:none"'.html_safe unless @resource_area_selected %> class="dialog_area">
+        <div id="resources_list" class="pages_list">
           <ul class="link_list">
             <% @resources.each do |resource| -%>
               <% resource_linked = (resource.url == params[:current_link]) unless params[:current_link].blank? %>
-              <li<%= " class='linked'" if resource_linked %>>
+              <li<%= ' class="linked"'.html_safe if resource_linked %>>
                 <%= link_to "#{resource.title}.#{resource.ext}", asset_paths.compute_public_path(resource.url, ''),
                             :title => t('link_to_this_resource', :scope => 'refinery.admin.pages_dialogs.link_to.your_resource'),
                             :rel => resource.title,

data/config/locales/es.yml

@@ -39,6 +39,9 @@ es:
           view_live_html: Ver esta página como abierta al público<br/><em>(la abre en ventana nueva)</em>
           hidden: oculta
           draft: borrador
+        form:
+          preview: Previsualizar
+          preview_changes: Previsualizar cambios antes de guardarlos
         form_new_page_parts:
           title: Título
         form_page_parts:
@@ -50,6 +53,7 @@ es:
           parent_page: Página padre
           advanced_options: Opciones avanzadas
           custom_title: Título personalizado
+          menu_title: Título del menú
           show_in_menu_title: Ver en menú
           show_in_menu_description: Mostrar esta página en el menú de la web
           show_in_menu_help: Deja sin marcar esta casilla para eliminar una página del menú de tu web. Puede ser útil si tienes una página que quieres que la gente enlace directamente pero no quieres mostrarla en el menú.

data/config/locales/fr.yml

@@ -47,14 +47,16 @@ fr:
           title: Titre
         form_page_parts:
           create_content_section: Créer une nouvelle section de contenu
-          delete_content_section: Supprimer une section
+          delete_content_section: Supprimer une section de contenu
+          reorder_content_section: Réordonner les sections de contenu
+          reorder_content_section_done: J'ai terminé de réordonner les sections de contenu
         form_advanced_options:
           toggle_advanced_options: Cliquer ici pour paraméter les étiquettes et accéder au menu des options
           page_options: Page Options
           parent_page: Page parente
           advanced_options: Options avancées
           menu_title: Titre dans le menu
-          custom_title: Titre personnalisé
+          custom_slug: Slug personnalisé
           show_in_menu_title: Placer dans le menu
           show_in_menu_description: Placer cette page dans le menu du site
           show_in_menu_help: Décochez cette case si vous souhaitez supprimer une page du menu de votre site. Ceci peut être utile si vous voulez diriger les utilisateurs directement vers une page, sans qu'elle n'apparaisse dans le menu.
@@ -66,13 +68,26 @@ 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."
           menu_title_help: Si vous voulez que le menu affiche un titre différent que celui qui sera affiché sur la page, entrez-le ici.
-          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."
+          custom_slug_help: Un slug est un identifiant plus humain utilisé dans l'adresse d'une page, par exemple 'a-propos'. Pour écraser le slug généré automatiquement par Refinery, entrez votre slug personnalisé ici.
+          layout_template: Agencement
+          layout_template_help: Vous pouvez choisir un agencement différent pour cette page
+          view_template: Modèle de vue
+          view_template_help: Vous pouvez choisir un différent modèle de vue pour cette page
+        form_advanced_options_seo:
+          seo: Search Engine Optimization
+          seo_override_title: Titre du navigateur
+          seo_override_title_help: Saisissez 5 à 10 mots qui résument le contenu de cette page.
+          meta_keywords_title: Meta keywords
+          meta_keywords_help: Saisissez 5 à 10 mots-clés se rapportant à cette page. Séparez les mots-clés par une virgule.
+          meta_description_title: Meta description
+          meta_description_help: Entrez deux ou trois phrases concises décrivant ce à quoi cette page est consacrée.
         actions:
           create_new_page: Créer une nouvelle page
           reorder_pages: Réordonner les pages
           reorder_pages_done: Fin de réordonnancement des pages
         records:
           no_pages_yet: "Il n'y a actuellement aucune page. Cliquer sur 'Créer une nouvelle page' pour en ajouter une."
+        translator_access: Vous n'avez pas les permissions requises pour modifier les pages dans cette langue.
   activerecord:
     models:
       refinery/page: page

data/config/locales/sk.yml

@@ -34,21 +34,29 @@ sk:
       pages:
         delete: Zmazať túto stránku
         edit: Upraviť túto stránku
+        new: Pridať novú podstránku
+        expand_collapse: Rozbaliť alebo zbaliť podstránky
         page:
           view_live_html: Zobraziť stránku <br/><em>(otvorí sa v novom okne)</em>
           hidden: skrytá
           draft: pracovná verzia
+        form:
+          preview: Náhľad
+          preview_changes: Zobraziť náhľad s vykonanými zmenami
         form_new_page_parts:
           title: Názov
         form_page_parts:
           create_content_section: Pridať sekciu
           delete_content_section: Zmazať sekciu
+          reorder_content_section: Preusporiadať sekcie
+          reorder_content_section_done: Uložiť usporiadanie sekcií
         form_advanced_options:
           toggle_advanced_options: Sprístupní nastavenia menu a meta tagov.
           page_options: Nastavenie stránky
           parent_page: Nadradená stránka
           advanced_options: Rozšírené nastavenia
-          custom_title: Titulok
+          menu_title: Názov menu
+          custom_slug: Vlastný url identifikátor
           show_in_menu_title: Zobraziť v menu
           show_in_menu_description: Zobraziť túto stránku v menu webu
           show_in_menu_help: Odznačte ak chcete odstrániť odkaz na túto stránku z menu webu. Toto je užitočné ak máte stránku, na ktorú chcete mať priamy odkaz, ale nechcete zobrazovať stránku v menu.
@@ -59,13 +67,27 @@ sk:
           link_url: Presmerovať túto stránku na iný web alebo stránku.
           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 &apos;Text&apos; a vložte ho tu.
+          menu_title_help: Ak chcete, aby sa v menu zobrazil odlišný názov ako ten, ktorý sa zobrazuje na stránke, napíšte ho sem.
+          custom_slug_help: Url identifikátor je človekom čitateľný identifikátor, ktorý sa používa na vytvorenie celej url adresy stránky, napríklad &apos;o-nas&apos;. Ak chcete zmeniť url identifikátor, ktorý automaticky vytvorí Refinery, napíšte váš vlastný url identifikátor sem.
+          layout_template: Šablóny rozmiestnenia
+          layout_template_help: Pre túto stránku si môžete vybrať odlišnú šablónu rozmiestnenia.
+          view_template: Šablóny vzhľadu
+          view_template_help: Pre túto stránku si môžete vybrať odlišnú šablónu vzhľadu.
+        form_advanced_options_seo:
+          seo: Optimalizácia pre vyhľadávače
+          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 čiarkov, 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
           reorder_pages_done: Uložiť usporiadanie
         records:
           no_pages_yet: Zatiaľ neboli vytvorené žiadne stránky. Kliknite na "Pridať novú stránku" pre pridanie prvej.
+        translator_access: Nemáte požadované oprávnenia editovať stránky v tomto jazyku
   activerecord:
     models:
       refinery/page: stránka

data/db/seeds.rb

@@ -42,7 +42,10 @@ end
 
 (Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
   I18n.locale = lang
-  Refinery::Page.find_by_title("Home").update_attributes(:slug => "home")
-  Refinery::Page.find_by_title("Page not found").update_attributes(:slug => "page-not-found")
-  Refinery::Page.find_by_title("About").update_attributes(:slug => "about")
+  {'home' => "Home",
+   'page-not-found' => 'Page not found',
+   'about' => 'About'
+  }.each do |slug, title|
+    Refinery::Page.by_title(title).each { |page| page.update_attributes(:slug => slug) }
+  end
 end

data/lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 Refinery::Pages.configure do |config|
   # Configure specific page templates
   # config.types.register :home do |home|

data/refinerycms-pages.gemspec

@@ -10,11 +10,10 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Pages extension for Refinery CMS}
   s.description       = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-10-12}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

data/spec/lib/pages/content_presenter_spec.rb

@@ -38,7 +38,7 @@ module Refinery
           @content.hide_sections 'bar'
         end
 
-        # Regression for https://github.com/resolve/refinerycms/issues/1516
+        # Regression for https://github.com/refinery/refinerycms/issues/1516
         it "accepts an array" do
           section2.should_receive :hide
           @content.hide_sections ['bar']

data/spec/requests/refinery/admin/pages_spec.rb

@@ -8,6 +8,13 @@ def new_window_should_have_content(content)
   end
 end
 
+def new_window_should_not_have_content(content)
+  new_window = page.driver.browser.window_handles.last
+  page.within_window new_window do
+    page.should_not have_content(content)
+  end
+end
+
 module Refinery
   module Admin
     describe "Pages" do
@@ -143,19 +150,45 @@ module Refinery
       end
 
       describe "edit/update" do
-        before { Page.create :title => "Update me" }
+        before do
+          Page.create :title => "Update me"
 
-        it "updates page" do
           visit refinery.admin_pages_path
-
           page.should have_content("Update me")
+        end
 
-          click_link "Edit this page"
+        context 'when saving and returning to index' do
+          it "updates page" do
+            click_link "Edit this page"
 
-          fill_in "Title", :with => "Updated"
-          click_button "Save"
+            fill_in "Title", :with => "Updated"
+            click_button "Save"
 
-          page.should have_content("'Updated' was successfully updated.")
+            page.should have_content("'Updated' was successfully updated.")
+          end
+        end
+
+        context 'when saving and continuing to edit' do
+          before :each do
+            find('a[tooltip^=Edit]').visible?
+            find('a[tooltip^=Edit]').click
+
+            fill_in "Title", :with => "Updated"
+            click_button "Save & continue editing"
+            find('#flash').visible?
+          end
+
+          it "updates page", :js do
+            page.should have_content("'Updated' was successfully updated.")
+          end
+
+          # Regression test for https://github.com/refinery/refinerycms/issues/1892
+          context 'when saving to exit (a second time)' do
+            it 'updates page', :js do
+              click_button "Save"
+              page.should have_content("'Updated' was successfully updated.")
+            end
+          end
         end
       end
 
@@ -185,6 +218,22 @@ module Refinery
             Page.by_title("Some changes I'm unsure what they will look like").should be_empty
           end
 
+          # Regression test for previewing after save-and_continue
+          it 'will show the preview in a new window after save-and-continue', :js do
+            visit refinery.admin_pages_path
+
+            find('a[tooltip^=Edit]').click
+            fill_in "Title", :with => "Save this"
+            click_button "Save & continue editing"
+            page.should have_content("'Save this' was successfully updated")
+
+            click_button "Preview"
+
+            new_window_should_have_content("Save this")
+            new_window_should_not_have_content(
+              ::I18n.t('switch_to_website', :scope => 'refinery.site_bar')
+            )
+          end
         end
 
         context 'a brand new page' do
@@ -532,6 +581,24 @@ module Refinery
           end
         end
       end
+
+      # regression spec for https://github.com/refinery/refinerycms/issues/1891
+      describe "page part body" do
+        before do
+          page = Refinery::Page.create! :title => "test"
+          Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
+            page.parts.create(:title => default_page_part,
+                              :body => "<header class='regression'>test</header>",
+                              :position => index)
+          end
+        end
+
+        specify "html shouldn't be stripped" do
+          visit refinery.admin_pages_path
+          click_link "Edit this page"
+          page.should have_content("header class='regression'")
+        end
+      end
     end
 
     describe "TranslatePages" do
@@ -643,7 +710,7 @@ module Refinery
             end
           end
 
-          # see https://github.com/resolve/refinerycms/pull/1583
+          # see https://github.com/refinery/refinerycms/pull/1583
           context "when switching locales" do
             specify "dialog has correct links", :js do
               visit refinery.edit_admin_page_path(about_page)

metadata

@@ -1,19 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
 - Philip Arndt
 - Uģis Ozols
 - Rob Yurkowski
-- David Jones
-- Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
@@ -54,7 +52,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +60,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +97,6 @@ files:
 - app/models/refinery/page.rb
 - app/models/refinery/page_part.rb
 - app/presenters/refinery/page_presenter.rb
-- app/views/admin/pages/_sortable_list.html.erb
 - app/views/refinery/admin/pages/_actions.html.erb
 - app/views/refinery/admin/pages/_form.html.erb
 - app/views/refinery/admin/pages/_form_advanced_options.html.erb
@@ -111,6 +108,7 @@ files:
 - app/views/refinery/admin/pages/_page.html.erb
 - app/views/refinery/admin/pages/_page_part_field.html.erb
 - app/views/refinery/admin/pages/_records.html.erb
+- app/views/refinery/admin/pages/_save_and_continue_callback.html.erb
 - app/views/refinery/admin/pages/_sortable_list.html.erb
 - app/views/refinery/admin/pages/children.html.erb
 - app/views/refinery/admin/pages/edit.html.erb
@@ -198,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2292200110093210993
+      hash: 2294357088628806628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,10 +205,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2292200110093210993
+      hash: 2294357088628806628
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pages extension for Refinery CMS

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

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