alchemy_cms 2.2.rc8 → 2.2.rc11

data/app/models/alchemy/picture.rb

@@ -23,7 +23,7 @@ module Alchemy
       :name
     )
 
-    stampable
+    stampable(:stamper_class_name => 'Alchemy::User')
 
     def self.find_paginated(params, per_page)
       Picture.where("name LIKE '%#{params[:query]}%'").page(params[:page] || 1).per(per_page).order(:name)

data/app/models/alchemy/user.rb

@@ -2,7 +2,7 @@ module Alchemy
   class User < ActiveRecord::Base
 
     model_stamper
-    stampable
+    stampable(:stamper_class_name => 'Alchemy::User')
     acts_as_authentic do |c|
       c.transition_from_restful_authentication = true
       c.logged_in_timeout = Config.get(:auto_logout_time).minutes

data/app/sweepers/alchemy/content_sweeper.rb

@@ -1,16 +1,31 @@
 module Alchemy
   class ContentSweeper < ActionController::Caching::Sweeper
-    observe Element
 
-    def after_update(element)
-      expire_cache_for(element.contents)
+    observe Element, Page
+
+    def after_create(object)
+      if object.class.to_s == "Alchemy::Page"
+        expire_contents_displayed_as_select(object)
+      end
+    end
+
+    def after_update(object)
+      if object.class.to_s == "Alchemy::Element"
+        expire_cache_for(object.contents)
+      elsif object.class.to_s == "Alchemy::Page"
+        expire_contents_displayed_as_select(object)
+      end
     end
 
-    def after_destroy(element)
-      expire_cache_for(element.contents)
+    def after_destroy(object)
+      if object.class.to_s == "Alchemy::Element"
+        expire_cache_for(object.contents)
+      elsif object.class.to_s == "Alchemy::Page"
+        expire_contents_displayed_as_select(object)
+      end
     end
 
-    private
+  private
 
     def expire_cache_for(contents)
       contents.each do |content|
@@ -18,5 +33,13 @@ module Alchemy
       end
     end
 
+    # Expires all content editor cache fragments that have a :display_as => :select setting
+    def expire_contents_displayed_as_select(page)
+      return unless page.urlname_changed? || page.name_changed?
+      Content.essence_texts.all.select { |c| c.settings[:display_as] == 'select'}.each do |content|
+        expire_fragment(content)
+      end
+    end
+
   end
 end

data/app/views/alchemy/admin/attachments/new.html.erb

@@ -2,7 +2,7 @@
   <%= render(
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
-      :file_types => configuration(:uploader)[:allowed_filetypes][:attachments],
+      :file_types => configuration(:uploader)['allowed_filetypes']['attachments'],
       :file_types_description => t('documents'),
       :model_name => 'attachment',
       :item_type => t('files')

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

@@ -66,22 +66,22 @@
 
 <%- if @page_root -%>
 
-<h2 id="sitemap_heading">
-  <span class="page_name"><%= t('Name') %></span>
-  <span class="page_infos"><%= t('Status') %></span>
-</h2>
-
-<div id="bottom_panel" style="display: none">
+<div id="sort_panel" style="display: none">
   <div class="info">
     <%= render_icon('info') %>
     <%= t('explain_sitemap_dragndrop_sorting') %>
   </div>
-  <div id="bottom_buttons">
+  <div class="buttons">
     <%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
     <%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
   </div>
 </div>
 
+<h2 id="sitemap_heading">
+  <span class="page_name"><%= t('Name') %></span>
+  <span class="page_infos"><%= t('Status') %></span>
+</h2>
+
 <%= render :partial => 'sitemap' %>
 
 <%- else -%>

data/app/views/alchemy/admin/pages/sort.js.erb

@@ -1,6 +1,7 @@
 (function($) {
   $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
-  $('#bottom_panel').show();
+  $('#sort_panel').show();
+  $('#sitemap_heading').css({'padding-top': 82});
   Alchemy.PageSorter.init();
   Alchemy.pleaseWaitOverlay(false);
 })(jQuery);

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -44,10 +44,10 @@
   Alchemy.Uploader.init({
     upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
     post_params: <%= post_params.html_safe %>,
-    file_size_limit: <%= configuration(:uploader)[:file_size_limit] || 100 -%>,
+    file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
     file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
     file_types_description: "<%= file_types_description %>",
-    file_upload_limit: <%= configuration(:uploader)[:upload_limit] || 50 -%>,
+    file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
     locale: "<%= ::I18n.locale || 'en' %>"
   });
 

data/app/views/alchemy/admin/pictures/new.html.erb

@@ -2,7 +2,7 @@
   <%= render(
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
-      :file_types => configuration(:uploader)[:allowed_filetypes][:pictures],
+      :file_types => configuration(:uploader)['allowed_filetypes']['pictures'],
       :file_types_description => t('images'),
       :model_name => 'picture',
       :item_type => t('images')

data/app/views/alchemy/essences/_essence_picture_tools.html.erb

@@ -23,11 +23,11 @@
     :options => options
   ),
   {
-    :title => t('swap_image'),
+    :title => (content.ingredient ? t('swap_image') : t('insert_image')),
     :size => '720x580',
     :resizable => "true"
   },
-  :title => t('swap_image')
+  :title => (content.ingredient ? t('swap_image') : t('insert_image'))
 ) %>
 
 <%= link_to_function(

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -1,8 +1,8 @@
 <%- cache(content) do -%>
 <div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
-  
+
   <%- if content.settings[:display_as] == "checkbox" -%>
-  
+
   <%= check_box_tag(
     content.form_field_name,
     "1",
@@ -14,9 +14,9 @@
   <label for="<%= content.form_field_id %>" style="display: inline">
     <%= render_content_name(content) %>
   </label>
-  
+
   <%- elsif content.settings[:display_as] == "select" -%>
-  
+
   <label><%= render_content_name(content) %></label>
 
   <%- if options[:select_values].nil? -%>
@@ -44,9 +44,9 @@
     }
   ) %>
   <%- end -%>
