alchemy_cms 4.1.2 → 4.2.0.rc1

data/app/serializers/alchemy/attachment_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class AttachmentSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :file_name,

data/app/serializers/alchemy/content_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class ContentSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :ingredient,

data/app/serializers/alchemy/element_serializer.rb

@@ -2,13 +2,10 @@
 
 module Alchemy
   class ElementSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :position,
       :page_id,
-      :cell_id,
       :tag_list,
       :created_at,
       :updated_at,

data/app/serializers/alchemy/essence_boolean_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceBooleanSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :value,
       :created_at,

data/app/serializers/alchemy/essence_date_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceDateSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :date,
       :created_at,

data/app/serializers/alchemy/essence_file_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceFileSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :title,
       :css_class

data/app/serializers/alchemy/essence_html_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceHtmlSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :source,
       :created_at,

data/app/serializers/alchemy/essence_link_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceLinkSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :link,
       :link_title,

data/app/serializers/alchemy/essence_picture_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssencePictureSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :picture_id,
       :caption,

data/app/serializers/alchemy/essence_richtext_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceRichtextSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :body,
       :stripped_body,

data/app/serializers/alchemy/essence_select_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceSelectSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :value,
       :created_at,

data/app/serializers/alchemy/essence_text_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class EssenceTextSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :body,
       :link,

data/app/serializers/alchemy/legacy_element_serializer.rb

@@ -2,13 +2,10 @@
 
 module Alchemy
   class LegacyElementSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :position,
       :page_id,
-      :cell_id,
       :tag_list,
       :created_at,
       :updated_at

data/app/serializers/alchemy/page_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class PageSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :urlname,
@@ -17,14 +15,10 @@ module Alchemy
       :updated_at,
       :status
 
-    has_many :elements, :cells
+    has_many :elements
 
     def elements
-      if object.has_cells?
-        object.elements.not_in_cell.published
-      else
-        object.elements.published
-      end
+      object.elements.published
     end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -67,7 +67,7 @@ module Alchemy
       }
 
       if opts[:elements]
-        p_hash.update(elements: ActiveModel::ArraySerializer.new(page_elements(page)))
+        p_hash.update(elements: ActiveModel::Serializer::CollectionSerializer.new(page_elements(page)))
       end
 
       if opts[:ability].can?(:index, :alchemy_admin_pages)

data/app/serializers/alchemy/picture_serializer.rb

@@ -2,8 +2,6 @@
 
 module Alchemy
   class PictureSerializer < ActiveModel::Serializer
-    self.root = false
-
     attributes :id,
       :name,
       :image_file_name,

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

@@ -10,14 +10,14 @@
     <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
       <% if item_class == 'pages' %>
         <%= render_icon(:file, style: 'regular') %>
-        <%= item.name %>
+        <%= truncate(item.name, length: 50) %>
       <% else %>
         <% if item.public? %>
           <%= render_icon('window-maximize', style: 'regular', class: 'element') %>
         <% else %>
           <%= render_icon('window-close', class: 'element') %>
         <% end %>
-        <%= item.display_name_with_preview_text(60) %>
+        <%= truncate(item.display_name_with_preview_text(50), length: 50) %>
       <% end %>
       <span class="float_right">
         <%= link_to render_icon(:times, size: 'xs'),

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -1,19 +1,16 @@
 <% if params[:remove] -%>
+  $(".element-editor[data-element-id='<%= @item.id %>']").remove();
 
-$(".element-editor[data-element-id='<%= @item.id %>']").remove();
+  <% if @item.class.name == 'Alchemy::Element' -%>
+    $('#element_area .sortable-elements').sortable('refresh');
 
-<% if @item.class.to_s == 'Element' -%>
-
-$('#element_area .sortable_cell').sortable('refresh');
-
-<% end -%>
-
-Alchemy.growl('<%= j Alchemy.t("item moved to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>');
+    <% if @item.fixed? -%>
+      Alchemy.FixedElements.removeTab(<%= @item.id %>);
+    <% end -%>
+  <% end -%>
 
+  Alchemy.growl('<%= j Alchemy.t("item moved to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>');
 <% else -%>
-
-Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
-
+  Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
 <% end -%>
-
 $('#clipboard_button .icon').removeClass('fa-clipboard').addClass('fa-paste');

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

@@ -2,41 +2,15 @@ var editor_html = '<%= j(render "alchemy/essences/#{@content.essence_partial_nam
   content: @content, options: options_from_params, html_options: @html_options
 }) %>';
 
