alchemy_cms 5.0.0.rc2 → 5.1.0.rc1

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

@@ -1,24 +1,25 @@
-<%= search_form_for @query, url: url_for(
-    action: 'index',
-    size: @size
+<%= search_form_for @query, url: url_for({
+      action: 'index',
+      size: @size,
+    }.merge(search_filter_params.except(:q))
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
-  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
-  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
+  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id, id: nil) %>
+  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id, id: nil) %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        placeholder: Alchemy.t(:search),
-        class: 'search_input_field',
-        id: nil %>
-    </label>
-    <%= link_to render_icon(:times, size: 'xs'), url_for(
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      placeholder: Alchemy.t(:search),
+      class: 'search_input_field',
+      id: nil %>
+    <%= link_to render_icon(:times, size: 'xs'), url_for({
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
         size: @size,
         overlay: true
-      ),
+      }.merge(search_filter_params.except(:q))),
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),

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

@@ -1,15 +1,15 @@
-<%- url ||= resource_url_proxy.url_for(action: 'index') -%>
+<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(search_filter_params.except(:q, :page))) -%>
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search) %>
-    </label>
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      class: 'search_input_field',
+      placeholder: Alchemy.t(:search) %>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
-      <%= f.hidden_field field %>
+      <%= f.hidden_field field, id: nil %>
     <% end %>
     <%= link_to render_icon(:times, size: 'xs'), url,
         class: 'search_field_clear',
@@ -17,7 +17,7 @@
         title: Alchemy.t(:click_to_show_all),
         style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
     <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
-      <%= hidden_field_tag additional_param, search_filter_params[additional_param] %>
+      <%= hidden_field_tag additional_param, search_filter_params[additional_param], id: nil %>
     <% end %>
   </div>
 <% end %>

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

