alchemy_cms 4.1.2 → 4.2.0.rc1

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

@@ -1,14 +1,19 @@
 var el = $('.element-editor[data-element-id="<%= @element.id %>"]');
 var icon = el.find('> .element-header > .element-handle > .icon');
 var label = el.find('> .element-toolbar .publish-element-button label');
+var eye = el.find('> .element-toolbar .publish-element-button .icon');
 
 <%- if @element.public? -%>
   icon.removeClass('fa-window-close fas');
   icon.addClass('fa-window-maximize far');
+  eye.removeClass('fa-eye');
+  eye.addClass('fa-eye-slash');
   label.text('<%= Alchemy.t(:hide_element) %>');
 <%- else -%>
   icon.removeClass('fa-window-maximize far');
   icon.addClass('fa-window-close fas');
+  eye.removeClass('fa-eye-slash');
+  eye.addClass('fa-eye');
   label.text('<%= Alchemy.t(:show_element) %>');
 <%- end -%>
 

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

@@ -1,11 +1,14 @@
 $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
   Alchemy.growl('<%= j Alchemy.t("Element trashed") %>');
-  $('#element_area .sortable_cell').sortable('refresh');
+  $('#element_area .sortable-elements').sortable('refresh');
   Alchemy.TrashWindow.refresh();
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
   <% @element.richtext_contents_ids.each do |id| %>
   tinymce.get('tinymce_<%= id %>').remove();
   <% end %>
+  <% if @element.fixed? %>
+  Alchemy.FixedElements.removeTab(<%= @element.id %>);
+  <% end %>
 });

data/app/views/alchemy/admin/essence_pictures/assign.js.erb

@@ -6,12 +6,5 @@ $('#<%= @content.dom_id -%>').replaceWith('<%= j(
     options: options_from_params
   )
 ) %>');
-
-<% if @content.siblings.essence_pictures.count > 1 %>
-
-Alchemy.SortableContents('#<%= @content.element.id -%>_contents', '<%= form_authenticity_token %>');
-
-<% end %>
-
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty('#element_<%= @content.element.id %>');

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

@@ -1,27 +1,5 @@
 (function() {
-  var $picture_editor = $('#element_<%= @element.id %>_contents');
-
   $('#essence_picture_<%= @content_id %>').remove();
-
-  <% if max_image_count.present? && @essence_pictures.size < max_image_count.to_i -%>
-
-    if ($('div.add_picture', $picture_editor).length === 0) {
-      $picture_editor.append('<%= j(
-        render "alchemy/admin/elements/add_picture",
-          element: @element,
-          options: options_from_params
-      ) %>');
-    }
-
-  <% end -%>
-
-  <% if @essence_pictures.size > 1 %>
-    Alchemy.SortableContents($picture_editor.selector, '<%= form_authenticity_token %>');
-  <% else %>
-    $picture_editor.find('.draggable_picture').removeClass('draggable_picture');
-    $picture_editor.sortable('destroy');
-  <% end %>
   Alchemy.reloadPreview();
   Alchemy.pleaseWaitOverlay(false);
-
 })()

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

@@ -1,6 +1,4 @@
-<% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil,
-  data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats.alchemy')},
-  disabled: @page.attribute_fixed?(:public_on) %>
+<% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil, disabled: @page.attribute_fixed?(:public_on) %>
 
 <label class="checkbox">
 <% if @page.attribute_fixed?(:public_on) || @page.attribute_fixed?(:public_until) %>
@@ -32,4 +30,4 @@
     <%= alchemy_datepicker @page, :public_until, type: :datetime,
       disabled: @page.attribute_fixed?(:public_until) %>
   </div>
-<% end %>
+<% end %>

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

@@ -178,7 +178,7 @@
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
       Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