-<% if params[:was_missing] %>
+$("[data-element-<%= @content.element_id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
 
-$("[data-element-<%= @element.id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
+<% if @content.essence_type == "Alchemy::EssencePicture" && @content.ingredient %>
 
-<% else %>
-
-$("<%= @content_dom_id %>").before(editor_html);
-Alchemy.Buttons.enable();
-Alchemy.growl('<%= j Alchemy.t("Successfully added content") % {content: @content.name_for_label} %>')
-
-<% end %>
-
-<% if @content.essence_type == "Alchemy::EssencePicture" %>
-
-<% if @content.ingredient %>
 $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
-<% end %>
-
-<% if @gallery_pictures %>
-
-<% if @gallery_pictures.size > 1 %>
-$('#element_<%= @element.id %>_contents .essence_picture').addClass('draggable_picture');
-<% end %>
-
-<% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>
-$("#add_picture_<%= @element.id %>").remove();
-<% end %>
-
-Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
-
-<% end %>
 
 <% elsif @content.essence_type == "Alchemy::EssenceDate" %>
 
-Alchemy.Datepicker('#element_<%= @element.id %>');
+Alchemy.Datepicker('#element_<%= @content.element_id %>');
 
 <% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
 
@@ -46,4 +20,4 @@ Alchemy.Tinymce.initEditor(<%= @content.id %>);
 
 Alchemy.reloadPreview();
 Alchemy.closeCurrentDialog();
-Alchemy.SelectBox("#element_<%= @element.id %>");
+Alchemy.SelectBox("#element_<%= @content.element_id %>");

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

@@ -1,11 +1,13 @@
 <%= content_tag :div,
   id: "element_#{element.id}",
   data: {'element-id' => element.id, 'element-name' => element.name},
-  class: element_editor_classes(element, local_assigns) do %>
+  class: element_editor_classes(element) do %>
 
-  <%= render 'alchemy/admin/elements/element_header', element: element %>
+  <% unless element.fixed? %>
+    <%= render 'alchemy/admin/elements/element_header', element: element %>
+  <% end %>
 
-  <% if element.expanded? %>
+  <% if element.expanded? || element.fixed? %>
     <%= render 'alchemy/admin/elements/element_toolbar', element: element %>
 
     <%= form_for [alchemy, :admin, element], remote: true,
@@ -38,15 +40,28 @@
         <%= render partial: 'alchemy/admin/elements/element', collection: element.nested_elements %>
       <% end %>
 
-      <% if element.expanded? %>
-        <%= link_to_dialog render_icon(:plus, size: 'xs') + Alchemy.t("New Element"),
-          alchemy.new_admin_element_path(
-            parent_element_id: element.id,
-            page_id: element.page.id
-          ), {
-            size: "320x125",
-            title: Alchemy.t("New Element")
-          }, class: "button with_icon add-nestable-element-button" %>
+      <% if element.expanded? || element.fixed? %>
+        <% if element.nestable_elements.length == 1 %>
+          <% nestable_element = element.nestable_elements.first %>
+          <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
+            remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
+            <%= f.hidden_field :name %>
+            <%= f.hidden_field :page_id, value: element.page_id %>
+            <%= f.hidden_field :parent_element_id, value: element.id %>
+            <button class="button add-nestable-element-button" data-alchemy-button>
+              <%= Alchemy.t(:add_nested_element) % { name: Alchemy.t(nestable_element, scope: 'element_names') } %>
+            </button>
+          <% end %>
+        <% else %>
+          <%= link_to_dialog Alchemy.t("New Element"),
+            alchemy.new_admin_element_path(
+              parent_element_id: element.id,
+              page_id: element.page.id
+            ), {
+              size: "320x125",
+              title: Alchemy.t("New Element")
+            }, class: "button add-nestable-element-button" %>
+        <% end %>
       <% end %>
     </div>
   <% end %>

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

@@ -33,7 +33,7 @@
     </div>
     <div class="button_with_label publish-element-button">
       <%= link_to(
-        render_icon('eye-slash'),
+        render_icon(element.public? ? 'eye-slash' : 'eye'),
         alchemy.publish_admin_element_path(id: element.id),
         remote: true,
         method: :patch,

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

@@ -5,21 +5,11 @@
 <%- else -%>
   <%= alchemy_form_for [:admin, @element] do |form| %>
     <%= form.hidden_field :page_id %>
-  <%- if @page.can_have_cells? && @parent_element.blank? -%>
-    <%= form.input :name,
-      label: Alchemy.t(:element_of_type),
-      collection: grouped_elements_for_select(@elements),
-      as: :grouped_select,
-      group_method: :second,
-      prompt: Alchemy.t(:select_element),
-      input_html: {class: 'alchemy_selectbox', autofocus: true} %>
-  <%- else -%>
     <%= form.input :name,
       label: Alchemy.t(:element_of_type),
       collection: elements_for_select(@elements),
       prompt: Alchemy.t(:select_element),
       input_html: {class: 'alchemy_selectbox', autofocus: true} %>
-  <%- end -%>
     <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
     <%= form.submit Alchemy.t(:add) %>
   <%- end -%>

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

@@ -3,22 +3,22 @@
   var $element_area;
   var element_html = '<%= j render("element", element: @element, draggable: true) %>';
 
-<%- if @cutted_element_id -%>
-  $('.element-editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+<%- if @cut_element_id -%>
+  $('.element-editor[data-element-id="<%= @cut_element_id %>"]').remove();
 <%- end -%>
 
-<%- if @page.can_have_cells? -%>
-  if ($('#cells').length == 0) {
-    Alchemy.buildTabbedCells('<%= Alchemy.t(:main_content) %>');
+<% if @element.fixed? %>
+  if ($('#fixed-elements').length == 0) {
+    Alchemy.FixedElements.buildTabs('<%= Alchemy.t(:main_content) %>');
   }
-  Alchemy.selectOrCreateCellTab('<%= @cell_name %>', '<%= @cell.nil? ? Alchemy.t(:main_content) : @cell.name_for_label %>');
-<%- end -%>
-
-<%- if @element.parent_element -%>
+  Alchemy.FixedElements.createTab('<%= @element.id %>', '<%= @element.display_name %>');
+  $element_area = $('#fixed-element-<%= @element.id %>');
+<% elsif @element.parent_element %>
   $element_area = $('#element_<%= @element.parent_element_id %> > .nestable-elements > .nested-elements');
-<%- else -%>
-  $element_area = $('#cell_<%= @cell_name %>');
-<%- end -%>
+  Alchemy.Buttons.enable('.nestable-elements');
+<% else %>
+  $element_area = $('#main-content-elements');
+<% end %>
 
 <%- if @insert_at_top -%>
   $element_area.prepend(element_html);

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

@@ -10,7 +10,7 @@
 
   $el.replaceWith('<%= j render(partial: "element", object: @element) %>');
   $el = $('#element_<%= @element.id %>');
-  $('#element_area .sortable_cell').sortable('refresh');
+  $('#element_area .sortable-elements').sortable('refresh');
 
   <% if @element.folded? -%>
 

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

@@ -1,32 +1,33 @@
-<% if @cells.any? %>
-  <div id="cells">
+<% if @fixed_elements.any? %>
+  <div id="fixed-elements">
     <ul>
-      <li><a href="#cell_for_other_elements"><%= Alchemy.t(:main_content) %></a></li>
-      <% @elements.each do |cell, elements| %>
+      <li>
+        <a href="#main-content-elements">
+          <%= Alchemy.t(:main_content) %>
+        </a>
+      </li>
+      <% @fixed_elements.each do |element| %>
         <li>
-          <a href="#cell_<%= cell.name %>">
-            <%= Alchemy.t(cell.name, scope: :cell_names) %>
+          <a href="#fixed-element-<%= element.id %>">
+            <%= element.display_name %>
           </a>
         </li>
       <% end %>
     </ul>
-    <div id="cell_for_other_elements"
-      class="sortable_cell for_other_elements_cell"
-      data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
-      <%= render partial: 'alchemy/admin/elements/element',
-        collection: @page.elements.not_trashed.not_in_cell %>
+    <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
+      <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
     </div>
-    <% @elements.each do |cell, elements| -%>
-      <%= content_tag :div,
-        id: "cell_#{cell.name}",
-        class: ["sortable_cell", "#{cell.name}_cell"].join(' '),
-        data: {'cell-id' => cell.id, 'droppable-elements' => cell.element_definitions.join(' ')} do %>
-        <%= render partial: 'alchemy/admin/elements/element', collection: elements %>
-      <% end %>
+    <% @fixed_elements.each do |element| %>
+      <div
+        id="fixed-element-<%= element.id %>"
+        class="sortable-elements"
+        data-droppable-elements="<%= element.nestable_elements.join(' ') %>">
+        <%= render 'alchemy/admin/elements/element', element: element %>
+      </div>
     <% end %>
   </div>
 <% else %>
-  <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements" data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
+  <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
     <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
   </div>
 <% end %>