alchemy_cms 3.1.0.beta1 → 3.1.0.beta2

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -5,7 +5,15 @@ module Alchemy
 
       def index
         @attachments = Attachment.all
-        @attachments = @attachments.tagged_with(params[:tagged_with]) if params[:tagged_with].present?
+        if params[:only].present?
+          @attachments = @attachments.where("file_mime_type LIKE '%#{params[:only]}%'")
+        end
+        if params[:except].present?
+          @attachments = @attachments.where("file_mime_type NOT LIKE '%#{params[:except]}%'")
+        end
+        if params[:tagged_with].present?
+          @attachments = @attachments.tagged_with(params[:tagged_with])
+        end
         @attachments = @attachments.find_paginated(params, 15, sort_order)
         @options = options_from_params
         if in_overlay?

data/app/controllers/alchemy/admin/essence_files_controller.rb

@@ -6,14 +6,14 @@ module Alchemy
       helper "Alchemy::Admin::Contents"
 
       def edit
-        @content = Content.find(params[:id])
+        @essence_file = EssenceFile.find(params[:id])
+        @content = @essence_file.content
         @options = options_from_params
-        @essence_file = @content.essence
       end
 
       def update
         @essence_file = EssenceFile.find(params[:id])
-        @essence_file.update_attributes(params[:essence_file])
+        @essence_file.update(params[:essence_file])
       end
 
       def assign
@@ -22,7 +22,6 @@ module Alchemy
         @content.essence.attachment = @attachment
         @options = options_from_params
       end
-
     end
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -81,7 +81,10 @@ module Alchemy
         redirect_to signup_path
       elsif @page.nil? && last_legacy_url
         @page = last_legacy_url.page
-        redirect_page
+
+        # This drops the given query string.
+        redirect_legacy_page
+
       elsif @page.blank?
         raise_not_found_error
       elsif multi_language? && params[:lang].blank?
@@ -131,6 +134,17 @@ module Alchemy
       redirect_to show_page_path(additional_params.merge(options)), :status => 301
     end
 
+    # Use the bare minimum to redirect to @page
+    # Don't use query string of legacy urlname
+    def redirect_legacy_page(options={})
+      defaults = {
+        :lang => (multi_language? ? @page.language_code : nil),
+        :urlname => @page.urlname
+      }
+      options = defaults.merge(options)
+      redirect_to show_page_path(options), :status => 301
+    end
+
     def additional_params
       params.each do |key, value|
         params[key] = nil if ["action", "controller", "urlname", "lang"].include?(key)
@@ -138,7 +152,11 @@ module Alchemy
     end
 
     def legacy_urls
-      LegacyPageUrl.joins(:page).where(urlname: params[:urlname], alchemy_pages: {language_id: Language.current.id})
+
+      # /slug/tree => slug/tree
+      urlname = (request.fullpath[1..-1] if request.fullpath[0] == '/') || request.fullpath
+
+      LegacyPageUrl.joins(:page).where(urlname: urlname, alchemy_pages: {language_id: Language.current.id})
     end
 
     def last_legacy_url

data/app/models/alchemy/content.rb

@@ -25,6 +25,7 @@ module Alchemy
 
     belongs_to :essence, :polymorphic => true, :dependent => :destroy
     belongs_to :element, touch: true
+    has_one :page, through: :element
 
     stampable stamper_class_name: Alchemy.user_class_name
 
@@ -56,7 +57,7 @@ module Alchemy
     scope :not_trashed,       -> { joins(:element).merge(Element.not_trashed) }
     scope :not_restricted,    -> { joins(:element).merge(Element.not_restricted) }
 
-    delegate :restricted?, to: :element, allow_nil: true
+    delegate :restricted?, to: :page,    allow_nil: true
     delegate :trashed?,    to: :element, allow_nil: true
     delegate :public?,     to: :element, allow_nil: true
 

data/app/models/alchemy/element.rb

@@ -361,7 +361,7 @@ module Alchemy
               "fields.#{content_name}.#{error}".to_sym,
               "errors.#{error}".to_sym
             ],
-            field: Content.translated_label_for(content_name)
+            field: Content.translated_label_for(content_name, name)
           )
         end
       end

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

@@ -11,25 +11,29 @@
 <% end %>
 <table id="all_files" class="list">
   <% unless @attachments.blank? %>
