alchemy_cms 2.6.0.rc5 → 2.6.0

data/app/helpers/alchemy/pages_helper.rb

@@ -15,82 +15,39 @@ module Alchemy
       content.essence.caption
     end
 
-    # == Helper for rendering language switches
+    # Renders links to language root pages of all published languages.
     #
-    # Renders links to all public language root pages
-    #
-    # === Options:
-    #
-    #   :linkname => :name,
-    #   :spacer => "",
-    #   :link_to_public_child => configuration(:redirect_to_public_child),
-    #   :link_to_page_with_layout => nil,
-    #   :show_title => true,
-    #   :reverse => false,
-    #   :as_select_box => false,
-    #   :show_flags => false
+    # @option options linkname [String] ('name') Renders name/code of language, or I18n translation for code.
+    # @option options show_title [Boolean] (true) Renders title attributes for the links.
+    # @option options spacer [String] ('') Renders the passed spacer string. You can also overwrite the spacer partial: "alchemy/language_links/_spacer".
+    # @option options reverse [Boolean] (false) Reverses the ordering of the links.
     #
+    def language_links(options={})
+      options = {
+        linkname: 'name',
+        show_title: true,
+        spacer: '',
+        reverse: false
+      }.merge(options)
+      languages = Language.published.with_language_root.order("name #{options[:reverse] ? 'DESC' : 'ASC'}")
+      return nil if languages.count < 2
+      render(
+        partial: "alchemy/language_links/language",
+        collection: languages,
+        spacer_template: "alchemy/language_links/spacer",
+        locals: {languages: languages, options: options}
+      )
+    end
+
+    def language_switches(options={})
+      ActiveSupport::Deprecation.warn("Used deprecated language_switches helper. Please use language_links instead.")
+      language_links(options)
+    end
+
     def language_switcher(options={})
-      default_options = {
-        :linkname => :name,
-        :spacer => "",
-        :link_to_public_child => configuration(:redirect_to_public_child),
-        :link_to_page_with_layout => nil,
-        :show_title => true,
-        :reverse => false,
-        :as_select_box => false,
-        :show_flags => false
-      }
-      options = default_options.merge(options)
-      if multi_language?
-        language_links = []
-        pages = (options[:link_to_public_child] == true) ? Page.from_current_site.language_roots : Page.from_current_site.public_language_roots
-        return nil if (pages.blank? || pages.length == 1)
-        pages.each_with_index do |page, i|
-          if (options[:link_to_page_with_layout] != nil)
-            page_found_by_layout = Page.from_current_site.where(:page_layout => options[:link_to_page_with_layout].to_s, :language_id => page.language_id).first
-          end
-          page = page_found_by_layout || page
-          page = (options[:link_to_public_child] ? (page.first_public_child.blank? ? nil : page.first_public_child) : nil) if !page.public?
-          if !page.blank?
-            active = session[:language_id] == page.language.id
-            linkname = page.language.label(options[:linkname])
-            if options[:as_select_box]
-              language_links << [linkname, show_page_url(:urlname => page.urlname, :lang => page.language.code)]
-            else
-              language_links << link_to(
-                "#{content_tag(:span, '', :class => "flag") if options[:show_flags]}#{ content_tag(:span, linkname)}".html_safe,
-                alchemy.show_page_path(:urlname => page.urlname, :lang => page.language.code),
-                :class => "#{(active ? 'active ' : nil)}#{page.language.code} #{(i == 0) ? 'first' : (i==pages.length-1) ? 'last' : nil}",
-                :title => options[:show_title] ? Alchemy::I18n.t("alchemy.language_links.#{page.language.code}.title", :default => page.language.name) : nil
-              )
-            end
-          end
-          # when last iteration and we have just one language_link,
-          # we dont need to render it.
-          if (i==pages.length-1) && language_links.length == 1
-            return nil
-          end
-        end
-        return nil if language_links.empty? || language_links.length == 1
-        language_links.reverse! if options[:reverse]
-        if options[:as_select_box]
-          return select_tag(
-            'language',
-            options_for_select(
-              language_links,
-              show_page_url(:urlname => @page.urlname, :lang => @page.language.code)
-            ),
-            :onchange => "window.location=this.value"
-          )
-        else
-          raw(language_links.join(options[:spacer]))
-        end
-      else
-        nil
-      end
+      ActiveSupport::Deprecation.warn("Used deprecated language_switcher helper. Please use language_links instead.")
+      language_links(options)
     end
