refinerycms-pages 2.0.10 → 2.1.0

data/config/locales/zh-CN.yml

@@ -7,7 +7,7 @@ zh-CN:
     admin:
       pages_dialogs:
         page_link:
-          link_to_this_page: 页面连接
+          link_to_this_page: 页面链接
         link_to:
           insert: 插入
           your_page:
@@ -16,21 +16,21 @@ zh-CN:
             tab_name: 网站
             location: 位置
             new_window: 新窗口
-            new_window_label: 勾选这个方框使得此连接在新浏览器窗口中打开.
+            new_window_label: 勾选这个方框使得此链接在新浏览器窗口中打开.
             not_sure: 不确定放什么东西到上面的方框?
-            step1: 在网上寻找要连接去的页面.
+            step1: 在网上寻找要链接去的页面.
             step2: 在浏览器地址栏复制网页地址然后粘贴到上面的方框.
           email_address:
             tab_name: Email 地址
             subject_line_optional: 可选的主题
             body_optional: 可选的内容
             not_sure: 不确定放什么东西到上面那些方框?
-            step1_html: 输入或复制然后粘贴 (例如从您的通讯录) email 地址用来连接到上面方框的 '<strong>邮件地址</strong>'.
+            step1_html: 输入或复制然后粘贴 (例如从您的通讯录) email 地址用来链接到上面方框的 '<strong>邮件地址</strong>'.
             step2_html: 如果您想使用 <strong>预写的标题列</strong> 来编辑信息, 请使用上面的 '<strong>标题列</strong>' 方框.
             step3_html: 如果您想使用 <strong>预写的信息</strong> 来编辑信息, 请使用上面的 <strong>Email 内容</strong> 方框.
           your_resource:
             tab_name: 您的文件
-            link_to_this_resource: 连接到此文件
+            link_to_this_resource: 链接到此文件
       pages:
         delete: 永久删除此页面
         edit: 编辑此页面
@@ -45,20 +45,17 @@ zh-CN:
           create_content_section: 添加内容区
           delete_content_section: 删除内容区
         form_advanced_options:
-          toggle_advanced_options: meta 标签设定与菜单选项
           page_options: 页面选项
-          parent_page: 父业面
-          advanced_options: 高级选项
+          parent_page: 父页面
           menu_title: 菜单项名称
           custom_slug: 自定义slug
           custom_title: 自定义标题
           show_in_menu_title: 在菜单中显示
           show_in_menu_description: 在网站菜单中显示这个页面
           show_in_menu_help: 如果您想在网站菜单中去除一个页面, 不勾选这个选项. 如果您想有个可以直接访问的页面但又不想显示在菜单里, 这个很方便的选项.
-          save_as_draft: 另存为草稿
           skip_to_first_child: 跳过第一层页面
           skip_to_first_child_label: 重定向浏览者到第一个子层页.
-          skip_to_first_child_help: 这个选项使得这个页面连接到第一个页面下面, 这对组合页面在一起的时候非常有用.
+          skip_to_first_child_help: 这个选项使得这个页面链接到第一个页面下面, 这对组合页面在一起的时候非常有用.
           link_url: 重定向这个页面到其他的网站或页面
           link_url_help: 如果您想要在菜单中点这个页面就跳到其他网站或是页面的话, 在这里输入网址, 例如 http://google.com, 不然就留空
           parent_page_help: 您可以在列表中让一个页面依附在另一个页面之下. 如果您想要让这个页面为第一层页面, 就不要填写.
@@ -71,7 +68,7 @@ zh-CN:
           reorder_pages_done: 完成编排
         records:
           no_pages_yet: 这里还没有页面. 点击 "添加新页面" 去添加您的第一个页面.
-        translator_access: 您没有权限更改这种语言的页面
+        translator_access: 您没有权限来更改使用这种语言的页面
   activerecord:
     models:
       refinery/page: 页面

data/config/locales/zh-TW.yml

@@ -44,15 +44,12 @@ zh-TW:
           create_content_section: 新增內容區
           delete_content_section: 刪除內容區
         form_advanced_options:
-          toggle_advanced_options: 存取 meta 標籤設定與選單選項
           page_options: 頁面選項
           parent_page: 父頁面
