alchemy_cms 4.4.3 → 5.0.0.beta1

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

@@ -1,4 +1,4 @@
-<% css_classes = @content.settings_value(:css_classes, local_assigns.fetch(:options, {})) %>
+<% css_classes = @content.settings[:css_classes] %>
 
 <%= alchemy_form_for [:admin, @essence_file] do |f| %>
   <%= f.input :link_text %>

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

@@ -1,10 +1,4 @@
 $('#picture_to_assign_<%= @picture.id %> a').attr('href', '#').off('click');
-$('#<%= @content.dom_id -%>').replaceWith('<%= j(
-  render(
-    "alchemy/essences/essence_picture_editor",
-    content: @content,
-    options: options_from_params
-  )
-) %>');
+$('#<%= @content.dom_id -%>').replaceWith('<%= j render(Alchemy::ContentEditor.new(@content)) %>');
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty('#element_<%= @content.element.id %>');

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -12,7 +12,7 @@
   </div>
   <%= form_for(
     @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params),
+    url: alchemy.admin_essence_picture_path(@essence_picture),
     id: 'image_cropper_form',
     remote: true
   ) do |f| %>

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

@@ -1,20 +1,20 @@
 <%= alchemy_form_for @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params) do |f| %>
+    url: alchemy.admin_essence_picture_path(@essence_picture) do |f| %>
   <%= hidden_field_tag 'content_id', @content.id %>
-  <%= f.input :caption, as: options_from_params[:caption_as_textarea] ? 'text' : 'string' %>
+  <%= f.input :caption, as: @content.settings[:caption_as_textarea] ? 'text' : 'string' %>
   <%= f.input :title %>
   <%= f.input :alt_tag %>
-  <%- if options_from_params[:sizes].present? -%>
+  <%- if @content.settings[:sizes].present? -%>
     <%= f.input :render_size,
       collection: [
-        [Alchemy.t('Layout default'), options_from_params[:size]]
-      ] + options_from_params[:sizes].to_a,
+        [Alchemy.t('Layout default'), @content.settings[:size]]
+      ] + @content.settings[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>
-  <%- if options_from_params[:css_classes].present? -%>
+  <%- if @content.settings[:css_classes].present? -%>
     <%= f.input :css_class,
-      collection: options_from_params[:css_classes],
+      collection: @content.settings[:css_classes],
       include_blank: Alchemy.t('None'),
       input_html: {class: 'alchemy_selectbox'} %>
   <%- else -%>

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

@@ -3,7 +3,7 @@
   Alchemy.closeCurrentDialog();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>
-  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content, options_from_params) %>');
+  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content) %>');
   Alchemy.ImageLoader('#<%= @content.dom_id %> .thumbnail_background');
 <% end %>
 })(jQuery);

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

@@ -1,14 +1,14 @@
-<%= alchemy_form_for [alchemy, :admin, @language] do |f| %>
+<%= alchemy_form_for [alchemy, :admin, language] do |f| %>
   <%= f.input :name, autofocus: true %>
   <%= f.input :language_code, placeholder: Alchemy.t(:language_code_placeholder) %>
   <%= f.input :country_code,
     as: 'string',
     placeholder: Alchemy.t(:country_code_placeholder),
     hint: Alchemy.t(:country_code_foot_note) %>
-  <% if @language.errors[:locale].present? || @language.locale.present? %>
+  <% if language.errors[:locale].present? || language.locale.present? %>
     <%= f.input :locale,
-      collection: @language.matching_locales.presence || ::I18n.available_locales,
-      selected: @language.locale || @language.language_code || ::I18n.default_locale.to_s,
+      collection: language.matching_locales.presence || ::I18n.available_locales,
+      selected: language.locale || language.language_code || ::I18n.default_locale.to_s,
       input_html: {class: 'alchemy_selectbox'} %>
   <% end %>
   <%= f.input :frontpage_name %>
@@ -19,6 +19,6 @@
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :public %>
   <%= f.input :default %>
-  <%= f.hidden_field :site_id, value: Alchemy::Site.current.id %>
+  <%= f.hidden_field :site_id %>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/languages/_table.html.erb

@@ -3,13 +3,13 @@
   <thead>
     <tr>
       <th>
-        <%= sort_link @query, :name, hide_indicator: true %>
+        <%= sort_link @query, :name %>
       </th>
       <th>
-        <%= sort_link @query, :language_code, hide_indicator: true %>
+        <%= sort_link @query, :language_code %>
       </th>
       <th>
-        <%= sort_link @query, :country_code, hide_indicator: true %>
+        <%= sort_link @query, :country_code %>
       </th>
       <th>
         <%= Alchemy::Language.human_attribute_name(:code) %>

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

@@ -0,0 +1 @@
+<%= render 'form', language: @language %>

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

@@ -3,7 +3,8 @@
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
     <%= render 'alchemy/admin/partials/site_select' %>