-    alias_method :language_switches, :language_switcher
 
     # Renders the layout from @page.page_layout. File resists in /app/views/page_layouts/_LAYOUT-NAME.html.erb
     def render_page_layout(options={})

data/app/models/alchemy/attachment.rb

@@ -91,8 +91,6 @@ module Alchemy
       end
     end
 
-  private
-
     def sanitized_filename
       parts = self.file_name.split('.')
       sfx = parts.pop

data/app/models/alchemy/content.rb

@@ -121,7 +121,7 @@ module Alchemy
 
       # Returns all content descriptions from elements.yml
       def descriptions
-        @descriptions ||= Element.descriptions.collect { |e| e['contents'] }.flatten.compact
+        Element.descriptions.collect { |e| e['contents'] }.flatten.compact
       end
 
       def normalize_essence_type(essence_type)

data/app/models/alchemy/language.rb

@@ -31,6 +31,7 @@ module Alchemy
     before_save :remove_old_default, :if => proc { |m| m.default_changed? && m != Language.get_default }
 
     scope :published, where(:public => true)
+    scope :with_language_root, joins(:pages).where("alchemy_pages" => {language_root: true})
 
     # multi-site support
     scope :on_site, lambda { |s| s.present? ? where(site_id: s) : scoped }

data/app/models/alchemy/page.rb

@@ -252,15 +252,15 @@ module Alchemy
       folded_page.folded
     end
 
-    # Returns a Hash of attributes describing the status of the Page.
+    # Returns a Hash describing the status of the Page.
     #
     def status
-      combined_status = {}
-      combined_status[:visible] = self.visible?
-      combined_status[:public] = self.public?
-      combined_status[:locked] = self.locked?
-      combined_status[:restricted] = self.restricted?
-      return combined_status
+      {
+        visible: visible?,
+        public: public?,
+        locked: locked?,
+        restricted: restricted?
+      }
     end
 
     # Returns the translated status for given status type.
@@ -268,7 +268,7 @@ module Alchemy
     # @param [Symbol] status_type
     #
     def status_title(status_type)
-      I18n.t(self.send(status_type), :scope => "page_states.#{status_type}")
+      I18n.t(self.status[status_type].to_s, scope: "page_states.#{status_type}")
     end
 
     def has_controller?

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

@@ -20,12 +20,14 @@
     <%= render 'alchemy/admin/partials/remote_search_form' %>
   </div>
   <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+    <% if any_tags = Alchemy::Attachment.tag_counts.any? %>
     <div id="library_sidebar">
       <div id="tag_list">
         <%= render 'tag_list' %>
       </div>
     </div>
-    <div id="overlay_file_list">
+    <% end %>
+    <div id="overlay_file_list" class="<%= any_tags ? 'with_tag_list' : nil %>">
       <%= render 'overlay_file_list' %>
     </div>
   </div>

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

@@ -4,7 +4,7 @@
     <%= _t(:no_files_in_archive) %>
   </div>
 <% else %>
-  <ul class="with_padding">
+  <ul>
     <%= render :partial => 'file_to_assign', :collection => @attachments %>
   </ul>
   <%= paginate @attachments, :remote => true %>

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

@@ -1,31 +1,29 @@
 <% p = params.dup %>
-<% if Alchemy::Attachment.tag_counts.any? %>
-  <h2><%= _t("Filter by tag") %></h2>
-  <%= js_filter_field '#tag_list li' %>
-  <ul>
-    <% Alchemy::Attachment.tag_counts.each do |t| %>
-      <% attachment_tags = filtered_by_tag?(t) ? tag_filter(remove: t) : tag_filter(add: t) %>
-      <%= content_tag 'li', name: t.name, class: p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
-        <%= link_to(
-          "#{t.name} (#{t.count})",
-          url_for(
-            p.delete_if { |k, v| k == "page" }.merge(
-              action: 'index',
-              tagged_with: attachment_tags
-            )
-          ),
-          remote: request.xhr?,
-          class: 'please_wait'
-        ) %>
-      <% end %>
+<h2><%= _t("Filter by tag") %></h2>
+<%= js_filter_field '#tag_list li' %>
+<ul>
+  <% Alchemy::Attachment.tag_counts.each do |t| %>
+    <% attachment_tags = filtered_by_tag?(t) ? tag_filter(remove: t) : tag_filter(add: t) %>
+    <%= content_tag 'li', name: t.name, class: p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
+      <%= link_to(
+        "#{t.name} (#{t.count})",
+        url_for(
+          p.delete_if { |k, v| k == "page" }.merge(
+            action: 'index',
+            tagged_with: attachment_tags
+          )
+        ),
+        remote: request.xhr?,
+        class: 'please_wait'
+      ) %>
     <% end %>