-  
+
   <%- else -%>
-  
+
   <label>
     <%= render_content_name(content) %>
     <%= link_to_confirmation_window(
@@ -63,14 +63,14 @@
     :class => ["thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}", html_options[:class]].join(' '),
     :style => html_options[:style]
   ) %>
-  
+
   <%- if content.settings[:linkable] -%>
-  
+
   <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
   <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
   <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
   <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
-  
+
   <span class="linkable_text_essence_tools">
     <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
       <span class="icon link"></span>
@@ -79,9 +79,9 @@
       <span class="icon unlink"></span>
     </a>
   </span>
-  
+
   <%- end -%>
-  
+
   <%- end -%>
 
 </div>

data/app/views/alchemy/navigation/_link.html.erb

@@ -1,20 +1,20 @@
-<%- if page.redirects_to_external? -%>
-<%= link_to(
-  h(page.name),
-  page.urlname,
-  :title => (options[:show_title] == true ? page.title : nil),
-  :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil
-) -%>
-  Alchemy::Page.find_
-<%- else -%>
-<%= link_to(
-  h(page.name),
-  @preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
-  {
-    :class => (page_active?(page) ? 'active' : nil),
-    :title => (options[:show_title] ? page.title : nil),
-    :lang => page.language_code,
-    'data-page-id' => page.id
-  }
-) -%>
-<%- end -%>
+<% if page.redirects_to_external? -%>
+  <%= link_to(
+    h(page.name),
+    page.urlname,
+    :title => options[:show_title] == true ? page.title : nil,
+    :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
+    :class => external_page_css_class(page)
+  ) -%>
+<% else -%>
+  <%= link_to(
+    h(page.name),
+    @preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
+    {
+      :class => (page_active?(page) ? 'active' : nil),
+      :title => (options[:show_title] ? page.title : nil),
+      :lang => page.language_code,
+      'data-page-id' => page.id
+    }
+  ) -%>
+<% end -%>

data/app/views/alchemy/navigation/_renderer.html.erb

@@ -1,23 +1,37 @@
-<%- unless pages.blank? -%>
-<ul class="navigation_level_<%= pages.first.level - 1 %>">
-<%- pages.each do |page| -%>
-  <%- position = 'first' if page == pages.to_a.first -%>
-  <%- position = 'last' if page == pages.to_a.last -%>
-  <li class="<%= page.urlname -%> <%= position -%><%= " active" if page_active?(page) %>">
-    <%= render :partial => options[:navigation_link_partial], :object => page, :locals => {:page => page, :options => options} -%>
-    <%- options[:from_page] = page -%>
-    <%- if options[:reverse_children] -%>
-      <%- options[:reverse] = true -%>
-    <%- end -%>
-    <%- if options[:show_nonactive] -%>
-    <%= render_navigation(options) if (options[:submenu]) -%>
-    <%- else -%>
-    <%= render_navigation(options) if ((options[:submenu] && page_active?(page)) || options[:all_sub_menues]) -%>
-    <%- end -%>
-  </li>
-  <%- unless options[:spacer].empty? -%>
-  <%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
-  <%- end -%>
-<%- end -%>
-</ul>
-<%- end -%>
+<% unless pages.blank? -%>
+  <%= content_tag(
+    'ul',
+    :class => html_options[:class] || "navigation level_#{pages.first.level - 1}",
+    :id => html_options[:id]
+  ) do %>
+    <% pages.each do |page| -%>
+      <% position = 'first' if page == pages.to_a.first -%>
+      <% position = 'last' if page == pages.to_a.last -%>
+      <%= content_tag(
+        'li',
+        :class => [page.urlname, position, page_active?(page) ? 'active' : nil].compact.join(' ')
+      ) do %>
+        <%= render(
+          :partial => options[:navigation_link_partial],
+          :object => page,
+          :locals => {
+            :page => page,
+            :options => options
+          }
+        ) -%>
+        <% options[:from_page] = page -%>
+        <% if options[:reverse_children] -%>
+          <%- options[:reverse] = true -%>
+        <% end -%>
+        <% if options[:show_nonactive] -%>
+        <%= render_navigation(options) if options[:submenu] -%>
+        <% else -%>
+        <%= render_navigation(options) if (options[:submenu] && page_active?(page)) || options[:all_sub_menues] -%>
+        <% end -%>
+      <% end -%>
+      <% unless options[:spacer].empty? -%>
+        <%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
+      <% end -%>
+    <% end -%>
+  <% end %>
+<% end -%>