-      $('#cells').tabs().tabs('paging', {
+      $('#fixed-elements').tabs().tabs('paging', {
         follow: true,
         followOnSelect: true,
         prevButton: '<i class="fas fa-angle-double-left"></i>',

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

@@ -45,16 +45,20 @@
     <label><%= Alchemy.t('Show clipboard') %></label>
   </div>
 </div>
-<div class="js_filter_field_box">
-  <%= text_field_tag 'filter', '',
-    class: 'thin_border js_filter_field search_input_field',
-    placeholder: Alchemy.t(:search),
-    id: nil %>
-  <%= render_icon :search %>
-  <%= link_to(render_icon(:times, size: 'xs'), '#', {
-    class: "js_filter_field_clear",
-    title: Alchemy.t(:click_to_show_all)
-  }) %>
+<div class="search_form">
+  <div class="search_field">
+    <label>
+      <%= text_field_tag 'filter', '',
+        class: 'search_input_field',
+        placeholder: Alchemy.t(:search),
+        id: nil %>
+      <%= render_icon :search %>
+    </label>
+    <%= link_to(render_icon(:times, size: 'xs'), '#', {
+      class: "search_field_clear",
+      title: Alchemy.t(:click_to_show_all)
+    }) %>
+  </div>
 </div>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<%- if multi_language? -%>
+<% if can?(:switch_language, Alchemy::Page) && @languages.many? %>
 <div class="button_with_label">
   <%= form_tag switch_language_admin_pages_path, method: 'get' do %>
     <%= select_tag(

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

@@ -1,5 +1,5 @@
 <% if can? *navigate_module(navigation) %>
-  <%= content_tag :div, class: main_navigation_css_classes(navigation) do %>
+  <%= content_tag :div, class: main_navigation_css_classes(navigation), data: navigation["data"] do %>
     <%= link_to url_for_module(alchemy_module) do %>
       <% if navigation["image"] %>
         <%= image_tag(navigation["image"]) %>

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

@@ -6,11 +6,13 @@
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
   <div class="search_field">
-    <%= render_icon('search') %>
-    <%= f.search_field resource_handler.search_field_name,
-      placeholder: Alchemy.t(:search),
-      class: 'search_input_field',
-      id: nil %>
+    <label>
+      <%= 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(
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,

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

@@ -16,7 +16,6 @@
     },
 
     list_admin_elements_path: '<%= alchemy.list_admin_elements_path %>',
-    order_admin_contents_path: '<%= alchemy.order_admin_contents_path %>',
     order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
     order_admin_pages_path: '<%= alchemy.order_admin_pages_path %>',
     link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>'

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

@@ -2,10 +2,12 @@
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
-    <%= render_icon('search') %>
-    <%= f.search_field resource_handler.search_field_name,
-      class: 'search_input_field',
-      placeholder: Alchemy.t(:search) %>
+    <label>
+      <%= render_icon('search') %>
+      <%= f.search_field resource_handler.search_field_name,
+        class: 'search_input_field',
+        placeholder: Alchemy.t(:search) %>
+    </label>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
       <%= f.hidden_field field %>
     <% end %>

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

@@ -1,14 +1,17 @@
 <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 %>">
-  <% action_url = create_or_assign_url(picture_to_assign, options) %>
   <%= link_to(
     image_tag(
       picture_to_assign.url(size: preview_size(size), flatten: true),
       alt: picture_to_assign.name
     ),
-    action_url,
+    alchemy.assign_admin_essence_pictures_path(
+      picture_id: picture_to_assign.id,
+      content_id: @content,
+      options: options
+    ),
     remote: true,
     onclick: '$(self).attr("href", "#").off("click"); return false',
-    method: @content.blank? ? 'post' : 'put',
+    method: 'put',
     title: Alchemy.t(:assign_image),
     class: 'thumbnail_background'
   ) %>

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

@@ -55,7 +55,7 @@
     additional_params: [:filter, :tagged_with, :size] %>
 <% end %>
 
-<div id="picture_archive" class="resources-table-wrapper">
+<div id="picture_archive" class="resources-table-wrapper with_tag_filter">
   <div class="resources-header">
     <h2>
       <%= @pictures.total_count %>

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

@@ -8,13 +8,14 @@
 <% end %>
 <div id="trash_items">
 <%- @elements.each do |element| -%>
-  <%= render partial: 'alchemy/admin/elements/element',
-    object: element,
-    locals: {
-      draggable: @allowed_elements.any? do |e|
-        e['name'] == element.name || e.fetch('nestable_elements', []).include?(element.name)
-      end
-    } %>
+  <% draggable = @allowed_elements.any? { |e|
+    !e['fixed'] && e['name'] == element.name || element.name.in?(e.fetch('nestable_elements', []))
+  } %>
+  <%= content_tag :div,
+    data: {'element-id' => element.id, 'element-name' => element.name},
+    class: ['element-editor', draggable ? 'draggable' : 'not-draggable'] do %>
+    <%= render 'alchemy/admin/elements/element_header', element: element %>
+  <% end %>
 <%- end -%>
 </div>
 <p>

data/app/views/alchemy/elements/_editor_not_found.html.erb

@@ -1,4 +1,4 @@
 <%= render_message :warning do %>
   <h2><%= Alchemy.t(:element_editor_not_found) %>:</h2>
-  <p><%= error.html_safe %></p>
+  <p><%== local_assigns[:error] %></p>
 <% end %>

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

@@ -1,25 +1,10 @@
-<%= content_tag :div, id: content.dom_id, data: {"content-id" => content.id}, class: [
-    "essence_picture",
-    options[:sortable] ? "draggable_picture" : nil,
-    options[:grouped] ? nil : "content_editor"
-  ].compact.join(" ") do %>
-  <% unless options[:grouped] %><%= content_label(content) %><br/><% end %>
+<%= content_tag :div, id: content.dom_id, data: {"content-id" => content.id}, class: "content_editor essence_picture" do %>
+  <%= content_label(content) %>
   <div class="picture_thumbnail">
     <span class="picture_tool delete">
-      <% if options[:grouped] %>
-        <%= link_to_confirm_dialog render_icon(:minus), Alchemy.t(:confirm_to_delete_image),
-          alchemy.admin_essence_picture_path(
-            id: content,
-            options: options
-          ), {title: Alchemy.t(:delete_image)} %>
-      <% else %>
-        <%= link_to render_icon(:times), '#',
-          onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
-      <% end %>
+      <%= link_to render_icon(:times), '#',
+        onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
     </span>
-    <%- if content.ingredient -%>
-      <div class="picture_handle" title="<%= Alchemy.t(:drag_to_sort) if options[:sortable] %>"></div>
-    <%- end -%>
     <div class="picture_image">
       <div class="thumbnail_background">
         <%- if content.ingredient -%>

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

@@ -2,6 +2,7 @@
 <html class="no-js">
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= render_alchemy_title %></title>
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
     <%= csrf_meta_tag %>

data/bin/rspec

@@ -1,8 +1,3 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('spring', __dir__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require 'bundler/setup'
 load Gem.bin_path('rspec-core', 'rspec')

data/config/alchemy/config.yml

@@ -195,3 +195,6 @@ format_matchers:
   email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
   url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'
   link_url: !ruby/regexp '/^(mailto:|\/|[a-z]+:\/\/)/'
+
+# The layout used for rendering the +alchemy/admin/pages#show+ action.
+admin_page_preview_layout: application

data/config/brakeman.ignore

@@ -29,7 +29,7 @@
       "file": "app/views/alchemy/admin/contents/create.js.erb",
       "line": 1,
       "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => \"alchemy/essences/#{Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params), :options => options_from_params, :html_options => ((params[:html_options] or {})) })",
+      "code": "render(action => \"alchemy/essences/#{Content.create(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create(Element.find(params[:content][:element_id]), content_params), :options => options_from_params, :html_options => ((params[:html_options] or {})) })",
       "render_path": [{"type":"controller","class":"Alchemy::Admin::ContentsController","method":"create","line":21,"file":"app/controllers/alchemy/admin/contents_controller.rb"}],
       "location": {
         "type": "template",

data/config/locales/alchemy.en.yml

@@ -157,6 +157,7 @@ en:
       site:
         aliases: Please separate additional domains with spaces or new lines.
 
+    add_nested_element: "Add %{name}"
     anchor: 'Anchor'
     attribute_fixed: Value can't be changed for this page type
     back: 'back'
@@ -270,7 +271,6 @@ en:
     "Sort pages": "Reorder pages"
     "Successfully added content": "Successfully added %{content}"
     "Successfully deleted content": "Successfully deleted %{content}"
-    "Successfully saved content position": "Successfully saved content position"
     "Tags": "Tags"
     "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"
     "This page is locked": "This page is currently locked by %{name}"
@@ -299,8 +299,6 @@ en:
     "Your trash is empty": "Your trash is empty"
     above: "above"
     add: "Add"
-    "add new content": "Add new content"
-    add_image_to_element: "Add an image"
     align_in_text: "Alignment in text"
     all: "all"
     all_pictures: "All pictures"
@@ -414,8 +412,8 @@ en:
       file: "File"
       internal: "Internal"
     link_title: "Link title"
-    login: "login"
-    logout: "logout"
+    login: "Login"
+    logout: "Logout"
     mail_to: "Recipient"
     main_content: "Main content"
     male: "Male"
@@ -485,7 +483,6 @@ en:
         comma_seperated: "Separate by comma"
     password: "Password"
     paste: "paste"
-    picture_gallery_editor: 'Pictures'
     picture_library:
       filter:
         last_upload: "from last upload"
@@ -574,11 +571,11 @@ en:
     you_can_rename_this_tag: "You can rename this tag"
     zoom_image: "Zoom this image"
     "Leave Alchemy": "Leave Alchemy"
-    leave: "leave"
+    leave: "Leave"
     "You are about to leave Alchemy": "You are about to leave Alchemy"
     "Do you want to": "Do you want to"
-    "stay logged in": "stay logged in"
-    "or to completely": "or to completely"
+    "stay logged in": "Stay Logged In"
+    "or to completely": "or completely"
     "Are you sure?": "Are you sure?"
     "Create": "Create"
     "Edit": "Edit"
@@ -619,14 +616,11 @@ en:
   time:
     formats:
       alchemy:
-        datepicker: "%Y-%m-%d"
-        datetimepicker: "%Y-%m-%d %H:%M"
         default: "%a, %d %b %Y %H:%M:%S %z"
         essence_date: "%Y-%m-%d"
         page_status: "%m.%d.%Y %H:%M"
         short_datetime: "%d %b %H:%M"
         time: "%H:%M"
-        timepicker: "%H:%M"
 
   # Translations for error messages.
   errors:

data/config/routes.rb

@@ -15,11 +15,7 @@ Alchemy::Engine.routes.draw do
   end
 
   namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
-    resources :contents, only: [:create] do
-      collection do
-        post :order
-      end
-    end
+    resources :contents, only: [:create]
 
     resources :pages do
       resources :elements

data/db/migrate/20180226123013_alchemy_four_point_zero.rb

@@ -18,16 +18,6 @@ class AlchemyFourPointZero < ActiveRecord::Migration[5.0]
       end
     end
 
-    unless table_exists?(:alchemy_cells)
-      create_table :alchemy_cells do |t|
-        t.integer "page_id", null: false
-        t.string "name"
-        t.datetime "created_at", null: false, precision: 6
-        t.datetime "updated_at", null: false, precision: 6
-        t.index ["page_id"], name: "index_alchemy_cells_on_page_id"
-      end
-    end
-
     unless table_exists?(:alchemy_contents)
       create_table :alchemy_contents do |t|
         t.string "name"
@@ -56,10 +46,8 @@ class AlchemyFourPointZero < ActiveRecord::Migration[5.0]
         t.datetime "updated_at", null: false, precision: 6
         t.integer "creator_id"
         t.integer "updater_id"
-        t.integer "cell_id"
         t.text "cached_tag_list"
         t.integer "parent_element_id"
-        t.index ["cell_id"], name: "index_alchemy_elements_on_cell_id"
         t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id"
         t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position"
       end
@@ -332,14 +320,6 @@ class AlchemyFourPointZero < ActiveRecord::Migration[5.0]
       end
     end
 
-    unless foreign_key_exists?(:alchemy_cells, column: :page_id)
-      add_foreign_key :alchemy_cells, :alchemy_pages,
-        column: :page_id,
-        on_update: :cascade,
-        on_delete: :cascade,
-        name: :alchemy_cells_page_id_fkey
-    end
-
     unless foreign_key_exists?(:alchemy_contents, column: :element_id)
       add_foreign_key :alchemy_contents, :alchemy_elements,
         column: :element_id,
@@ -355,19 +335,10 @@ class AlchemyFourPointZero < ActiveRecord::Migration[5.0]
         on_delete: :cascade,
         name: :alchemy_elements_page_id_fkey
     end
-
-    unless foreign_key_exists?(:alchemy_elements, column: :cell_id)
-      add_foreign_key :alchemy_elements, :alchemy_cells,
-        column: :cell_id,
-        on_update: :cascade,
-        on_delete: :cascade,
-        name: :alchemy_elements_cell_id_fkey
-    end
   end
 
   def down
     drop_table(:alchemy_attachments) if table_exists?(:alchemy_attachments)
-    drop_table(:alchemy_cells) if table_exists?(:alchemy_cells)
     drop_table(:alchemy_contents) if table_exists?(:alchemy_contents)
     drop_table(:alchemy_elements) if table_exists?(:alchemy_elements)
     drop_table(:alchemy_elements_alchemy_pages) if table_exists?(:alchemy_elements_alchemy_pages)