-  </ul>
-  <% if p[:tagged_with].present? %>
-    <%= link_to(
-      render_icon('delete-small') + _t('Remove tag filter'),
-      url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
-      remote: request.xhr?,
-      class: 'button small with_icon please_wait'
-    ) %>
   <% end %>
+</ul>
+<% if p[:tagged_with].present? %>
+  <%= link_to(
+    render_icon('delete-small') + _t('Remove tag filter'),
+    url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+    remote: request.xhr?,
+    class: 'button small with_icon please_wait'
+  ) %>
 <% end %>

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

@@ -1,3 +1,4 @@
+<% any_tags = Alchemy::Attachment.tag_counts.any? %>
 <%= toolbar(
   buttons: [
     {
@@ -15,12 +16,14 @@
     }
   ]
 ) %>
-<div id="archive_all" class="with_tag_filter">
+<div id="archive_all" class="<%= any_tags ? 'with_tag_filter' : nil %>">
   <%= resources_header %>
   <%= render partial: 'files_list' %>
+  <% if any_tags %>
   <div id="library_sidebar">
     <div id="tag_list" class="<%= params[:tagged_with].present? ? 'filtered' : '' %>">
       <%= render partial: 'tag_list' %>
     </div>
   </div>
+  <% end %>
 </div>

data/app/views/alchemy/admin/elements/_elements_select.html.erb

@@ -1,9 +1,9 @@
 <%= select_tag(
   "element_from_page_#{@page_id}_to_link",
-  options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text, "##{m.dom_id}"] }),
-  :prompt => _t(:choose_element_to_link),
-  :class => "elements_from_page_selector alchemy_selectbox",
-  :onchange => "jQuery('#page_anchor').val(value)",
-  :title => _t(:choose_element_as_target),
-  :autofocus => true
+  options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text.html_safe, "##{m.dom_id}"] }),
+  prompt: _t(:choose_element_to_link),
+  class: "elements_from_page_selector alchemy_selectbox",
+  onchange: "jQuery('#page_anchor').val(value)",
+  title: _t(:choose_element_as_target),
+  autofocus: true
 ) %>

data/app/views/alchemy/admin/elements/list.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-  var close = $('<a class="close_elements_from_page_selector" title="<%= _t(:remove) -%>">–</a>');
+  var close = $('<a class="close_elements_from_page_selector" title="<%= _t(:remove) -%>"/>');
   $('#elements_for_page_<%= @page_id -%>').html('<%= escape_javascript(render("elements_select")) %>');
   $('#elements_for_page_<%= @page_id -%>').append(close);
 

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

@@ -89,7 +89,7 @@
     </div>
     <div class="sitemap_sitename">
     <%- if page.redirects_to_external? -%>
-      <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
+      <span class="sitemap_pagename_link inactive"><%= page.name %></span>
       <span class="redirect_url" title="<%= h page.urlname %>">
         &raquo; <%= _t('Redirects to') %>:
         <%= h page.urlname %>

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

@@ -33,7 +33,7 @@
             :url => @url_prefix + page_for_links.urlname
           },
           :title => _t('page_for_links.choose_page', :name => page_for_links.name),
-          :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
+          :class => "sitemap_pagename_link"
         }) %>
       <% end %>
     </div>

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

@@ -26,7 +26,7 @@
 <div class="toolbar_buttons">
   <div class="button_with_label">
     <%= form_tag alchemy.unlock_admin_page_path(@page, :redirect_to => @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), :id => 'unlock_page_form' do %>
-      <button class="icon_button" title="<%= _t(:explain_unlocking) %>">
+      <button class="icon_button" title="<%= _t(:explain_unlocking) %>" data-alchemy-hotkey="alt-x">
         <%= render_icon('close') %>
       </button>
       <label><%= _t(:unlock_page) %></label>