-  <tr>
-    <th class="icon"></th>
-    <th class="name">
-      <%= sortable_column(Alchemy::Attachment.human_attribute_name('name'), :column => :name) %>
-    </th>
-    <th class="file_name">
-      <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_name'), :column => :file_name) %>
-    </th>
-    <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
-    <th class="file_size">
-      <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_size'), :column => :file_size) %>
-    </th>
-    <th class="date">
-      <%= sortable_column(Alchemy::Attachment.human_attribute_name('created_at'), :column => :created_at) %>
-    </th>
-    <th class="tools"></th>
-  </tr>
+  <thead>
+    <tr>
+      <th class="icon"></th>
+      <th class="name">
+        <%= sortable_column(Alchemy::Attachment.human_attribute_name('name'), column: :name) %>
+      </th>
+      <th class="file_name">
+        <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_name'), column: :file_name) %>
+      </th>
+      <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
+      <th class="file_size">
+        <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_size'), column: :file_size) %>
+      </th>
+      <th class="date">
+        <%= sortable_column(Alchemy::Attachment.human_attribute_name('created_at'), column: :created_at) %>
+      </th>
+      <th class="tools"></th>
+    </tr>
+  </thead>
   <% end %>
-  <%= render :partial => 'alchemy/admin/attachments/attachment', :collection => @attachments %>
+  <tbody>
+    <%= render partial: 'alchemy/admin/attachments/attachment', collection: @attachments %>
+  </tbody>
 </table>
 
 <%= paginate @attachments, theme: 'alchemy' %>

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

@@ -16,7 +16,7 @@
     }
   ]
 ) %>
-<div id="archive_all" class="<%= any_tags ? 'with_tag_filter' : nil %>">
+<div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
   <%= resources_header %>
   <%= render partial: 'files_list' %>
   <% if any_tags %>

data/app/views/alchemy/admin/languages/_table.html.erb

@@ -1,30 +1,34 @@
 <%- if @languages.any? -%>
 <table class="list" id="languages_list">
-  <tr>
-    <th>
-      <%= sortable_column(Alchemy::Language.human_attribute_name(:name), :column => :name) %>
-    </th>
-    <th>
-      <%= sortable_column(Alchemy::Language.human_attribute_name(:language_code), :column => :language_code) %>
-    </th>
-    <th>
-      <%= sortable_column(Alchemy::Language.human_attribute_name(:country_code), :column => :country_code) %>
-    </th>
-    <th>
-      <%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
-    </th>
-    <th>
-      <%= Alchemy::Language.human_attribute_name(:page_layout) %>
-    </th>
-    <th class="center">
-      <%= Alchemy::Language.human_attribute_name(:public) %>
-    </th>
-    <th class="center">
-      <%= Alchemy::Language.human_attribute_name(:default) %>
-    </th>
-    <th class="tools"></th>
-  </tr>
-  <%= render_resources %>
+  <thead>
+    <tr>
+      <th>
+        <%= sortable_column(Alchemy::Language.human_attribute_name(:name), column: :name) %>
+      </th>
+      <th>
+        <%= sortable_column(Alchemy::Language.human_attribute_name(:language_code), column: :language_code) %>
+      </th>
+      <th>
+        <%= sortable_column(Alchemy::Language.human_attribute_name(:country_code), column: :country_code) %>
+      </th>
+      <th>
+        <%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
+      </th>
+      <th>
+        <%= Alchemy::Language.human_attribute_name(:page_layout) %>
+      </th>
+      <th class="center">
+        <%= Alchemy::Language.human_attribute_name(:public) %>
+      </th>
+      <th class="center">
+        <%= Alchemy::Language.human_attribute_name(:default) %>
+      </th>
+      <th class="tools"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render_resources %>
+  </tbody>
 </table>
 <%- elsif params[:query] -%>
 <p><%= _t('Nothing found') %></p>

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

@@ -17,7 +17,7 @@
   ]
 ) %>
 
-<div id="archive_all">
+<div id="archive_all" class="resources-table-wrapper">
   <%= resources_header %>
   <%= render 'table' %>
 </div>

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

@@ -25,8 +25,9 @@
         <ul>
           <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
           <li class="<%= cycle('even', 'odd') %>">
-            <%= link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %> in
-            <%= essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
+            <% page_link = link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %>
+            <% pictures = essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
+            <%= _t(:pictures_in_page, :page => page_link, :pictures => pictures) %>
           </li>
           <% end %>
         </ul>

data/app/views/alchemy/admin/resources/_table.html.erb

@@ -1,18 +1,22 @@
 <% if resources_instance_variable.any? %>
 <table class="list" id="<%= resource_handler.resources_name %>_list">
-  <tr>
-  <% resource_handler.attributes.each do |attribute| %>
-    <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
-      <%= sortable_column(
-        resource_handler.model.human_attribute_name(attribute[:name]),
-        :column => sortable_resource_header_column(attribute),
-        :route_proxy => resource_url_proxy
-      ) %>
-    </th>
-  <% end %>
-    <th class="tools"></th>
-  </tr>
-  <%= render_resources %>
+  <thead>
+    <tr>
+    <% resource_handler.attributes.each do |attribute| %>
+      <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
+        <%= sortable_column(
+          resource_handler.model.human_attribute_name(attribute[:name]),
+          :column => sortable_resource_header_column(attribute),
+          :route_proxy => resource_url_proxy
+        ) %>
+      </th>
+    <% end %>
+      <th class="tools"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render_resources %>
+  </tbody>
 </table>
 <% elsif params[:query] %>
 <p><%= _t('Nothing found') %></p>

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