data/config/alchemy/config.yml

@@ -1,69 +1,101 @@
 # encoding: UTF-8
-# 
+#
 # = Configuration
 #
 # == This is the global Alchemy configuration file
+#
 # Please override your apps settings in your config/alchemy/config.yml file.
 # You can use a handy rake task to generate it.
 #
 #   rake alchemy:app_structure:create:config
 
+# === Auto Log Out Time
+#
 # The amount of time of inactivity in minutes after which the user is kicked out of his current session.
-# Only active in production environment!!!
-:auto_logout_time: 30
+#
+# INFO: This is only active in production environments
+#
+auto_logout_time: 30
 
-# === Redirect options
-# redirect_index: You can set to redirect (an 301 permanent, for all you SEO geeks ^_^) to first child page (typically the homepage) the index/intro page if it's not visible.
-# So you don't get an 404 error if the language root page is not visible.
-# redirect_to_public_child: Alchemy redirects to the first public child page found, if a page is not visible.
-:redirect_index: true
-:redirect_to_public_child: true
+# === Redirect Options
+#
+#   redirect_index            [Boolean]   # You can disable the redirect to first child page for not public pages.
+#   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not visible.
+#
+redirect_index: true
+redirect_to_public_child: true
 
-# Enabling the Ferret fulltext search engine.
+# === Enable the Ferret fulltext search engine
+#
 # Tip! For best performance and stability install a crontab that reindexes ferrets search index periodly.
-# Example: cd ~/html/alchemy/current && RAILS_ENV=production rake ferret:rebuild_index
-:ferret: true
+#
+# ==== Example:
+#
+#   cd ~/html/alchemy/current && RAILS_ENV=production rake ferret:rebuild_index
+#
+ferret: true
 
-# === Pagecaching
+# === Page caching
+#
 # Enable/Disable pagecaching globally.
+#
 # Hint: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
-:cache_pages: true
+#
+cache_pages: true
 
 # === Sitemap
+#
 # Alchemy renders a nice HTML (<ul><li> style) and XML (Google conform!) Sitemap for you.
+#
 # Just place a sitemap element for a page layout in your page_layouts.yml file. Alchemy does the rest.
+#
 # ==== Options:
-# show_root: Show language root page in sitemap?
-# show_flag: enables the Checkbox in Page#update overlay. So your customer can set the visibilit of pages in the sitemap.
-:sitemap: 
-  :show_root: true
-  :show_flag: false
+#
+#   show_root [Boolean] # Show language root page in sitemap?
+#   show_flag [Boolean] # Enables the Checkbox in Page#update overlay. So your customer can set the visibilit of pages in the sitemap.
+#
+sitemap:
+  show_root: true
+  show_flag: false
 
 # === URL nesting
+#
 # By default Alchemy does not nest page urls respectivley to their page tree position.
+#
 # Enable +url_nesting+ to get nested urls.
+#
 # ==== Example of a nested url:
+#
 # +http://homepage.com/company/history/the-early-years+
+#
 # Alchemy supports url nesting up to three levels deep. We think that's more then enough,
 # because URLs like this are possible:
+#
 # +http://homepage.com/en/2011/12/08/my-post
+#
 url_nesting: false
 
 # === Picture rendering settings
+#
 # Alchemy uses Fleximage and RMagick to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
+#
 # See https://github.com/Squeegy/fleximage for further infos.
+#
 # ==== Options:
-# output_image_jpg_quality: If rendered as JPG this is the quality setting for it.
-# preprocess_image_resize: Large images are downsized after upload to save diskspace.
-# image_store_format: Masterimage storage format. Images are rendered from this master image, so a lossless format (png) is strongly recommended.
-# image_output_format: Globally image output format setting.
-# TIP: You can always override the output format in the options of your Essence. I.e. {:format => :gif}
-:output_image_jpg_quality: 85
-:preprocess_image_resize: 1000x1000
-:image_store_format: png
-:image_output_format: jpg
+#
+#   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
+#   preprocess_image_resize   [String]        # I.E.: 1000x1000. If you are limited on diskspace use this option to downsize large images to that value. (Default nil)
+#   image_store_format        [String]        # The storage format of the master image. All images get rendered from this master image, so a lossless format (png) is strongly recommended. (Default png)
+#   image_output_format       [String]        # The global image output format setting.
+#
+# TIP: You can always override the output format in the options of your Essence. I.E. {:format => :gif}
+#
+output_image_jpg_quality: 85
+preprocess_image_resize:
+image_store_format: png
+image_output_format: jpg
 
-# Default language for the seeder.
+# This is the default language for the seeder.
 default_language:
   code: de
   name: Deutsch
@@ -71,73 +103,83 @@ default_language:
   frontpage_name: Intro
 
 # === Mailer Settings:
-# 
+#
 # To send Mails via contact forms you can create your form fields here and set which fields are to be validated.
-# 
+#
 # === Validating fields:
-# 
+#
 # Pass the field name as symbol and a message_id (will be translated) to :validate_fields:
-# 
+#
 # ==== Options:
-# 
+#
 #   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
 #   fields:                     [Array]  # An Array of fieldnames.
 #   validate_fields:            [Array]  # An Array of fieldnames to be validated on presence.
-# 
+#
 # ==== Translating validation messages:
-# 
+#
 # The validation messages are passed through ::I18n.t so you can translate it in your language yml file.
-# 
+#
 # ==== Example:
-# 
-#   de:  
+#
+#   de:
 #     activemodel:
 #       attributes:
 #         alchemy/message:
 #           firstname: Vorname
-# 
-:mailer:
-  :page_layout_name: contact
-  :forward_to_page: false
-  :mail_success_page: thanks
-  :mail_from: your.mail@your-domain.com
-  :mail_to: your.mail@your-domain.com
-  :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
-  :validate_fields: [lastname, email]
+#
+mailer:
+  page_layout_name: contact
+  forward_to_page: false
+  mail_success_page: thanks
+  mail_from: your.mail@your-domain.com
+  mail_to: your.mail@your-domain.com
+  fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
+  validate_fields: [lastname, email]
 
 # === User roles
+#
 # You can add own user roles. To set permissions for this roles please add an authorization_rules.rb file in your config folder.
 # Further documentation for the auth system used please visit:
+#
 # https://github.com/stffn/declarative_authorization/blob/master/README.rdoc
-# 
-# ==== Translating Userroles
+#
+# ==== Translating User roles
+#
 # Userroles can be translated inside your the language yml file under:
+#
 #   alchemy:
 #     user_roles:
 #       rolename: Name of the role
-:user_roles: [registered, author, editor, admin]
+#
+user_roles: [registered, author, editor, admin]
 
 # === Uploader Settings
-#   upload_limit: Integer       Set an amount of files upload limit of files which can be uploaded at once. Set 0 for unlimited.
-#   file_size_limit: Integer    Set a file size limit in megabytes for a per file limit.
-# Allow filetypes to upload.
-# Pass * to allow all kind of files.
-:uploader:
-  :upload_limit: 50
-  :file_size_limit: 100
-  :allowed_filetypes:
-    :pictures: [jpg, jpeg, gif, png, psd, pdf]
-    :attachments: ['*']
+#
+#   upload_limit       [Integer]    # Set an amount of files upload limit of files which can be uploaded at once. Set 0 for unlimited.
+#   file_size_limit*   [Integer]    # Set a file size limit in mega bytes for a per file limit.
+#
+# *) Allow filetypes to upload. Pass * to allow all kind of files.
+#
+uploader:
+  upload_limit: 50
+  file_size_limit: 100
+  allowed_filetypes:
+    pictures: [jpg, jpeg, gif, png, psd, pdf]
+    attachments: ['*']
 
 # === Link Target Options
+#
 # Values for the link target selectbox inside the page link overlay.
 # The value gets attached as a data-link-target attribute to the link.
-# 
+#
 # == Example:
+#
 # Open all links set to overlay inside an jQuery UI Dialog Window.
-# 
+#
 #   jQuery(a[data-link-target="overlay"]).dialog();
-:link_target_options: [blank]
+#
+link_target_options: [blank]
 
 # Should pages that redirect to an external url open the link in a new tab/window?
-:open_external_links_in_new_tab: true
+open_external_links_in_new_tab: true