alchemy_cms 2.6.3 → 2.7.0

data/app/models/alchemy/site.rb

@@ -11,18 +11,31 @@ module Alchemy
 
     scope :published, where(public: true)
 
+    # concerns
+    include Layout
+
     # Returns true if this site is the current site
     def current?
       self.class.current == self
     end
 
+    # Returns the path to site's view partial.
+    #
+    # Site view partials live in +app/views/alchemy/site_layouts+
+    #
+    # Please use <tt>rails g alchemy:site_layouts</tt> to generate partials for all your sites.
+    #
+    def to_partial_path
+      "alchemy/site_layouts/#{layout_partial_name}"
+    end
+
     class << self
       def current=(v)
         Thread.current[:alchemy_current_site] = v
       end
 
       def current
-        Thread.current[:alchemy_current_site]
+        Thread.current[:alchemy_current_site] || default
       end
 
       def default
@@ -61,5 +74,6 @@ module Alchemy
         )
       end
     end
+
   end
 end

data/app/models/alchemy/site/layout.rb

@@ -0,0 +1,38 @@
+module Alchemy
+  module Site::Layout
+    extend ActiveSupport::Concern
+    SITE_LAYOUTS_FILE = Rails.root.join('config/alchemy/site_layouts.yml')
+
+    module ClassMethods
+      # Returns the site layouts definition defined in +site_layouts.yml+ file
+      #
+      def layout_definitions
+        @layout_definitions ||= read_site_layouts
+      end
+
+    private
+
+      # Reads the site layouts definition file named +site_layouts.yml+ in +config/alchemy/+
+      #
+      # It returns empty Array if no file is present
+      #
+      def read_site_layouts
+        YAML.load_file(SITE_LAYOUTS_FILE) || []
+      rescue Errno::ENOENT
+        []
+      end
+    end
+
+    # Returns site's layout definition
+    #
+    def layout_definition
+      self.class.layout_definitions.detect { |l| l['name'] == layout_partial_name }
+    end
+
+    # Returns the name for the layout partial
+    #
+    def layout_partial_name
+      name.parameterize.underscore
+    end
+  end
+end

data/app/models/alchemy/user.rb

@@ -1,10 +1,20 @@
+require 'userstamp'
+require 'acts-as-taggable-on'
+
 module Alchemy
   class User < ActiveRecord::Base
 
     model_stamper
     stampable(:stamper_class_name => 'Alchemy::User')
 
-    devise(*Config.get(:devise_modules))
+    begin
+      devise(*Config.get(:devise_modules))
+    rescue NameError => e
+      abort <<-WARN
+You enabled the encryptable devise module, but did not have the `devise-encryptable` gem installed!
+Please add the `devise-encryptable` gem into your Gemfile.
+WARN
+    end
 
     acts_as_taggable
 
@@ -37,7 +47,7 @@ module Alchemy
       end
     end
 
-    after_save :deliver_welcome_mail, if: -> { send_credentials }
+    after_save :deliver_welcome_mail, if: -> { send_credentials == '1' }
 
     scope :admins, where(arel_table[:roles].matches("%admin%")) # not pleased with that approach
     # mysql regexp word matching would be much nicer, but it's not included in SQLite functions per se.
@@ -102,7 +112,7 @@ module Alchemy
 
     # Calls unlock on all locked pages
     def unlock_pages!
-      pages_locked_by_me.map(&:unlock)
+      pages_locked_by_me.map(&:unlock!)
     end
 
     # Returns all pages locked by user.

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

@@ -4,16 +4,16 @@
       <%= link_to_overlay_window(
           render_icon('upload'),
           alchemy.new_admin_attachment_path(
-            :content_id => @content.blank? ? nil : @content.id,
-            :swap => @swap,
-            :options => @options
+            content_id: @content.blank? ? nil : @content.id,
+            swap: @swap,
+            options: @options.to_json
           ),
           {
-            :title => _t(:upload_file),
-            :size => '540x550'
+            title: _t(:upload_file),
+            size: '540x550'
           },
-          :title => _t(:upload_file),
-          :class => 'icon_button'
+          title: _t(:upload_file),
+          class: 'icon_button'
         ) %>
       <label><%= _t(:upload_file) %></label>
     </div>

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

@@ -2,14 +2,14 @@
   <%= link_to(
     render_icon(file_to_assign.icon_css_class) + file_to_assign.name,
     {
-      :controller => :essence_files,
-      :action => :assign,
-      :attachment_id => file_to_assign.id,
-      :id => @content.id,
-      :options => @options
+      controller: 'essence_files',
+      action: 'assign',
+      attachment_id: file_to_assign.id,
+      id: @content.id,
+      options: @options.to_json
     },
-    :remote => true,
-    :method => 'put',
-    :title => file_to_assign.name
+    remote: true,
+    method: 'put',
+    title: file_to_assign.name
   ) %>
 </li>

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

