alchemy_cms 4.3.2 → 4.4.0

data/app/views/alchemy/admin/nodes/_node.html.erb

@@ -0,0 +1,87 @@
+<li>
+  <%= content_tag :div, class: [
+    'sitemap_node',
+    node.external? ? 'external' : 'internal',
+    "sitemap_node-level_#{node.depth}"
+  ] do %>
+    <span class="nodes_tree-left_images">
+      <% if node.children.any? %>
+        <a class="node_folder" data-node-id="<%= node.id %>">
+          <% if node.folded? %>
+            <i class="far fa-plus-square fa-fw"></i>
+          <% else %>
+            <i class="far fa-minus-square fa-fw"></i>
+          <% end %>
+        </a>
+      <% else %>
+        &nbsp;
+      <% end %>
+    </span>
+    <span class="nodes_tree-right_tools">
+      <% if can?(:edit, node) %>
+        <%= link_to_dialog(
+          render_icon(:edit),
+          alchemy.edit_admin_node_path(node),
+          {
+            title: node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node),
+            size: node.root? ? '450x120' : '450x360'
+          },
+          title: node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node)
+        ) %>
+      <% end %>
+      <% if can?(:destroy, node) %>
+        <%= link_to_confirm_dialog(
+          render_icon(:minus),
+          node.root? ? Alchemy.t(:confirm_to_delete_menu) : Alchemy.t(:confirm_to_delete_node),
+          url_for(
+            controller: 'nodes',
+            action: 'destroy',
+            id: node.id
+          ),
+          {
+            title: node.root? ? Alchemy.t(:delete_menu) : Alchemy.t(:delete_node)
+          }
+        ) %>
+      <% end %>
+      <% if can?(:create, Alchemy::Node) %>
+        <%= link_to_dialog(
+          render_icon(:plus),
+          alchemy.new_admin_node_path(parent_id: node.id),
+          {
+            title: Alchemy.t(:create_node),
+            size: '450x360',
+            overflow: true
+          },
+          title: Alchemy.t(:create_node)
+        ) %>
+      <% end %>
+    </span>
+    <div class="node_name">
+      <%= node.name || '&nbsp;'.html_safe %>
+      <span class="node_page">
+      <% if node.page %>
+        <i class="icon far fa-file"></i>
+        &nbsp;
+        <%= link_to [:edit, :admin, node.page], title: Alchemy.t(:edit_page) do %>
+          <%= node.page.name %>
+        <% end %>
+      <% end %>
+      </span>
+      <% if node.url %>
+        <span class="node_url">
+          <%= link_to node.url, node.url, target: '_blank', title: node.url %>
+          <% if node.external? %>
+            <i class="fas fa-external-link-alt fa-sm"></i>
+          <% end %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
+  <% if node.children.any? %>
+    <ul class="children<%= node.folded? ? ' hidden' : nil %>">
+      <% unless node.folded? %>
+        <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
+      <% end %>
+    </ul>
+  <% end %>
+</li>

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

@@ -0,0 +1 @@
+<%= render 'form', node: @node, button_label: Alchemy.t(:save) %>

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

