alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -0,0 +1,11 @@
+<div class="element-footer">
+  <% if element.has_validations? %>
+    <p class="validation_notice">
+      <span class="validation_indicator">*</span> <%= Alchemy.t('Mandatory') %>
+    </p>
+  <% end %>
+
+  <button type="submit" form="element_<%= element.id %>_form" class="button" data-alchemy-button>
+    <%= Alchemy.t(:save) %>
+  </button>
+</div>

data/app/views/alchemy/admin/elements/{_element_head.html.erb → _element_header.html.erb}

@@ -1,22 +1,22 @@
-<div class="element_head">
-  <div class="element_handle">
+<div class="element-header">
+  <span class="element-handle">
     <%= render_icon(:element) %>
-    <% if element.description.blank? %>
-    <span class="warning icon" title="<%= _t(:element_description_missing) %>"></span>
+    <% if element.definition.blank? %>
+    <span class="warning icon" title="<%= Alchemy.t(:element_definition_missing) %>"></span>
     <% else %>
     <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
     <% end %>
-  </div>
-  <span class="element_heading">
+  </span>
+  <span class="element-title">
     <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) unless element.trashed? %>
-  <span class="ajax_folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
+  <span class="ajax-folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
     <%= link_to '', '#', {
       'data-element-toggle' => element.id,
       class: element.folded? ? 'expand_element' : 'fold_element',
-      title: element.folded? ? _t(:show_element_content) : _t(:hide_element_content),
+      title: element.folded? ? Alchemy.t(:show_element_content) : Alchemy.t(:hide_element_content),
       id: "element_#{element.id}_folder"
     } %>
   </span>

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

@@ -0,0 +1,49 @@
+<% remarkable_type = element.class.name.demodulize.underscore.pluralize %>
+<div class="element-toolbar">
+  <span class="element_tools">
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:element_copy),
+        alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id),
+        remote: true,
+        method: :post,
+        class: "icon_button"
+      ) %>
+      <label><%= Alchemy.t(:copy_element) %></label>
+    </div>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:cut),
+        alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id, remove: true),
+        remote: true,
+        method: :post,
+        class: "icon_button"
+      ) %>
+      <label><%= Alchemy.t(:cut_element) %></label>
+    </div>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:remove),
+        alchemy.trash_admin_element_path(element),
+        method: :delete,
+        class: "icon_button",
+        remote: true
+      ) -%>
+      <label><%= Alchemy.t("trash element") %></label>
+    </div>
+    <div class="button_with_label publish-element-button">
+      <%= link_to(
+        render_icon('element-hide'),
+        alchemy.publish_admin_element_path(id: element.id),
+        remote: true,
+        method: :patch,
+        class: "icon_button"
+      ) %>
+      <% if element.public? %>
+        <label><%= Alchemy.t(:hide_element) %></label>
+      <% else %>
+        <label><%= Alchemy.t(:show_element) %></label>
+      <% end %>
+    </div>
+  </span>
+</div>

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

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

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

@@ -1,6 +1,6 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
 <div class="content_editor picture_gallery_editor">
-  <label><%= _t("picture_gallery_editor.#{element.name}", default: _t(:picture_gallery_editor)) %></label>
+  <label><%= Alchemy.t("picture_gallery_editor.#{element.name}", default: Alchemy.t(:picture_gallery_editor)) %></label>
   <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
     <%- pictures.each do |picture| -%>
       <%= render_essence_editor(picture, {dragable: (pictures.size > 1)}.merge(options)) %>

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