-    <%= toolbar_button icon: :plus,
+    <%= toolbar_button(
+      icon: :plus,
       label: label_title,
       url: new_resource_path,
       title: label_title,
@@ -12,12 +13,30 @@
         title: label_title,
         size: "430x415"
       },
-      if_permitted_to: [:create, Alchemy::Language] %>
+      if_permitted_to: [:create, Alchemy::Language]
+    ) if @languages.any? %>
   </div>
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= render 'alchemy/admin/resources/table_header' %>
-  <%= render 'table' %>
+  <% if @languages.any? %>
+    <%= render 'alchemy/admin/resources/table_header' %>
+    <%= render 'table' %>
+  <% elsif search_filter_params[:q].present? %>
+    <%= render_message { Alchemy.t('Nothing found') } %>
+  <% else %>
+    <div class="panel no-resource-found">
+      <%= render_message do %>
+        <%== Alchemy.t('alchemy/language', scope: :no_resource_found) %>
+      <% end %>
+      <%= render 'form', language: Alchemy::Language.new(
+        Alchemy::Config.get(:default_language).merge(
+          site: Alchemy::Site.current,
+          default: true,
+          public: true
+        )
+      ) %>
+    </div>
+  <% end %>
 </div>

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

@@ -0,0 +1 @@
+<%= render 'form', language: @language %>

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

@@ -4,7 +4,7 @@
   <%= render 'alchemy/admin/partials/language_tree_select' %>
   <%= toolbar_button(
     icon: :plus,
-    url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
+    url: alchemy.new_admin_page_path(language: @current_language, layoutpage: true),
     hotkey: 'alt+n',
     dialog_options: {
       title: Alchemy.t('Add global page'),
@@ -30,6 +30,10 @@
 </div>
 <% end %>
 
+<h4 id="sitemap_heading">
+  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+</h4>
+
 <ul class="list" id="layoutpages">
-  <%= render partial: "layoutpage", collection: @layout_root.children %>
+  <%= render partial: "layoutpage", collection: @layout_pages %>
 </ul>

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

@@ -1,18 +1,26 @@
 <%= alchemy_form_for([:admin, node]) do |f| %>
-  <%= f.input :name, input_html: {
-    autofocus: true,
-    value: node.page && node.read_attribute(:name).blank? ? nil : node.name,
-    placeholder: node.page ? node.page.name : nil
-  } %>
-  <% unless node.root? %>
-    <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: { class: 'alchemy_selectbox' } %>
-    <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %>
-    <%= f.input :title %>
-    <%= f.input :nofollow %>
-    <%= f.input :external %>
-    <%= f.hidden_field :parent_id %>
+  <% if node.new_record? && node.root? %>
+    <%= f.input :menu_type,
+      collection: Alchemy::Language.current.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
+      include_blank: false,
+      input_html: { class: 'alchemy_selectbox' } %>
+  <% else %>
+    <% if node.root? %>
+      <%= f.input :name %>
+    <% else %>
+      <%= f.input :name, input_html: {
+        autofocus: true,
+        value: node.page && node.read_attribute(:name).blank? ? nil : node.name,
+        placeholder: node.page ? node.page.name : nil
+      } %>
+      <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: { class: 'alchemy_selectbox' } %>
+      <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %>
+      <%= f.input :title %>
+      <%= f.input :nofollow %>
+      <%= f.input :external %>
+      <%= f.hidden_field :parent_id %>
+    <% end %>
   <% end %>
-  <%= f.hidden_field :site_id %>
   <%= f.hidden_field :language_id %>
   <%= f.submit button_label %>
 <% end %>
@@ -25,7 +33,7 @@
     initialSelection: {
       id: <%= node.page_id %>,
       text: "<%= node.page.name %>",
-      url: "/<%= node.page.urlname %>"
+      url_path: "<%= node.page.url_path %>"
     }
     <% end %>
   }).on('change', function(e) {
@@ -34,7 +42,7 @@
       $('#node_url').val('').prop('disabled', false)
     } else {
       $('#node_name').attr('placeholder', e.added.name)
-      $('#node_url').val('/' + e.added.urlname).prop('disabled', true)
+      $('#node_url').val(e.added.url_path).prop('disabled', true)
     }
   })
 </script>

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

@@ -1,21 +1,11 @@
-<li>
+<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded? } do %>
   <%= 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 %>
+      &nbsp;
     </span>
     <span class="nodes_tree-right_tools">
       <% if can?(:edit, node) %>
@@ -77,11 +67,7 @@
       <% 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>
+  <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { node_id: node.id } do %>
+    <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
   <% end %>
-</li>
+<% end %>

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

@@ -16,7 +16,7 @@
         size: '450x120'
       },
       if_permitted_to: [:create, Alchemy::Node]
-    ) %>
+    ) if @root_nodes.any? %>
   </div>
 <% end %>
 
@@ -31,28 +31,17 @@
   <% else %>
     <div class="panel no-resource-found">
       <%= render_message do %>