@@ -0,0 +1,58 @@
+<% content_for(:title) do %>
+  <%= Alchemy.t(:menus, scope: 'modules') %>
+<% end %>
+
+<% content_for(:toolbar) do %>
+  <div class="toolbar_buttons">
+    <%= render 'alchemy/admin/partials/site_select' %>
+    <%= render 'alchemy/admin/partials/language_tree_select' %>
+    <%= toolbar_button(
+      icon: 'plus',
+      label: Alchemy.t(:create_menu),
+      url: alchemy.new_admin_node_path,
+      hotkey: 'alt+n',
+      dialog_options: {
+        title: Alchemy.t(:create_menu),
+        size: '450x120'
+      },
+      if_permitted_to: [:create, Alchemy::Node]
+    ) %>
+  </div>
+<% end %>
+
+<div id="archive_all">
+  <h1 id="node_filter_result"></h1>
+  <% if @root_nodes.any? %>
+    <% @root_nodes.each do |root_node| %>
+      <ul class="nodes_tree list">
+        <%= render 'node', node: root_node %>
+      </ul>
+    <% end %>
+  <% else %>
+    <div class="panel no-resource-found">
+      <%= render_message do %>
+        <%= Alchemy.t(:no_resource_found) % { resource: Alchemy.t(:menu) } %>
+      <% end %>
+      <%= render 'form', node: Alchemy::Node.new(language: Alchemy::Language.current), button_label: Alchemy.t(:create) %>
+    </div>
+  <% end %>
+</div>
+
+<script>
+  $('.nodes_tree').on('click', '.node_folder', function() {
+    var $this = $(this)
+    var node_id = $this.data('node-id')
+    var url = '<%= alchemy.toggle_admin_node_path(id: ":id") %>'.replace(':id', node_id)
+    var $children = $this.closest('li').find('> .children')
+    $this.find('> i').
+      toggleClass('fa-plus-square').
+      toggleClass('fa-minus-square')
+    $children.toggleClass('hidden')
+    $.ajax(url, { method: 'PATCH' }).then(function (nodes) {
+      if ($children.children().length === 0) {
+        $children.append(nodes)
+      }
+    })
+    return false
+  })
+</script>

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

@@ -0,0 +1 @@
+<%= render 'form', node: @node, button_label: Alchemy.t(:create) %>

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

@@ -0,0 +1,22 @@
+<%= form_tag do %>
+  <%= render_message do %>
+    <p><%= Alchemy.t(:anchor_link_headline) %></p>
+  <% end %>
+  <div class="input select">
+    <label for="anchor_link" class="control-label">
+      <%= Alchemy.t(:anchor) %>
+    </label>
+    <%= select_tag(:anchor_link,
+      options_for_select([[Alchemy.t('Please choose'), '']]),
+      class: 'alchemy_selectbox') %>
+  </div>
+  <div class="input text">
+    <label for="anchor_link_title" class="control-label">
+      <%= Alchemy.t(:link_title) %>
+    </label>
+    <%= text_field_tag "anchor_link_title", '', class: 'link_title' %>
+  </div>
+  <div class="submit">
+    <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'anchor' %>
+  </div>
+<% end %>

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

@@ -9,8 +9,8 @@
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
       <%= render 'alchemy/admin/pages/publication_fields' %>
-      <%= page_status_checkbox(@page, :visible) %>
       <%= page_status_checkbox(@page, :restricted) %>
+      <%= render 'alchemy/admin/pages/menu_fields', f: f %>
       <% if configuration(:sitemap)['show_flag'] %>
         <%= page_status_checkbox(@page, :sitemap) %>
       <% end %>

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

@@ -2,20 +2,18 @@
   <%= render_message do %>
     <h3><%= Alchemy.t(:internal_link_headline) %></h3>
     <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
-    <p><%= Alchemy.t(:internal_link_page_anchors_explanation) %></p>
   <% end %>
-  <div id="page_selector_container">
-    <% if @page_root %>
-      <%= render 'sitemap', page_partial: 'page_for_links', full: true %>
-    <% end %>
+  <div class="input select">
+    <label for="page_urlname" class="control-label">
+      <%= Alchemy.t(:page) %>
+    </label>
+    <input type="text" id="page_urlname" class="alchemy_selectbox full_width">
   </div>
   <div class="input select">
-    <label for="internal_anchor" class="control-label">
+    <label for="element_anchor" class="control-label">
       <%= Alchemy.t(:anchor) %>
     </label>
-    <%= select_tag(:internal_anchor,
-      options_for_select([[Alchemy.t('Please choose'), '']]),
-      class: 'alchemy_selectbox') %>
+    <input type="text" id="element_anchor" class="alchemy_selectbox full_width" disabled placeholder="<%= Alchemy.t('Select a page first') %>">
   </div>
   <div class="input text">
     <label for="internal_link_title" class="control-label">
@@ -32,8 +30,6 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= hidden_field_tag(:internal_urlname) %>
-    <%= hidden_field_tag(:page_anchor) %>
     <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
   </div>
 <% end %>

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