@@ -1,6 +1,6 @@
 <%- rtfs = element.richtext_contents_ids -%>
 (function() {
-  var $element = $('.element_content', '#element_<%= element.id %>');
+  var $element = $('#element_<%= element.id %>_content');
   Alchemy.Tinymce.remove(<%= rtfs.to_json %>);
   $element.html('<%= j render_editor(element) %>');
   Alchemy.GUI.init($element);

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

@@ -4,17 +4,21 @@
   var element_html = '<%= j render("element", element: @element, draggable: true) %>';
 
 <%- if @cutted_element_id -%>
-  $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+  $('.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.buildTabbedCells('<%= Alchemy.t(:main_content) %>');
   }
-  Alchemy.selectOrCreateCellTab('<%= @cell_name %>', '<%= @cell.nil? ? _t(:main_content) : @cell.name_for_label %>');
+  Alchemy.selectOrCreateCellTab('<%= @cell_name %>', '<%= @cell.nil? ? Alchemy.t(:main_content) : @cell.name_for_label %>');
 <%- end -%>
 
+<%- if @element.parent_element -%>
+  $element_area = $('#element_<%= @element.parent_element_id %> > .nestable-elements > .nested-elements');
+<%- else -%>
   $element_area = $('#cell_<%= @cell_name %>');
+<%- end -%>
 
 <%- if @insert_at_top -%>
   $element_area.prepend(element_html);
@@ -22,20 +26,21 @@
   $element_area.append(element_html);
 <%- end -%>
 
-  if ($element_area.find('.element_editor').length > 0) {
+  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.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
   Alchemy.Tinymce.init(<%= @element.richtext_contents_ids.to_json %>);
-  Alchemy.PreviewWindow.refresh();
-  Alchemy.ElementEditors.init();
+  Alchemy.PreviewWindow.refresh(function() {
+    Alchemy.ElementEditors.selectElementInPreview(<%= @element.id %>);
+  });
 
   $el = $('#element_<%= @element.id %>');
-  $el.trigger('Alchemy.SelectElementEditor');
+  $el.trigger('FocusElementEditor.Alchemy');
   Alchemy.GUI.initElement($el);
 
 <%- if @clipboard.blank? -%>

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

@@ -1,28 +1,33 @@
 (function() {
-  var $el = $('.element_editor[data-element-id="<%= @element.id %>"]');
+  var $el = $('.element-editor[data-element-id="<%= @element.id %>"]');
 
 <% 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 -%>
 
   $el.replaceWith('<%= j 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? -%>
 
   Alchemy.Tinymce.remove(<%= @element.richtext_contents_ids.to_json %>);
 
-<% else -%>
+  <% else -%>
 
-  $el.trigger('Alchemy.SelectElementEditor');
+  $el.trigger('FocusElementEditor.Alchemy');
   Alchemy.Tinymce.init(<%= @element.richtext_contents_ids.to_json %>);
   Alchemy.GUI.initElement($el);
+  Alchemy.SortableElements(
+    <%= @page.id %>,
+    '<%= form_authenticity_token %>',
+    $('> .nestable-elements .nested-elements', $el)
+  );
 
-<% end -%>
+  <% end -%>
 
 <% end -%>
 })();

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

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

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

@@ -1,16 +1,16 @@
 <%= render_message do %>
-  <p><%= _t(:choose_element_as_target) %></p>
+  <p><%= Alchemy.t(:choose_element_as_target) %></p>
 <% end %>
 <%= form_tag '' do %>
   <%= select_tag "element_from_page_#{@page_id}_to_link",
     options_for_select(
       @elements.collect { |m| [m.display_name_with_preview_text.html_safe, "##{m.dom_id}"] }
     ),
-    prompt: _t(:choose_element_to_link),
+    prompt: Alchemy.t(:choose_element_to_link),
     class: 'elements_from_page_selector alchemy_selectbox',
     autofocus: true
   %>
   <div class="submit">
-    <%= button_tag _t(:apply) %>
+    <%= button_tag Alchemy.t(:apply) %>
   </div>
 <% end %>

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

@@ -3,8 +3,8 @@
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#create_element_tab"><%= _t('New') %></a></li>
-    <li><a href="#paste_element_tab"><%= _t('Paste from clipboard') %></a></li>
+    <li><a href="#create_element_tab"><%= Alchemy.t('New') %></a></li>
+    <li><a href="#paste_element_tab"><%= Alchemy.t('Paste from clipboard') %></a></li>
   </ul>
   <div id="create_element_tab">
     <%= render 'new_element_form' %>
@@ -13,12 +13,12 @@
     <%= alchemy_form_for([:admin, @element]) do |f| %>
       <%= f.hidden_field(:page_id) %>
       <div class="input select">
-        <label for="paste_from_clipboard" class="control-label"><%= _t("Element") %></label>
+        <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',
           clipboard_select_tag_options(@clipboard_items),
           class: 'alchemy_selectbox' %>
       </div>
-      <%= f.submit _t(:paste) %>
+      <%= f.submit Alchemy.t(:paste) %>
     <% end %>
   </div>
 </div>

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

@@ -1,14 +1,13 @@
-$('#element_area .ajax_folder').show();
+$('#element_area .ajax-folder').show();
 Alchemy.PreviewWindow.refresh();
 <% if @trashed_element_ids.any? %>
-Alchemy.growl('<%= _t(:successfully_restored_element) -%>');
+Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
 <% element_ids = @trashed_element_ids.collect do |id|
                    "#element_area [data-element-id=\"#{id}\"]"
                  end.join(", ").html_safe %>
 <% @trashed_element_ids.each do |id| %>
 $('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
 <% end %>
-Alchemy.ElementEditors.reinit('<%= element_ids %>');
 <% else %>
-Alchemy.growl('<%= _t(:successfully_saved_element_position) -%>');
+Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
 <% end %>

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

@@ -0,0 +1,15 @@
+var el = $('.element-editor[data-element-id="<%= @element.id %>"]');
+var icon = el.find('> .element-header > .element-handle .icon:not(.element)');
+var label = el.find('> .element-toolbar .publish-element-button label');
+
+<%- if @element.public? -%>
+  icon.removeClass('element_draft');
+  icon.addClass('element_public');
+  label.text('<%= Alchemy.t(:hide_element) %>');
+<%- else -%>
+  icon.removeClass('element_public');
+  icon.addClass('element_draft');
+  label.text('<%= Alchemy.t(:show_element) %>');
+<%- end -%>
+
+Alchemy.reloadPreview();

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

@@ -1,12 +1,12 @@
 $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
-  Alchemy.growl('<%= j _t("Element trashed") %>');
+  Alchemy.growl('<%= j Alchemy.t("Element trashed") %>');
   $('#element_area .sortable_cell').sortable('refresh');
   Alchemy.TrashWindow.refresh();
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
-  <% @element.contents.essence_richtexts.each do |content| %>
-  tinymce.get('contents_content_<%= content.id %>_body').remove();
+  <% @element.richtext_contents_ids.each do |id| %>
+  tinymce.get('tinymce_<%= id %>').remove();
   <% end %>
   <%= update_essence_select_elements(@page, @element) -%>
 });

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

@@ -1,14 +1,14 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
-  $('.content_editor', $el).removeClass('validation_failed');
+  var $errors = $('#element_<%= @element.id %>_errors');
+  $('> .element-content .content_editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
-  $('.element_head', $el).replaceWith('<%= j render("element_head", element: @element) %>');
-  Alchemy.ElementEditors.reinit($el);
-  $("#element_<%= @element.id %>_errors").hide();
+  $el.find('> .element-header').replaceWith('<%= j render("element_header", element: @element) %>');
+  $errors.hide();
   Alchemy.setElementSaved($el);
-  Alchemy.growl('<%= _t(:element_saved) %>');
+  Alchemy.growl('<%= Alchemy.t(:element_saved) %>');
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.selectElementInPreview(<%= @element.id %>);
   });
@@ -17,10 +17,9 @@
 <%- else -%>
 
   Alchemy.growl('<%= j @notice %>', 'warn');
-  $('#element_<%= @element.id %>_errors').html('<%= j @error_message %><ul><li><%== j @element.essence_error_messages.join("</li><li>") %></li></ul>');
-  $("#element_<%= @element.id %>_errors").show();
+  $errors.html('<%= j @error_message %><ul><li><%== j @element.essence_error_messages.join("</li><li>") %></li></ul>');
+  $errors.show();
   $('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
-  Alchemy.ElementEditors.scrollToElement('#element_<%= @element.id %>');
   Alchemy.Buttons.enable($el);
 
 <%- end -%>

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

@@ -1,18 +1,21 @@
+<% css_classes = @content.settings_value(:css_classes, local_assigns.fetch(:options, {})) %>
+
 <%= alchemy_form_for [:admin, @essence_file] do |f| %>
+  <%= f.input :link_text %>
   <%= f.input :title %>
-    <%- if @options[:css_classes].present? -%>
-      <%= f.input :css_class,
-        collection: @options[:css_classes],
-        include_blank: _t('None'),
-        input_html: {class: 'alchemy_selectbox'} %>
-    <%- else -%>
+  <%- if css_classes.present? -%>
     <%= f.input :css_class,
-      label: _t(:position_in_text),
+      collection: css_classes,
+      include_blank: Alchemy.t('None'),
+      input_html: {class: 'alchemy_selectbox'} %>
+  <%- else -%>
+    <%= f.input :css_class,
+      label: Alchemy.t(:position_in_text),
       collection: [
-        [_t(:above), "no_float"],
-        [_t(:left), "left"],
-        [_t(:right), "right"]
-      ], include_blank: _t('Layout default'), input_html: {class: 'alchemy_selectbox'} %>
-    <%- end -%>
-  <%= f.submit _t(:save) %>
+        [Alchemy.t(:above), "no_float"],
+        [Alchemy.t(:left), "left"],
+        [Alchemy.t(:right), "right"]
+      ], include_blank: Alchemy.t('Layout default'), input_html: {class: 'alchemy_selectbox'} %>
+  <%- end -%>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>