-        <%= Alchemy.t(:no_resource_found) % { resource: Alchemy.t(:menu) } %>
+        <%== Alchemy.t('alchemy/node', scope: :no_resource_found) %>
       <% end %>
-      <%= render 'form', node: Alchemy::Node.new(language: Alchemy::Language.current), button_label: Alchemy.t(:create) %>
+      <%= render 'form', node: Alchemy::Node.new(
+          site: Alchemy::Site.current,
+          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
-  })
+  Alchemy.NodeTree()
 </script>

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

@@ -1,4 +1,3 @@
-<% if root = Alchemy::Page.rootpage %>
 <div class="panel">
   <%= render_message do %>
     <p><%= Alchemy.t(:language_does_not_exist) %></p>
@@ -37,7 +36,6 @@
       <%= form.hidden_field :language_id, value: @language.id %>
       <%= form.hidden_field :language_code, value: @language.code %>
       <%= form.hidden_field :language_root, value: true %>
-      <%= form.hidden_field :parent_id, value: root.id %>
       <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
       <%= form.submit Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
     <% end %>
@@ -50,9 +48,3 @@
 <%- end -%>
 
 </div>
-<% else %>
-<%= render_message :error do %>
-  <h2>Root page not found.</h2>
-  <p>Please run <code>bin/rake db:seed</code> task.</p>
-<% end %>
-<% end %>

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

@@ -10,7 +10,6 @@
     <div class="control_group">
       <%= render 'alchemy/admin/pages/publication_fields' %>
       <%= page_status_checkbox(@page, :restricted) %>
-      <%= render 'alchemy/admin/pages/menu_fields', f: f %>
       <% if configuration(:sitemap)['show_flag'] %>
         <%= page_status_checkbox(@page, :sitemap) %>
       <% end %>
@@ -18,7 +17,7 @@
   </div>
 
   <%= f.input :name, autofocus: true %>
-  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
+  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
 

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

@@ -1,5 +1,6 @@
 <%= alchemy_form_for([:admin, @page]) do |f| %>
   <%= f.hidden_field(:parent_id) %>
+  <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
   <%= f.input :page_layout,
     collection: @page_layouts,

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

@@ -1,4 +1,4 @@
-<li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-visible="{{visible}}" data-external="{{redirects_to_external}}">
+<li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}">
   <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
     <div class="sitemap_left_images<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>">
       <% unless @sorting %>
@@ -71,7 +71,7 @@
             alchemy.configure_admin_page_path(page),
             {
               title: Alchemy.t(:edit_page_properties),
-              size: page.definition['redirects_to_external'] ? '450x330' : '450x680'
+              size: '450x680'
             }
           ) -%>
           <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
@@ -150,36 +150,25 @@
         <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.public}}</span>
       </span>
-      <span class="page_status with-hint">
-        <i class="icon fas fa-fw fa-eye {{#unless visible}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
-        <span class="hint-bubble">{{status_titles.visible}}</span>
-      </span>
       <span class="page_status with-hint">
         <i class="icon fas fa-fw fa-lock {{#unless restricted}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.restricted}}</span>
       </span>
     </div>
-    {{#if redirects_to_external}}
-      <div class="redirect_url" title="{{urlname}}">
-        &raquo; <%= Alchemy.t('Redirects to') %>:
-        {{ external_urlname }}
-      </div>
-    {{/if}}
+    <div class="sitemap_url" title="{{url_path}}">
+      {{ url_path }}
+    </div>
     <div class="sitemap_sitename">
-      {{#if redirects_to_external}}
-        <span class="sitemap_pagename_link inactive">{{ name }}</span>
+      {{#if permissions.edit_content}}
+        <%= link_to_unless(
+          @sorting,
+          '{{name}}',
+          alchemy.edit_admin_page_path(page),
+          title: Alchemy.t(:edit_page),
+          class: "sitemap_pagename_link"
+        ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
       {{else}}
-        {{#if permissions.edit_content}}
-          <%= link_to_unless(
-            @sorting,
-            '{{name}}',
-            alchemy.edit_admin_page_path(page),
-            title: Alchemy.t(:edit_page),
-            class: "sitemap_pagename_link"
-          ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
-        {{else}}
-          <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
-        {{/if}}
+        <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
       {{/if}}
     </div>
   </div>

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

@@ -2,10 +2,6 @@
   <%= render_icon(:compass, transform: 'shrink-2', class: @page.public? ? nil : 'disabled') %>
   <span class="hint-bubble"><%= page.status_title(:public) %></span>
 </span>
-<span class="page_status with-hint">
-  <%= render_icon(:eye, transform: 'shrink-2', class: @page.visible? ? nil : 'disabled') %>
-  <span class="hint-bubble"><%= page.status_title(:visible) %></span>
-</span>
 <span class="page_status with-hint">
   <%= render_icon(:lock, transform: 'shrink-2', class: @page.restricted? ? nil : 'disabled') %>
   <span class="hint-bubble"><%= page.status_title(:restricted) %></span>