@@ -0,0 +1,33 @@
+<% if @page.menus.any? %>
+  <label class="checkbox">
+    <input type="checkbox" disabled checked>
+    <%= Alchemy.t(:attached_to) %>
+  </label>
+  <% @page.menus.each do |menu| %>
+    <span class="page-menu-name label">
+      <%= menu.name %>
+    </span>
+  <% end %>
+<% elsif Alchemy::Node.roots.any? %>
+  <%= page_status_checkbox(@page, :visible) %>
+  <%= f.input :menu_id, collection: Alchemy::Node.roots.map { |n| [n.name, n.id] },
+    prompt: Alchemy.t('Please choose a menu'),
+    input_html: { class: 'alchemy_selectbox' },
+    wrapper_html: { style: @page.visible? ? 'display: block' : 'display: none' },
+    label: false %>
+  <script>
+    (function() {
+      var $wrapper = $('.input.page_menu_id')
+      $('#page_visible').click(function() {
+        if ($(this).is(':checked')) {
+          $wrapper.show()
+        } else {
+          $wrapper.find('select').val('')
+          $wrapper.hide()
+        }
+      })
+    })()
+  </script>
+<% else %>
+  <%= page_status_checkbox(@page, :visible) %>
+<% end %>

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

@@ -24,13 +24,6 @@
      ,ready: function () {
        Alchemy.PageSorter();
      }
-     <% elsif action_name == 'link' %>
-     ,spinner: new Alchemy.Spinner('small'),
-     ready: function () {
-       if (Alchemy.currentDialog()) {
-         Alchemy.currentDialog().attachTreeEvents();
-       }
-     }
      <% end %>
    });
  });

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

@@ -1,12 +1,16 @@
 <div id="overlay_tabs">
   <ul>
     <li><a href="#overlay_tab_internal_link"><%= Alchemy.t('link_overlay_tab_label.internal') %></a></li>
+    <li><a href="#overlay_tab_anchor_link"><%= Alchemy.t('link_overlay_tab_label.anchor') %></a></li>
     <li><a href="#overlay_tab_external_link"><%= Alchemy.t('link_overlay_tab_label.external') %></a></li>
     <li><a href="#overlay_tab_file_link"><%= Alchemy.t('link_overlay_tab_label.file') %></a></li>
   </ul>
   <div id="overlay_tab_internal_link">
     <%= render partial: 'internal_link' %>
   </div>
+  <div id="overlay_tab_anchor_link">
+    <%= render partial: 'anchor_link' %>
+  </div>
   <div id="overlay_tab_external_link">
     <%= render partial: 'external_link' %>
   </div>

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

@@ -1,9 +1,13 @@
-<% if can?(:switch_language, Alchemy::Page) && @languages.many? %>
+<% languages = Alchemy::Language.on_current_site %>
+<% if can?(:switch_language, Alchemy::Page) && languages.many? %>
 <div class="button_with_label">
-  <%= form_tag switch_language_admin_pages_path, method: 'get' do %>
+  <%= form_tag switch_admin_languages_path, method: 'get' do %>
     <%= select_tag(
       'language_id',
-      options_for_select(@languages.map { |l| [l.name, l.id] }, Alchemy::Language.current.id),
+      options_for_select(
+        languages.map { |l| [l.name, l.id] },
+        Alchemy::Language.current.id
+      ),
       class: 'alchemy_selectbox short',
       data: {'auto-submit' => true}
     ) %>

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

@@ -15,10 +15,10 @@
       return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
     },
 
-    list_admin_elements_path: '<%= alchemy.list_admin_elements_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 %>'
-
+    link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',
+    api_pages_path: '<%= alchemy.api_pages_path %>',
+    api_elements_path: '<%= alchemy.api_elements_path %>'
   };
 </script>

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