@@ -31,7 +31,7 @@
       admin_pictures_path(
         q: search_filter_params[:q],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'secondary button with_icon',

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

@@ -6,7 +6,7 @@
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
   </div>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
   <%= hidden_field_tag :filter, search_filter_params[:filter] %>
   <%= f.submit Alchemy.t(:save) %>

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

@@ -12,7 +12,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       {
@@ -22,7 +22,7 @@
   </span>
   <% end %>
   <% image = image_tag(
-    picture.url(size: preview_size(@size), flatten: true),
+    picture.url(size: preview_size(@size), flatten: true) || "alchemy/missing-image.svg",
     alt: picture.name,
     title: Alchemy.t(:zoom_image)
   ) %>
@@ -34,7 +34,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'thumbnail_background'

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

@@ -1,7 +1,7 @@
 <div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
   <%= link_to(
     image_tag(
-      picture_to_assign.url(size: preview_size(size), flatten: true),
+      picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
       alt: picture_to_assign.name
     ),
     alchemy.assign_admin_essence_pictures_path(

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

@@ -1,6 +1,6 @@
 <%= form_tag update_multiple_admin_pictures_path do %>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
   <%= hidden_field_tag :filter, search_filter_params[:filter] %>
 

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

@@ -5,7 +5,7 @@
         object: Alchemy::Picture.new,
         file_attribute: 'image_file',
         redirect_url: alchemy.admin_pictures_path(
-          size: params[:size],
+          size: @size,
           filter: 'last_upload'
         ) %>
       <div class="toolbar_spacer"></div>

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

@@ -1,5 +1,5 @@
 <div class="zoomed-picture-background">
-  <%= image_tag @picture.url(format: @picture.image_file_format) %>
+  <%= image_tag @picture.url || "alchemy/missing-image.svg" %>
 </div>
 
 <div class="picture-overlay-navigation">
@@ -9,7 +9,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: "previous-picture",
@@ -23,7 +23,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: "next-picture",

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

@@ -1,21 +1,23 @@
 <div id="filter_bar">
-  <h3><%= Alchemy.t('Filter') %></h3>
-  <%= select_tag(
-    'resource_filter',
-    options_for_select(
-      resource_filter_select, search_filter_params[:filter]
-    ),
-    include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
-    data: { remote: !!request.xhr? },
-    class: 'alchemy_selectbox'
-  ) %>
+  <label>
+    <h3><%= local_assigns[:label] || Alchemy.t('Filter') %></h3>
+    <%= select_tag(
+      'resource_filter',
+      options_for_select(
+        resource_filter_select, search_filter_params[:filter]
+      ),
+      include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
+      data: { remote: !!request.xhr? },
+      class: 'alchemy_selectbox'
+    ) %>
+  </label>
 </div>
 
 <script type="text/javascript">
   $(function() {
     $('#resource_filter').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
+      var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
       if ($this.data('remote') === true) {
         $.get(url, {filter: $this.val()}, null, 'script');
       } else {

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

@@ -2,10 +2,10 @@
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
     <% if value.is_a? Hash %>
       <% value.each do |k, v| %>
-        <%= hidden_field_tag "#{key}[#{k}]", v %>
+        <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>
     <% else %>
-      <%= hidden_field_tag key, value %>
+      <%= hidden_field_tag key, value, id: nil %>
     <% end %>
   <% end %>
   <label>
@@ -17,4 +17,4 @@
       ),
       onchange: 'this.form.submit()' %>
   </label>
-<% end %>
+<% end %>

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

@@ -1,29 +1,31 @@
 <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
-<% toolbar(
-  buttons: [
-    {
-      icon: :plus,
-      label: label_title,
-      url: new_resource_path,
+<% content_for(:toolbar) do %>
+  <%= toolbar_button(
+    icon: :plus,
+    label: label_title,
+    url: new_resource_path,
+    title: label_title,
+    hotkey: 'alt+n',
+    dialog_options: {
       title: label_title,
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: label_title,
-        size: resource_window_size
-      },
-      if_permitted_to: [:create, resource_model]
+      size: resource_window_size
     },
-    {
-      icon: 'download',
-      url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
-      label: Alchemy.t(:download_csv),
-      title: Alchemy.t(:download_csv),
-      dialog: false,
-      if_permitted_to: [:index, resource_model]
-    }
-  ]
-) %>
+    if_permitted_to: [:create, resource_model]
+  ) %>
+  <%= toolbar_button(
+    icon: :download,
+    url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
+    label: Alchemy.t(:download_csv),
+    title: Alchemy.t(:download_csv),
+    dialog: false,
+    if_permitted_to: [:index, resource_model]
+  ) %>
+  <%= render 'alchemy/admin/partials/search_form', additional_params: [
+    resource_has_filters ? :filter : nil,
+    resource_has_tags ? :tagged_with : nil
+  ].compact %>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
   <%= render 'alchemy/admin/resources/table_header' %>

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

@@ -1,19 +1,18 @@
-<%= toolbar(
-  buttons: [
-    {
-      icon: :plus,
-      label: Alchemy.t('New Tag'),
-      url: alchemy.new_admin_tag_path,
+<% content_for :toolbar do %>
+  <%= toolbar_button(
+    icon: :plus,
+    label: Alchemy.t('New Tag'),
+    url: alchemy.new_admin_tag_path,
+    title: Alchemy.t('New Tag'),
+    hotkey: 'alt+n',
+    dialog_options: {
       title: Alchemy.t('New Tag'),
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: Alchemy.t('New Tag'),
-        size: '310x180'
-      },
-      if_permitted_to: [:create, Alchemy::Tag]
-    }
-  ]
-) %>
+      size: '310x180'
+    },
+    if_permitted_to: [:create, Alchemy::Tag]
+  ) %>
+  <%= render 'alchemy/admin/partials/search_form' %>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
   <%= render 'alchemy/admin/resources/table_header' %>

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

@@ -1,16 +1,14 @@
-<%= toolbar(
-  buttons: [
-    {
-      icon: 'angle-double-left',
-      url: request.referer || alchemy.admin_dashboard_path,
-      label: Alchemy.t(:back),
-      title: Alchemy.t(:back),
-      hotkey: 'alt+z',
-      dialog: false,
-      skip_permission_check: true
-    }
-  ], search: false
-) %>
+<%= content_for :toolbar do %>
+  <%= toolbar_button(
+    icon: 'angle-double-left',
+    url: request.referer || alchemy.admin_dashboard_path,
+    label: Alchemy.t(:back),
+    title: Alchemy.t(:back),
+    hotkey: 'alt+z',
+    dialog: false,
+    skip_permission_check: true
+  ) %>
+<% end %>
 
 <% content_for(:alchemy_body_class) { 'error' } %>
 

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

@@ -5,9 +5,9 @@
   content.essence.link_text.presence ||
     content.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
     attachment.name,
-  alchemy.download_attachment_path(
-    attachment,
-    name: attachment.urlname,
+  attachment.url(
+    download: true,
+    name: attachment.slug,
     format: attachment.suffix
   ),
   {
@@ -15,4 +15,4 @@
     title: content.essence.title.presence
   }.merge(html_options)
 ) -%>
-<%- end -%>
+<%- end -%>

data/config/alchemy/config.yml

@@ -9,12 +9,6 @@
 #
 auto_logout_time: 30
 
-# === Redirect Options
-#
-#   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not public.
-#
-redirect_to_public_child: true
-
 # === Page caching
 #
 # Enable/Disable page caching globally.
@@ -68,17 +62,27 @@ items_per_page: 15
 
 # === Picture rendering settings
 #
-# Alchemy uses Dragonfly to render images. Use {size: "XXXxYYY", crop: BOOLEAN [true]} to resize images.
+# Alchemy uses Dragonfly to render images. Settings for image rendering are specific to elements and are defined in elements.yml
 #
-# See http://markevans.github.com/dragonfly for further infos.
+# Example:
+# - name: some_element
+#   contents:
+#   - name: some_picture
+#     type: EssencePicture
+#     settings:
+#       hint: true
+#       crop: true  # turns on image cropping
+#       size: '500x500' # image will be cropped to this size
 #
-# ==== Options:
+# See http://markevans.github.com/dragonfly for further info.
+#
+# ==== Global Options:
 #
 #   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
-#   preprocess_image_resize   [String]        # Use this option to resize images to that value. Downsizing example: '1000x1000>' (Default nil)
+#   preprocess_image_resize   [String]        # Use this option to resize images to the given size when they are uploaded to the image library. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting. (Default +original+)
 #
-# NOTE: You can always override the output format in the options of your Essence. I.E. {format: 'gif'}
+# NOTE: You can always override the output format in the settings of your Essence in elements.yml, I.E. {format: 'gif'}
 #
 output_image_jpg_quality: 85
 preprocess_image_resize:

data/config/alchemy/modules.yml

@@ -5,7 +5,7 @@
   position: 1
   navigation:
     name: 'modules.dashboard'
-    controller: 'alchemy/admin/dashboard'
+    controller: '/alchemy/admin/dashboard'
     action: index
     inline_image: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>'
 
@@ -14,18 +14,18 @@
   position: 2
   navigation:
     name: 'modules.pages'
-    controller: 'alchemy/admin/pages'
+    controller: '/alchemy/admin/pages'
     action: index
     icon: file-alt
     sub_navigation:
       - name: 'modules.pages'
-        controller: 'alchemy/admin/pages'
+        controller: '/alchemy/admin/pages'
         action: index
       - name: 'modules.layoutpages'
-        controller: 'alchemy/admin/layoutpages'
+        controller: '/alchemy/admin/layoutpages'
         action: index
     nested:
-      - controller: 'alchemy/admin/pages'
+      - controller: '/alchemy/admin/pages'
         action: edit
 
 - name: menus
@@ -33,7 +33,7 @@
   position: 3
   navigation:
     name: 'modules.menus'
-    controller: 'alchemy/admin/nodes'
+    controller: '/alchemy/admin/nodes'
     action: index
     icon: list-ul
 
@@ -42,7 +42,7 @@
   position: 4
   navigation:
     name: 'modules.languages'
-    controller: 'alchemy/admin/languages'
+    controller: '/alchemy/admin/languages'
     action: index
     icon: flag
 
@@ -51,7 +51,7 @@
   position: 5
   navigation:
     name: 'modules.sites'
-    controller: 'alchemy/admin/sites'
+    controller: '/alchemy/admin/sites'
     action: index
     icon: bullseye
 
@@ -60,7 +60,7 @@
   position: 6
   navigation:
     name: 'modules.tags'
-    controller: 'alchemy/admin/tags'
+    controller: '/alchemy/admin/tags'
     action: index
     icon: tags
 
@@ -68,14 +68,14 @@
   engine_name: alchemy
   position: 7
   navigation:
-    controller: 'alchemy/admin/pictures'
+    controller: '/alchemy/admin/pictures'
     action: index
     name: 'modules.library'
     icon: archive
     sub_navigation:
       - name: 'modules.pictures'
-        controller: 'alchemy/admin/pictures'
+        controller: '/alchemy/admin/pictures'
         action: index
       - name: 'modules.attachments'
-        controller: 'alchemy/admin/attachments'
+        controller: '/alchemy/admin/attachments'
         action: index