alchemy_cms 4.4.3 → 4.6.2

data/app/models/alchemy/page.rb

@@ -161,6 +161,10 @@ module Alchemy
 
     attr_accessor :menu_id
 
+    deprecate visible: "Page slugs will be visible in URLs of child pages all the time. " \
+      "Please use Menus and Tags instead to re-organize your pages if your page tree does not reflect the URL hierarchy.",
+      deprecator: Alchemy::Deprecation
+
     # Class methods
     #
     class << self
@@ -347,6 +351,13 @@ module Alchemy
       finder.elements(page: self)
     end
 
+    # = The url_path for this page
+    #
+    # @see Alchemy::Page::UrlPath#call
+    def url_path
+      Alchemy::Page::UrlPath.new(self).call
+    end
+
     # The page's view partial is dependent from its page layout
     #
     # == Define page layouts

data/app/models/alchemy/page/page_naming.rb

@@ -68,7 +68,7 @@ module Alchemy
           base.push(parent) if parent.visible?
         end
       else
-        ancestors.visible.contentpages.where(language_root: nil).to_a
+        ancestors.visible.contentpages.where(language_root: [nil, false]).to_a
       end
     end
 

data/app/models/alchemy/page/url_path.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Page
+    # = The url_path for this page
+    #
+    # Use this to build relative links to this page
+    #
+    # It takes several circumstances into account:
+    #
+    # 1. It returns just a slash for language root pages of the default langauge
+    # 2. It returns a url path with a leading slash for regular pages
+    # 3. It returns a url path with a leading slash and language code prefix for pages not having the default language
+    # 4. It returns a url path with a leading slash and the language code for language root pages of a non-default language
+    #
+    # == Examples
+    #
+    # Using Rails' link_to helper
+    #
+    #     link_to page.url
+    #
+    class UrlPath
+      ROOT_PATH = "/"
+
+      def initialize(page)
+        @page = page
+        @language = @page.language
+        @site = @language.site
+      end
+
+      def call
+        return @page.urlname if @page.definition["redirects_to_external"]
+
+        if @page.language_root?
+          language_root_path
+        elsif @site.languages.select(&:public?).length > 1
+          page_path_with_language_prefix
+        else
+          page_path_with_leading_slash
+        end
+      end
+
+      private
+
+      def language_root_path
+        @language.default? ? ROOT_PATH : language_path
+      end
+
+      def page_path_with_language_prefix
+        @language.default? ? page_path : language_path + page_path
+      end
+
+      def page_path_with_leading_slash
+        @page.language_root? ? ROOT_PATH : page_path
+      end
+
+      def language_path
+        "/#{@page.language_code}"
+      end
+
+      def page_path
+        "/#{@page.urlname}"
+      end
+    end
+  end
+end

data/app/serializers/alchemy/node_serializer.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class NodeSerializer < ActiveModel::Serializer
+    attributes :id,
+      :name,
+      :lft,
+      :rgt,
+      :url,
+      :parent_id
+  end
+end

data/app/serializers/alchemy/page_serializer.rb

@@ -13,7 +13,8 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at,
-      :status
+      :status,
+      :url_path
 
     has_many :elements
   end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -9,7 +9,7 @@ module Alchemy
     def pages
       tree = []
       path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants
+      page_list = object.self_and_descendants.includes({ language: :site }, :locker)
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -60,9 +60,10 @@ module Alchemy
         redirects_to_external: page.definition['redirects_to_external'],
         urlname: page.urlname,
         external_urlname: page.definition['redirects_to_external'] ? page.external_urlname : nil,
+        url_path: page.url_path,
         level: level,
-        root: level == 1,
-        root_or_leaf: level == 1 || !has_children,
+        root: page.depth == 1,
+        root_or_leaf: page.depth == 1 || !has_children,
         children: []
       }
 

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

@@ -30,6 +30,10 @@
 </div>
 <% end %>
 
-<ul class="list" id="layoutpages">
+<h4 id="sitemap_heading">
+  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+</h4>
+
+<ul class="list" id="sitemap">
   <%= render partial: "layoutpage", collection: @layout_root.children %>
 </ul>

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

@@ -1,10 +1,15 @@
 <%= 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? %>
+  <% if node.root? %>
+    <%= f.input :name,
+      collection: Alchemy::Node.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
+      include_blank: false,
+      input_html: { class: 'alchemy_selectbox' } %>
+  <% 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 %>
@@ -25,7 +30,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 +39,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) %>
@@ -57,7 +47,11 @@
       <% end %>
     </span>
     <div class="node_name">
-      <%= node.name || '&nbsp;'.html_safe %>
+      <% if node.root? %>
+        <%= I18n.t(node.name, scope: [:alchemy, :menu_names]) %>
+      <% else %>
+        <%= node.name || '&nbsp;'.html_safe %>
+      <% end %>
       <span class="node_page">
       <% if node.page %>
         <i class="icon far fa-file"></i>