@@ -1 +1,2 @@
+<% content = local_assigns[:content] || local_assigns[:essence_boolean_view] %>
 <%= Alchemy.t(content.ingredient) unless content.ingredient.nil? -%>

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_date_view] %>
 <%- date_format = content.settings_value(:date_format,
   local_assigns.fetch(:options, {})) -%>
 <%- if content.ingredient.present? -%>

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_file_view] %>
 <%- if attachment = content.ingredient -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%= link_to(

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

@@ -1 +1,2 @@
+<% content = local_assigns[:content] || local_assigns[:essence_html_view] %>
 <%= raw content.ingredient -%>

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_link_view] %>
 <%- if content.ingredient.present? -%>
 <%- html_options = {
   target: content.essence.link_target == "blank" ? "_blank" : nil

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

@@ -0,0 +1,23 @@
+<div class="content_editor essence_spree_page" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= content_label(content) %>
+  <%= text_field_tag(
+    content.form_field_name,
+    content.essence.page_id,
+    id: content.form_field_id,
+    class: 'alchemy_selectbox full_width'
+  ) %>
+</div>
+
+<script>
+  $('#<%= content.form_field_id %>').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    query_params: <%== content.settings[:query_params].to_json %>,
+    <% if content.essence.page %>
+    initialSelection: {
+      id: <%= content.essence.page_id %>,
+      text: "<%= content.essence.page.name %>"
+    }
+    <% end %>
+  })
+</script>

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

@@ -0,0 +1,5 @@
+<% content = local_assigns[:content] || local_assigns[:essence_page_view] %>
+<% page = content.ingredient %>
+<% if page %>
+<%= link_to page.name, alchemy.show_page_path(urlname: page.urlname) %>
+<% end %>

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

@@ -1,3 +1,5 @@
+<% options = local_assigns.fetch(:options, {}) %>
+
 <%= 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">

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_picture_view] %>
 <%= Alchemy::EssencePictureView.new(
   content,
   local_assigns[:options],

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_richtext_view] %>
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- plain_text = !!content.settings_value(:plain_text, options) -%>
 <%= raw content.essence.public_send(plain_text ? :stripped_body : :body) -%>

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

@@ -1,5 +1,6 @@
 <% select_values = content.settings_value(:select_values, local_assigns.fetch(:options, {})) %>
 <% inline = content.settings_value(:display_inline, local_assigns.fetch(:options, {})) %>
+<% html_options = local_assigns.fetch(:html_options, {}) %>
 
 <%= content_tag :div,
   id: content.dom_id,

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

@@ -1 +1,2 @@
+<% content = local_assigns[:content] || local_assigns[:essence_select_view] %>
 <%= content.ingredient %>

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

@@ -1,3 +1,6 @@
+<% options = local_assigns.fetch(:options, {}) %>
+<% html_options = local_assigns.fetch(:html_options, {}) %>
+
 <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
   <%= content_label(content) %>
   <%= text_field_tag(

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

@@ -1,3 +1,4 @@
+<% content = local_assigns[:content] || local_assigns[:essence_text_view] %>
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%- if content.essence.link.blank? ||

data/config/alchemy/modules.yml

@@ -28,9 +28,18 @@
       - controller: 'alchemy/admin/pages'
         action: edit
 
-- name: languages
+- name: menus
   engine_name: alchemy
   position: 3
+  navigation:
+    name: 'modules.menus'
+    controller: 'alchemy/admin/nodes'
+    action: index
+    icon: list-ul
+
+- name: languages
+  engine_name: alchemy
+  position: 4
   navigation:
     name: 'modules.languages'
     controller: 'alchemy/admin/languages'
@@ -39,7 +48,7 @@
 
 - name: sites
   engine_name: alchemy
-  position: 4
+  position: 5
   navigation:
     name: 'modules.sites'
     controller: 'alchemy/admin/sites'
@@ -48,7 +57,7 @@
 
 - name: tags
   engine_name: alchemy
-  position: 5
+  position: 6
   navigation:
     name: 'modules.tags'
     controller: 'alchemy/admin/tags'
@@ -57,7 +66,7 @@
 
 - name: archive
   engine_name: alchemy
-  position: 6
+  position: 7
   navigation:
     controller: 'alchemy/admin/pictures'
     action: index