-          advanced_options: 進階選項
           custom_title: 自訂標題
           show_in_menu_title: 在選單中顯示
           show_in_menu_description: 在網站選單中顯示這個頁面
           show_in_menu_help: 如果您想要將這個頁面移除您的網站選單請不要勾選這個框框. 如果您想要有個可以直接連結的頁面但又不想讓它出現在選單上, 這是個便利的功能.
-          save_as_draft: 儲存草稿
           skip_to_first_child: 略過第一層頁面
           skip_to_first_child_label: 將訪客重新導向到第一個次層頁面.
           skip_to_first_child_help: 這個選項讓這個頁面可以連結到第一個頁面之下. 當您想要分類頁面的時這會很有用.

data/config/routes.rb

@@ -1,14 +1,22 @@
 Refinery::Core::Engine.routes.draw do
   root :to => 'pages#home', :via => :get
-  post 'pages/preview'     => 'pages#preview', :as => :preview_pages
-  match 'pages/*path/preview' => 'pages#preview', :as => :preview_page,  :via => [:get, :put]
   get '/pages/:id', :to => 'pages#show', :as => :page
 
-  namespace :admin, :path => 'refinery' do
+  namespace :pages, :path => '' do
+    namespace :admin, :path => Refinery::Core.backend_route do
+      scope :path => :pages do
+        post 'preview', :to => 'preview#show', :as => :preview_pages
+        put  'preview/*path', :to => 'preview#show', :as => :preview_page
+      end
+    end
+  end
+
+  namespace :admin, :path => Refinery::Core.backend_route do
     get 'pages/*path/edit', :to => 'pages#edit'
     get 'pages/*path/children', :to => 'pages#children', :as => 'children_pages'
     put 'pages/*path', :to => 'pages#update'
     delete 'pages/*path', :to => 'pages#destroy'
+
     resources :pages, :except => :show do
       post :update_positions, :on => :collection
     end
@@ -16,8 +24,6 @@ Refinery::Core::Engine.routes.draw do
     resources :pages_dialogs, :only => [] do
       collection do
         get :link_to
-        get :test_url
-        get :test_email
       end
     end
 

data/db/seeds.rb

@@ -24,23 +24,23 @@ if Refinery::Page.where(:menu_match => "^/$").empty?
                 :body => "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>",
                 :position => 0
               })
-end
 
-if Refinery::Page.by_title("About").empty?
-  about_us_page = ::Refinery::Page.create(:title => "About")
-  about_us_page.parts.create({
-                :title => "Body",
-                :body => "<p>This is just a standard text page example. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin metus dolor, hendrerit sit amet, aliquet nec, posuere sed, purus. Nullam et velit iaculis odio sagittis placerat. Duis metus tellus, pellentesque ut, luctus id, egestas a, lorem. Praesent vitae mauris. Aliquam sed nulla. Sed id nunc vitae leo suscipit viverra. Proin at leo ut lacus consequat rhoncus. In hac habitasse platea dictumst. Nunc quis tortor sed libero hendrerit dapibus.\n\nInteger interdum purus id erat. Duis nec velit vitae dolor mattis euismod. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse pellentesque dignissim lacus. Nulla semper euismod arcu. Suspendisse egestas, erat a consectetur dapibus, felis orci cursus eros, et sollicitudin purus urna et metus. Integer eget est sed nunc euismod vestibulum. Integer nulla dui, tristique in, euismod et, interdum imperdiet, enim. Mauris at lectus. Sed egestas tortor nec mi.</p>",
-                :position => 0
-              })
-  about_us_page.parts.create({
-                :title => "Side Body",
-                :body => "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus fringilla nisi a elit. Duis ultricies orci ut arcu. Ut ac nibh. Duis blandit rhoncus magna. Pellentesque semper risus ut magna. Etiam pulvinar tellus eget diam. Morbi blandit. Donec pulvinar mauris at ligula. Sed pellentesque, ipsum id congue molestie, lectus risus egestas pede, ac viverra diam lacus ac urna. Aenean elit.</p>",
-                :position => 1
-              })
+  if Refinery::Page.by_title("About").empty?
+    about_us_page = ::Refinery::Page.create(:title => "About")
+    about_us_page.parts.create({
+                  :title => "Body",
+                  :body => "<p>This is just a standard text page example. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin metus dolor, hendrerit sit amet, aliquet nec, posuere sed, purus. Nullam et velit iaculis odio sagittis placerat. Duis metus tellus, pellentesque ut, luctus id, egestas a, lorem. Praesent vitae mauris. Aliquam sed nulla. Sed id nunc vitae leo suscipit viverra. Proin at leo ut lacus consequat rhoncus. In hac habitasse platea dictumst. Nunc quis tortor sed libero hendrerit dapibus.\n\nInteger interdum purus id erat. Duis nec velit vitae dolor mattis euismod. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse pellentesque dignissim lacus. Nulla semper euismod arcu. Suspendisse egestas, erat a consectetur dapibus, felis orci cursus eros, et sollicitudin purus urna et metus. Integer eget est sed nunc euismod vestibulum. Integer nulla dui, tristique in, euismod et, interdum imperdiet, enim. Mauris at lectus. Sed egestas tortor nec mi.</p>",
+                  :position => 0
+                })
+    about_us_page.parts.create({
+                  :title => "Side Body",
+                  :body => "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus fringilla nisi a elit. Duis ultricies orci ut arcu. Ut ac nibh. Duis blandit rhoncus magna. Pellentesque semper risus ut magna. Etiam pulvinar tellus eget diam. Morbi blandit. Donec pulvinar mauris at ligula. Sed pellentesque, ipsum id congue molestie, lectus risus egestas pede, ac viverra diam lacus ac urna. Aenean elit.</p>",
+                  :position => 1
+                })
+  end
 end
 