@@ -77,11 +71,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

@@ -33,26 +33,16 @@
       <%= 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) %>
+      <%= 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.init()
+
 </script>

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

@@ -18,7 +18,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/_menu_fields.html.erb

@@ -1,33 +1,37 @@
-<% 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>
+<% if Alchemy::Node.roots.where(language: @page.language).any? %>
+  <% unless @page.language_root %>
+    <%= page_status_checkbox(@page, :visible, label: Alchemy.t("show in url of child pages")) %>
+  <% end %>
+  <% if @page.menus.any? %>
+    <label style="vertical-align: middle">
+      <%= Alchemy.t(:attached_to) %>
+    </label>
+    <% @page.menus.each do |menu| %>
+      <span class="page-menu-name label">
+        <%= I18n.t(menu.name, scope: [:alchemy, :menu_names]) %>
+      </span>
+    <% end %>
+  <% else %>
+    <a class="button small" id="attach-page"><%= Alchemy.t("attach to a menu") %></a>
+    <%= f.input :menu_id, collection: Alchemy::Node.roots.map { |n|
+        [I18n.t(n.name, scope: [:alchemy, :menu_names]), n.id]
+      },
+      prompt: Alchemy.t("Please choose a menu"),
+      input_html: { class: "alchemy_selectbox" },
+      wrapper_html: { class: "hidden" },
+      label: false %>
+    <script>
+      (function() {
+        var wrapper = document.querySelector(".input.page_menu_id")
+        document.querySelector("#attach-page").addEventListener("click", function() {
+          var select = wrapper.querySelector("select")
+          this.classList.toggle("active")
+          wrapper.classList.toggle("hidden")
+          $(select).select2("val", "")
+        })
+      })()
+    </script>
   <% 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/_page.html.erb

@@ -159,12 +159,9 @@
         <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>

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

@@ -1,4 +1,10 @@
 <div id="sitemap-wrapper">
+  <h4 id="sitemap_heading">
+    <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+    <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
+    <span class="page_status"><%= Alchemy.t(:page_status) %></span>
+  </h4>
+
   <p class="loading"></p>
 </div>
 

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

@@ -18,7 +18,7 @@
     <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= @page.urlname %></p>
   <% else %>
-    <label><%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %></label>
+    <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= "/#{@page.urlname}" %></p>
   <% end %>
   </div>

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

@@ -15,6 +15,14 @@
       return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
     },
 
+    toggle_folded_api_node_path: function(id) {
+      return '<%= alchemy.toggle_folded_api_node_path(id: 1) %>'.replace(/1/, id);
+    },
+
+    move_api_node_path: function(id) {
+      return '<%= alchemy.move_api_node_path(id: 1) %>'.replace(/1/, id);
+    },
+
     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/config/alchemy/config.yml

@@ -1,12 +1,6 @@
 # == This is the global Alchemy configuration file
 #
 
-# === Require SSL for login form and all admin modules
-#
-# NOTE: You have to create a SSL certificate on your server to make this work
-#
-require_ssl: false
-
 # === Auto Log Out Time
 #
 # The amount of time of inactivity in minutes after which the user is kicked out of his current session.

data/config/locales/alchemy.en.yml

@@ -49,6 +49,14 @@ en:
     #
     content_names:
 
+
+    # === Translations for menu names
+    # Used for the translations of the names of root menu nodes.
+    #
+    menu_names:
+      main_menu: Main Menu
+      footer_menu: Footer Menu
+
     # === Translations for content validations
     # Used when a user did not enter (correct) values to the content field.
     #
@@ -565,7 +573,6 @@ en:
         button_label: Upload image(s)
         upload_success: "Picture %{name} uploaded successfully"
         upload_failure: "Error while uploading %{name}: %{error}"
-    url_name: "URL-Name"
     visible: "visible"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
@@ -662,9 +669,9 @@ en:
           page_layout:
             blank: "^Please choose a page layout."
           urlname:
-            too_short: "^The pages urlname is too short (minimum of 3 characters)."
-            taken: "^URL-Name already taken."
-            exclusion: "^URL-Name reserved."
+            too_short: "^URL-Path is too short (minimum of 3 characters)."
+            taken: "^URL-Path already taken."
+            exclusion: "^URL-Path reserved."
       alchemy/picture:
         attributes:
           image_file:
@@ -772,7 +779,7 @@ en:
         locale: Localization
         code: ISO Code
       alchemy/legacy_page_url:
-        urlname: "URL path"
+        urlname: "URL-Path"
       alchemy/node:
         name: "Name"
         title: "Title"
@@ -797,7 +804,8 @@ en:
         tag_list: Tags
         title: "Title"
         updated_at: "Updated at"
-        urlname: "Urlname"
+        urlname: "URL-Path"
+        slug: "Slug"
         visible: "visible in navigation"
       alchemy/picture:
         image_file_name: "Filename"