@@ -51,7 +51,8 @@
         :size => @page.layoutpage? ? '410x150' : '410x650'
       },
       :class => :icon_button,
-      :title => _t(:edit_page_properties)
+      :title => _t(:edit_page_properties),
+      'data-alchemy-hotkey' => 'alt-e'
     ) %>
     <label><%= _t(:page_properties) %></label>
   </div>
@@ -111,6 +112,7 @@
         {
           title: '<%= _t("New Element") %>',
           label: '<%= _t("New Element") %>',
+          hotkey: 'alt-n',
           iconClass: 'new_element',
           onClick: function() {
             Alchemy.openWindow('<%= alchemy.new_admin_element_path(:page_id => @page.id) %>', {

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

@@ -34,7 +34,6 @@
       :style => 'float: none'
     ) %>
   </div>
-  <%= content_tag :h3, _t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
   <div id="pictures">
   <% if @pictures.blank? and @recent_pictures.blank? and params[:query].nil? %>
     <div class="info">

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

@@ -7,7 +7,8 @@
     options_for_select([
       [_t(:all_pictures), ''],
       [_t(:last_upload_only), 'last_upload'],
-      [_t(:recently_uploaded_only), 'recent']
+      [_t(:recently_uploaded_only), 'recent'],
+      [_t(:without_tag), 'without_tag']
     ], params[:filter]),
     :data => { :remote => !!request.xhr? },
     :class => 'alchemy_selectbox'

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

@@ -79,4 +79,9 @@
   <span class="picture_name" title="<%= picture.name %>" id="image_picture_<%= picture.id %>_name">
     <%= picture.name %>
   </span>
+  <div class="picture_tags">
+  <% picture.tag_list.each do |tag| %>
+    <span class="tag"><%= tag %></span>
+  <% end %>
+  </div>
 </div>

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

@@ -82,6 +82,7 @@
   <h1>
     <%= @pictures.total_count %>
     <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
+    <%= _t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
   </h1>
   <%= render 'archive' %>
 </div>

data/app/views/alchemy/base/500.html.erb

@@ -1,5 +1,26 @@
-<h1>Upps!</h1>
-<h2><%= @notice %></h2>
-<pre>
-<%= @trace.join("\n") %>
-</pre>
+<%= toolbar(
+  buttons: [
+    {
+      icon: 'back',
+      url: request.referer || alchemy.admin_dashboard_path,
+      label: _t(:back),
+      title: _t(:back),
+      hotkey: 'alt-z',
+      overlay: false,
+      skip_permission_check: true
+    }
+  ]
+) %>
+
+<%= render_message(:error) do %>
+  <h1><%= _t('An error happened') %></h1>
+  <h2>
+    <%= @error.class %>
+    <%= @notice %>
+  </h2>
+  <p>
+  <% @trace.each do |line| %>
+    <%= line %><br>
+  <% end %>
+  </p>
+<% end %>

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

@@ -32,7 +32,7 @@
 ) %>
 
 <%= link_to(render_icon(:link), '#', {
-  :onclick => "Alchemy.LinkOverlay.open(this, 420)",
+  :onclick => "Alchemy.LinkOverlay.open(this)",
   :class => content.linked? ? 'linked' : nil,
   :title => _t(:link_image),
   :data => {'content-id' => content.id},

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

@@ -2,7 +2,7 @@
   <%= link_to(
     render_icon(:link),
     '#',
-    :onclick => "Alchemy.LinkOverlay.open(this, 420); return false;",
+    :onclick => "Alchemy.LinkOverlay.open(this); return false;",
     :class => "icon_button#{content.linked? ? ' linked' : ''}",
     :data => {'content-id' => content.id},
     :title => _t(:place_link),

data/app/views/alchemy/language_links/_language.html.erb

@@ -0,0 +1,12 @@
+<% css_classes = [language.code] %>
+<% css_classes << 'active' if session[:language_id] == language.id %>
+<% css_classes << 'first' if languages.first == language %>
+<% css_classes << 'last' if languages.last == language %>
+<% link_title = options[:show_title] ? _t("#{language.code}.title", scope: 'language_links', default: language.name) : nil %>
+
+<%= link_to(
+  content_tag(:span, language.label(options[:linkname])).html_safe,
+  show_alchemy_page_path(language.pages.language_roots.first, lang: language.code),
+  class: css_classes.join(" "),
+  title: link_title
+) %>