-(Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
+Refinery::I18n.frontend_locales.each do |lang|
   I18n.locale = lang
   {'home' => "Home",
    'page-not-found' => 'Page not found',
@@ -49,3 +49,5 @@ end
     Refinery::Page.by_title(title).each { |page| page.update_attributes(:slug => slug) }
   end
 end
+
+I18n.locale = ::Refinery::I18n.default_locale

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

@@ -30,6 +30,12 @@ Refinery::Pages.configure do |config|
   # when you create a page
   # config.use_custom_slugs = <%= Refinery::Pages.use_custom_slugs.inspect %>
 
+  # Set this to true if page slugs generated by friendly_id should be scoped by parent.
+  # If false, page slugs are global, and are, in effect, custom routes that may contain slashes.
+  # By default, these routes will be flattened to the root, using the slugged page title,
+  # and will no longer be nested as children.
+  # config.scope_slug_by_parent = <%= Refinery::Pages.scope_slug_by_parent.inspect %>
+
   # Set this to true if you want backend pages to be cached
   # config.cache_pages_backend = <%= Refinery::Pages.cache_pages_backend.inspect %>
 
@@ -41,13 +47,11 @@ Refinery::Pages.configure do |config|
 
   # config.layout_template_whitelist = <%= Refinery::Pages.layout_template_whitelist.inspect %>
 
-  # config.view_template_whitelist = <%= Refinery::Pages.view_template_whitelist.inspect %>
-
   # config.use_layout_templates = <%= Refinery::Pages.use_layout_templates.inspect %>
 
-  # config.use_view_templates = <%= Refinery::Pages.use_view_templates.inspect %>
-
   # config.page_title = <%= Refinery::Pages.page_title.inspect %>
 
   # config.absolute_page_links = <%= Refinery::Pages.absolute_page_links.inspect %>
+
+  # config.show_title_in_body = <%= Refinery::Pages.show_title_in_body.inspect %>
 end

data/lib/refinery/pages.rb

@@ -24,15 +24,11 @@ module Refinery
       end
 
       def valid_templates(*pattern)
-        [Rails.root, Refinery::Plugins.registered.pathnames].flatten.uniq.map { |p|
-          p.join(*pattern)
-        }.map(&:to_s).map { |p|
-          Dir[p]
-        }.select(&:any?).flatten.map { |f|
-          File.basename(f)
-        }.map { |p|
-          p.split('.').first
-        }
+        ([Rails.root] | Refinery::Plugins.registered.pathnames).map { |p|
+          Dir[p.join(*pattern).to_s].flatten.map { |f|
+            File.basename(f).split('.').first
+          }
+        }.flatten.uniq
       end
 
       def default_parts_for(page)

data/lib/refinery/pages/caching.rb

@@ -0,0 +1,60 @@
+module Refinery
+  module Pages
+    class Caching
+
+      attr_reader :cache_dir
+
+      def initialize(cache_dir = nil)
+        @cache_dir = cache_dir
+      end
+
+      def expire!
+        clear_caching!
+        delete_static_files!
+      end
+
+      private
+      delegate :cache, :to => Rails
+
+      def cache_dir_valid?
+        cache_dir.present? && cache_dir_path.directory?
+      end
+
+      def cache_dir_path
+        Pathname.new cache_dir.to_s
+      end
+
+      def clear_caching!
+        begin
+          cache.delete_matched(/.*pages.*/)
+        rescue NoMethodError, NotImplementedError
+          warn "**** [REFINERY] The cache store you are using is not compatible with Rails.cache#delete_matched - clearing entire cache instead ***"
+          cache.clear
+        end
+      end
+
+      def delete_static_files!
+        return unless cache_dir_valid?
+
+        delete_page_cache_directory!
+        delete_page_cache_index_file!
+      end
+
+      def delete_page_cache_directory!
+        page_cache_root.rmtree if page_cache_root.directory?
+      end
+
+      def delete_page_cache_index_file!
+        page_cache_index_file.delete if page_cache_index_file.file?
+      end
+
+      def page_cache_index_file
+        Pathname.new "#{page_cache_root}.html"
+      end
+
+      def page_cache_root
+        cache_dir_path.join 'refinery', 'cache', 'pages'
+      end
+    end
+  end
+end

data/lib/refinery/pages/configuration.rb

@@ -4,11 +4,10 @@ module Refinery
 
     config_accessor :pages_per_dialog, :pages_per_admin_index, :new_page_parts,
                     :marketable_urls, :approximate_ascii, :strip_non_ascii,
-                    :default_parts, :use_custom_slugs, :cache_pages_backend,
-                    :cache_pages_full, :layout_template_whitelist,
-                    :view_template_whitelist, :use_layout_templates,
-                    :use_view_templates, :page_title, :absolute_page_links, :types,
-                    :auto_expand_admin_tree
+                    :default_parts, :use_custom_slugs, :scope_slug_by_parent,
+                    :cache_pages_backend, :cache_pages_full, :layout_template_whitelist,
+                    :use_layout_templates, :page_title, :absolute_page_links, :types,
+                    :auto_expand_admin_tree, :show_title_in_body
 
     self.pages_per_dialog = 14
     self.pages_per_admin_index = 20
@@ -18,12 +17,16 @@ module Refinery
     self.strip_non_ascii = false
     self.default_parts = ["Body", "Side Body"]
     self.use_custom_slugs = false
+    self.scope_slug_by_parent = true
     self.cache_pages_backend = false
     self.cache_pages_full = false
     self.layout_template_whitelist = ["application"]
-    self.view_template_whitelist = ["home", "show"]
+    class << self
+      def layout_template_whitelist
+        Array(config.layout_template_whitelist).map(&:to_s)
+      end
+    end
     self.use_layout_templates = false
-    self.use_view_templates = false
     self.page_title = {
       :chain_page_title => false,
       :ancestors => {
@@ -37,6 +40,7 @@ module Refinery
         :wrap_if_not_chained => false
       }
     }
+    self.show_title_in_body = true
     self.absolute_page_links = false
     self.types = Types.registered
     self.auto_expand_admin_tree = true

data/lib/refinery/pages/engine.rb

@@ -1,7 +1,7 @@
 module Refinery
   module Pages
     class Engine < ::Rails::Engine
-      include Refinery::Engine
+      extend Refinery::Engine
 
       isolate_namespace Refinery
       engine_name :refinery_pages
@@ -14,26 +14,25 @@ module Refinery
       end
 
       after_inclusion do
-        ::ApplicationController.send :include, Refinery::Pages::InstanceMethods
-        Refinery::AdminController.send :include, Refinery::Pages::Admin::InstanceMethods
+        Refinery.include_once(::ApplicationController, Refinery::Pages::InstanceMethods)
+        Refinery.include_once(Refinery::AdminController, Refinery::Pages::Admin::InstanceMethods)
       end
 
-      initializer "register refinery_pages plugin" do
+      initializer "refinery.pages register plugin" do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = 'refinery_pages'
-          plugin.version = %q{2.0.0}
-          plugin.menu_match = %r{refinery/page(_part|s_dialog)?s$}
+          plugin.menu_match = %r{refinery/page(_part|s_dialog)?s(/preview)?$}
           plugin.activity = {
             :class_name => :'refinery/page',
-            :nested_with => [:uncached_nested_url],
+            :nested_with => [:nested_url],
             :use_record_in_nesting => false
           }
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_pages_path }
         end
       end
 
-      initializer "append marketable routes", :after => :set_routes_reloader_hook do
+      initializer "refinery.pages append marketable routes", :after => :set_routes_reloader_hook do
         append_marketable_routes if Refinery::Pages.marketable_urls
       end
 

data/lib/refinery/pages/instance_methods.rb

@@ -10,8 +10,8 @@ module Refinery
       def error_404(exception=nil)
         if (@page = ::Refinery::Page.where(:menu_match => "^/404$").includes(:parts).first).present?
           # render the application's custom 404 page with layout and meta.
-          if self.respond_to? :render_with_templates?
-            render_with_templates? :status => 404
+          if self.respond_to? :render_with_templates?, true
+            render_with_templates? @page, :status => 404
           else
             render :template => '/refinery/pages/show', :formats => [:html], :status => 404
           end
@@ -23,22 +23,15 @@ module Refinery
 
       # Compiles the default menu.
       def refinery_menu_pages
-        ::Refinery::Menu.new(::Refinery::Page.fast_menu)
+        Menu.new Page.fast_menu
       end
 
     protected
       def render_with_presenters(*args)
-        present(@page) unless admin? or @meta.present?
+        present @page unless admin? || @meta
         render_without_presenters(*args)
       end
 
-    private
-      def store_current_location!
-        return super if admin?
-
-        session[:website_return_to] = refinery.url_for(@page.url) if @page && @page.persisted?
-      end
-
     end
   end
 end

data/lib/refinery/pages/render_options.rb

@@ -0,0 +1,27 @@
+module Refinery
+  module Pages
+    module RenderOptions
+
+      def render_options_for_template(page)
+        render_options = {}
+        if Refinery::Pages.use_layout_templates && page.layout_template.present?
+          render_options[:layout] = page.layout_template
+        end
+
+        template = page.link_url == "/" ? "home" : "show"
+
+        render_options[:template] = "refinery/pages/#{page.view_template.presence || template}"
+
+        render_options
+      end
+
+      def render_with_templates?(page = @page, render_options = {})
+        render_options.update render_options_for_template(page)
+        render render_options
+      end
+
+      protected :render_options_for_template, :render_with_templates?
+
+    end
+  end
+end

data/lib/refinery/pages/tab.rb

@@ -1,14 +1,20 @@
 module Refinery
   module Pages
 
-    attr_accessor :tabs
-
     def self.tabs
       @tabs ||= []
     end
 
+    def self.tabs_for_template(template)
+      return tabs unless template
+
+      tabs.select do |tab|
+        tab.templates.include?('all') || tab.templates.include?(template)
+      end
+    end
+
     class Tab
-      attr_accessor :name, :partial
+      attr_accessor :name, :partial, :templates
 
       def self.register(&block)
         tab = self.new
@@ -17,12 +23,17 @@ module Refinery
 
         raise "A tab MUST have a name!: #{tab.inspect}" if tab.name.blank?
         raise "A tab MUST have a partial!: #{tab.inspect}" if tab.partial.blank?
+
+        tab.templates = %w[all] if tab.templates.blank?
+        tab.templates = Array(tab.templates)
+
+        tab
       end
 
     protected
 
       def initialize
-        ::Refinery::Pages.tabs << self # add me to the collection of registered page tabs
+        Refinery::Pages.tabs << self # add me to the collection of registered page tabs
       end
     end