@@ -2,22 +2,7 @@
 <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 %>
-  <% end %>
+  <%= render_tag_list('Alchemy::Attachment', p) %>
 </ul>
 <% if p[:tagged_with].present? %>
   <%= link_to(

data/app/views/alchemy/admin/attachments/destroy.js.erb

@@ -1,4 +1 @@
-window.location.replace('<%= admin_attachments_url(
-  :per_page => params[:per_page],
-  :page => params[:page],
-  :query => params[:query]) %>');
+window.location.href = '<%= @url %>';

data/app/views/alchemy/admin/contents/create.js.erb

@@ -44,7 +44,7 @@
 
 <% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
 
-  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id %>_body');
+  Alchemy.Tinymce.addEditor('#<%= @content.form_field_id %>');
 
 <% end %>
 

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

@@ -1,30 +1,31 @@
 <%= toolbar(
-  :buttons => [
+  buttons: [
     {
-      :icon => 'info',
-      :label => _t(:info),
-      :url => alchemy.dashboard_info_path,
-      :title => _t(:info),
-      :overlay_options => {
-        :title => _t(:info),
-        :size => "420x360"
+      icon: 'info',
+      label: _t(:info),
+      url: alchemy.dashboard_info_path,
+      title: _t(:info),
+      overlay_options: {
+        title: _t(:info),
+        size: "420x360"
       },
-      :if_permitted_to => [:info, :alchemy_admin_dashboard]
+      if_permitted_to: [:info, :alchemy_admin_dashboard],
+     hotkey: 'alt-i'
     }
   ],
-  :search => false
+  search: false
 ) %>
 
 <div id="dashboard">
   <h1>
     <% if @first_time -%>
-    <%= _t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <%= _t('Welcome, %{name}', name: current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
     <% else -%>
-    <%= _t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <%= _t('Welcome back, %{name}', name: current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
     <% end -%>
   </h1>
   <p>
-    <small><%= _t('Your last login was on %{time}', :time => l(current_user.last_sign_in_at)) unless current_user.last_sign_in_at.blank? %></small>
+    <small><%= _t('Your last login was on %{time}', time: l(current_user.last_sign_in_at)) unless current_user.last_sign_in_at.blank? %></small>
   </p>
   <div class="column left">
     <%= render 'locked_pages' %>

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

@@ -11,13 +11,13 @@
     <span class="preview_text_element_name"><%= element.display_name %></span>
     <span class="preview_text_quote"><%= sanitize(element.preview_text) %></span>
   </span>
-  <%= render_hint_for(element) %>
+  <%= render_hint_for(element) unless element.trashed? %>
   <span class="ajax_folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
-    <%= link_to('', '#', {
-      :onclick => "Alchemy.toggleElement(#{element.id}, {title: '#{_t('Warning!')}', message: '#{_t(:element_dirty_notice)}', okLabel: '#{_t('Yes')}', cancelLabel: '#{_t('No')}'})",
-      :class => element.folded? ? 'expand_element' : 'fold_element',
-      :title => element.folded? ? _t(:show_element_content) : _t(:hide_element_content),
-      :id => "element_#{element.id}_folder"
-    }) %>
+    <%= link_to '', '#', {
+      'data-element-dirty' => element.id,
+      class: element.folded? ? 'expand_element' : 'fold_element',
+      title: element.folded? ? _t(:show_element_content) : _t(:hide_element_content),
+      id: "element_#{element.id}_folder"
+    } %>
   </span>
 </div>

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

@@ -0,0 +1,10 @@
+<%- rtfs = element.contents.essence_richtexts -%>
+(function() {
+  var $element = $('.element_content', '#element_<%= element.id %>');
+  <% rtfs.each do |content| %>
+  tinymce.get('contents_content_<%= content.id %>_body').remove();
+  <% end %>
+  $element.html('<%= escape_javascript render_editor(element) %>');
+  Alchemy.GUI.init($element);
+  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
+})();

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

@@ -1,48 +1,48 @@
-var $el;
-var $element_area;
-var element_html = '<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>';
-
-<% if @cutted_element_id %>
-$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
-<% end %>
-
-<% if @page.can_have_cells? %>
-if ($('#cells').length == 0) {
-  Alchemy.buildTabbedCells('<%= _t(:main_content) %>');
-}
-Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? _t(:main_content) : @cell.name_for_label -%>');
-<% end %>
-
-$element_area = $('#cell_<%= @cell_name -%>');
-
-<% if @insert_at_top %>
-$element_area.prepend(element_html);
-<% else %>
-$element_area.append(element_html);
+(function() {
+  var $el;
+  var $element_area;
+  var element_html = '<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>';
+
+<%- if @cutted_element_id -%>
+  $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+<%- end -%>
+
+<%- if @page.can_have_cells? -%>
+  if ($('#cells').length == 0) {
+    Alchemy.buildTabbedCells('<%= _t(:main_content) %>');
+  }
+  Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? _t(:main_content) : @cell.name_for_label -%>');
+<%- end -%>
+
+  $element_area = $('#cell_<%= @cell_name -%>');
+
+<%- if @insert_at_top -%>
+  $element_area.prepend(element_html);
+<%- else -%>
+  $element_area.append(element_html);
+<%- end -%>
+
+  if ($element_area.find('.element_editor').length > 0) {
+    Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>', $element_area);
+  } else {
+    $element_area.sortable('refresh');
+  }
+
+  Alchemy.growl('<%= _t(:successfully_added_element) -%>');
+  Alchemy.closeCurrentWindow();
+<% if (rtfs = @element.contents.essence_richtexts).any? %>
+  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
 <% end %>
+  Alchemy.PreviewWindow.refresh();
+  Alchemy.ElementEditors.init();
 
-if ($element_area.find('.element_editor').length > 0) {
-  Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>', $element_area);
-} else {
-  $element_area.sortable('refresh');
-}
+  $el = $('#element_<%= @element.id -%>');
+  $el.trigger('Alchemy.SelectElementEditor');
+  Alchemy.GUI.initElement($el);
 
-Alchemy.growl('<%= _t(:successfully_added_element) -%>');
-Alchemy.closeCurrentWindow();
-
-<% @element.contents.essence_richtexts.each do |content| %>
-Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
-<% end %>
-
-Alchemy.PreviewWindow.refresh();
-Alchemy.ElementEditors.init();
-
-$el = $('#element_<%= @element.id -%>');
-$el.trigger('Alchemy.SelectElementEditor');
-Alchemy.GUI.initElement($el);
-
-<% if @clipboard.blank? %>
-$('#clipboard_button .icon.clipboard').removeClass('full');
-<% end %>
+<%- if @clipboard.blank? -%>
+  $('#clipboard_button .icon.clipboard').removeClass('full');
+<%- end -%>
 
-<%=raw update_elements_with_essence_selects(@page, @element) %>
+  <%= update_essence_select_elements(@page, @element) -%>
+})();

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

@@ -1,43 +1,39 @@
-(function($) {
+<% rtfs = @element.contents.essence_richtexts %>
 
+(function($) {
   var $el = $('.element_editor[data-element-id="<%= @element.id %>"]');
 
-  function removeTinyMCEs(ids) {
-    for (var i = ids.length - 1; i >= 0; i--) {
-      tinymce.get(ids[i]).remove();
-    };
-  }
+<% if @error %>
 
-  <% if @error %>
+  $("#element_<%= @element.id -%> .spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
 
-    $("#element_<%= @element.id -%> .spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
+<% else %>
 
-  <% else %>
+  $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
+  $el = $('#element_<%= @element.id %>');
+  $('#element_area .sortable_cell').sortable('refresh');
+  Alchemy.ElementEditors.reinit($el);
 
-    $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
-    $el = $('#element_<%= @element.id %>');
-    $('#element_area .sortable_cell').sortable('refresh');
-    Alchemy.ElementEditors.reinit($el);
+<% if @element.folded %>
 
-    <% if @element.folded %>
+<% if rtfs.any? %>
 
-      <% if @element.rtf_contents.any? %>
-        removeTinyMCEs(<%=raw @element.rtf_contents.collect(&:form_field_id).to_json %>);
-      <% end %>
+  Alchemy.Tinymce.removeEditor('<%= contents_form_field_ids_string(rtfs) %>');
 
-    <% else %>
+<% end %>
 
-      $el.trigger('Alchemy.SelectElementEditor');
-      Alchemy.SelectBox($el);
+<% else %>
 
-      <% @element.rtf_contents.each do |content| %>
-        Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
-      <% end %>
+  $el.trigger('Alchemy.SelectElementEditor');
+  Alchemy.SelectBox($el);
 
-      Alchemy.GUI.initElement($el);
+<% if rtfs.any? %>
+  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
+<% end %>
 
-    <% end %>
+  Alchemy.GUI.initElement($el);
 
-  <% end %>
+<% end %>
 
+<% end %>
 })(jQuery);

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

@@ -8,5 +8,5 @@ $('#element_<%= @element.id %>').hide(200, function() {
   <% @element.contents.essence_richtexts.each do |content| %>
   tinymce.get('contents_content_<%= content.id %>_body').remove();
   <% end %>
-  <%=raw update_elements_with_essence_selects(@page, @element) %>
+  <%= update_essence_select_elements(@page, @element) -%>
 });