@@ -26,7 +26,7 @@
   ]
 ) %>
 
-<div id="archive_all">
+<div id="archive_all" class="resources-table-wrapper">
   <%= resources_header %>
   <%= render 'table' %>
 </div>

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

@@ -17,7 +17,7 @@
   ]
 ) %>
 
-<div id="archive_all">
+<div id="archive_all" class="resources-table-wrapper">
   <%= resources_header %>
   <%= render 'table' %>
 </div>

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

@@ -11,7 +11,7 @@
       <%= _t(:or_replace_it_with_an_existing_tag) %>
     <% end %>
     <div class="input tags">
-      <label class="control-label">Tags</label>
+      <label class="control-label"><%= _t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">
         <%= js_filter_field '#tag_list li' %>
         <ul id="tag_list" class="tags">

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

@@ -15,22 +15,26 @@
   ]
 ) %>
 
-<div id="archive_all">
-  <h1>
+<div id="archive_all" class="resources-table-wrapper">
+  <h1 class="resources-header">
     <%= @tags.total_count %>
     <%= ActsAsTaggableOn::Tag.model_name.human(count: @tags.total_count) %>
   </h1>
   <% if @tags.any? %>
 
   <table class="list" id="tag_list">
-    <tr class="legend">
-      <th class="icon"></th>
-      <th class="name"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:name), column: :name) %></th>
-      <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></th>
-      <th class="count"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count), column: :taggings_count) %></th>
-      <th class="tools"></th>
-    </tr>
-    <%= render partial: 'tag', collection: @tags %>
+    <thead>
+      <tr>
+        <th class="icon"></th>
+        <th class="name"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:name), column: :name) %></th>
+        <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></th>
+        <th class="count"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count), column: :taggings_count) %></th>
+        <th class="tools"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: 'tag', collection: @tags %>
+    </tbody>
   </table>
 
   <%= paginate @tags, theme: 'alchemy' %>

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

@@ -3,11 +3,9 @@
 <% dialog_link = link_to_dialog('',
   alchemy.admin_attachments_path(
     content_id: content.id,
-    only: content_settings_value(content,
-      :file_assign_show_only,
+    only: content_settings_value(content, :only,
       local_assigns.fetch(:options, {})),
-    except: content_settings_value(content,
-      :file_assign_do_not_show,
+    except: content_settings_value(content, :except,
       local_assigns.fetch(:options, {})),
     options: local_assigns.fetch(:options, {}).to_json
   ),
@@ -26,35 +24,33 @@
   <%= label_and_remove_link(content) %>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
-    <% if content.ingredient.nil? %>
-      <%= dialog_link %>
-    <% else %>
+    <% if content.ingredient %>
       <%= render_icon(content.ingredient.icon_css_class) %>
+    <% else %>
+      <%= dialog_link %>
     <% end %>
     </div>
     <div class="file_name">
       <%= content.ingredient.try(:name) ||
         ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
     </div>
-    <% unless content.ingredient.nil? %>
+    <div class="essence_file_tools">
+      <%= dialog_link %>
+      <%= link_to_dialog '',
+        alchemy.edit_admin_essence_file_path(
+          id: content.essence.id,
+          options: local_assigns.fetch(:options, {}).to_json
+        ),
+        {
+          title: _t(:edit_file_properties),
+          size: '400x165'
+        },
+        class: 'edit_file',
+        title: _t(:edit_file_properties) %>
+    </div>
+    <% if content.ingredient %>
       <%= hidden_field_tag content.form_field_name(:attachment_id),
         content.ingredient.id %>
-      <div class="essence_file_tools">
-        <%= dialog_link %>
-        <%= link_to_dialog '',
-          url_for(
-            controller: 'essence_files',
-            action: 'edit',
-            options: local_assigns.fetch(:options, {}).to_json,
-            id: content
-          ),
-          {
-            title: _t(:edit_file_properties),
-            size: '400x165'
-          },
-          class: 'edit_file',
-          title: _t(:edit_file_properties) %>
-      </div>
     <% end %>
   </div>
 </div>

data/app/views/alchemy/messages/contact_form_mail.es.text.erb

@@ -0,0 +1,12 @@
+<%= @message.message %>
+
+--
+
+Remitente:
+
+<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= @message.address %>
+<%= @message.zip %> <%= @message.city %>
+
+Teléfono: <%= @message.phone %>
+Correo electrónico: <%= @message.email %>

data/app/views/layouts/alchemy/admin.html.erb

@@ -96,6 +96,8 @@
     <script>
       // Store current locale for javascript translations.
       Alchemy.locale = '<%= ::I18n.locale %>';
+      // Setting the correct locale for select2 dropdown replacement.
+      $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
     </script>
     <%= yield(:javascripts) %>
   </body>