alchemy_cms 4.4.2 → 4.6.1

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -1,3 +1,6 @@
+$sitemap-url-large-width: 250px;
+$sitemap-url-xlarge-width: 350px;
+
 #sort_panel {
   background: $light-gray;
   padding: 47px 0 8px 0;
@@ -20,7 +23,7 @@
 
 #sitemap-wrapper {
   position: relative;
-  min-height: 100%;
+  min-height: calc(100vh - 96px);
 }
 
 .sitemap_pagename_link {
@@ -28,23 +31,35 @@
   padding: 0 10px;
   margin: 2px;
   text-decoration: none;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 
   &.inactive {
     color: #656565;
   }
 }
 
-.redirect_url {
+.sitemap_url {
+  display: none;
   float: right;
-  text-align: right;
   background-color: $sitemap-info-background-color;
-  line-height: $sitemap-line-height;
+  line-height: $sitemap-line-height - 2px;
   font-size: $small-font-size;
-  padding: 0 2*$default-padding;
-  max-width: 45%;
+  padding: 0 2 * $default-padding;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  border: 1px solid $sitemap-page-background-color;
+
+  @media screen and (min-width: $large-screen-break-point) {
+    display: block;
+    width: $sitemap-url-large-width;
+  }
+
+  @media screen and (min-width: 1440px) {
+    width: $sitemap-url-xlarge-width;
+  }
 }
 
 .sitemap_line_spacer {
@@ -55,7 +70,7 @@
 
 .sitemap_page {
   height: $sitemap-line-height;
-  margin: 3*$default-margin 0;
+  margin: 3 * $default-margin 0;
   position: relative;
   transition: background-color $transition-duration;
 
@@ -89,13 +104,13 @@
   width: 32px;
   line-height: $sitemap-line-height;
   float: left;
-  padding: 0 2*$default-padding;
+  padding: 0 2 * $default-padding;
   text-align: center;
 }
 
 .sitemap_right_tools {
   height: $sitemap-line-height;
-  padding: 0 2*$default-padding;
+  padding: 0 2 * $default-padding;
   float: right;
 
   .sitemap_tool {
@@ -130,7 +145,9 @@
   &.sorting {
     padding-top: 100px;
 
-    .page_icon { cursor: move }
+    .page_icon {
+      cursor: move;
+    }
   }
 
   .page_folder {
@@ -183,25 +200,44 @@
 }
 
 #sitemap_heading {
+  display: flex;
   padding: 0;
-
-  .page_infos {
-    margin-right: 210px;
-    text-align: left;
-    float: right;
-    line-height: 28px;
-    background: transparent;
-  }
+  line-height: 28px;
 
   .page_name {
-    line-height: 28px;
     margin-left: 43px;
   }
+
+  .page_urlname {
+    display: none;
+    margin-left: auto;
+    padding-left: 2 * $default-padding;
+    padding-right: 2 * $default-padding;
+
+    @media screen and (min-width: $large-screen-break-point) {
+      display: block;
+      width: $sitemap-url-large-width;
+    }
+
+    @media screen and (min-width: 1440px) {
+      width: $sitemap-url-xlarge-width;
+    }
+  }
+
+  .page_status {
+    padding-left: 2 * $default-padding;
+    margin-right: 214px;
+    margin-left: auto;
+
+    @media screen and (min-width: $large-screen-break-point) {
+      margin-left: initial;
+    }
+  }
 }
 
 #page_filter_result {
   display: none;
-  margin-left: 2*$default-margin;
+  margin-left: 2 * $default-margin;
 }
 
 .alchemy-dialog {
@@ -213,6 +249,8 @@
     margin: 0;
     padding: 0 24px 8px 8px;
 
-    .page_icon { cursor: default }
+    .page_icon {
+      cursor: default;
+    }
   }
 }

data/app/controllers/alchemy/admin/dashboard_controller.rb

@@ -60,7 +60,7 @@ module Alchemy
           response = query_github
           if response.code == "200"
             alchemy_tags = JSON.parse(response.body)
-            alchemy_tags.collect { |h| h['name'] }.sort
+            alchemy_tags.collect { |h| h['name'].tr('v', '') }.sort
           else
             # no luck at all?
             raise UpdateServiceUnavailable

data/app/controllers/alchemy/admin/nodes_controller.rb

@@ -9,25 +9,17 @@ module Alchemy
 
       def new
         @node = Node.new(
+          site: Alchemy::Site.current,
           parent_id: params[:parent_id],
           language: Language.current
         )
       end
 
-      def toggle
-        node = Node.find(params[:id])
-        node.update(folded: !node.folded)
-        if node.folded?
-          head :ok
-        else
-          render partial: 'node', collection: node.children.includes(:page, :children)
-        end
-      end
-
       private
 
       def resource_params
         params.require(:node).permit(
+          :site_id,
           :parent_id,
           :language_id,
           :page_id,

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -142,7 +142,6 @@ module Alchemy
         @attachments = Attachment.all.collect { |f|
           [f.name, download_attachment_path(id: f.id, name: f.urlname)]
         }
-        @url_prefix = prefix_locale? ? "#{Language.current.code}/" : ""
       end
 
       def fold

data/app/controllers/alchemy/api/nodes_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Api::NodesController < Api::BaseController
+    before_action :load_node
+    before_action :authorize_access, only: [:move, :toggle_folded]
+
+    def move
+      target_parent_node = Node.find(params[:target_parent_id])
+      @node.move_to_child_with_index(target_parent_node, params[:new_position])
+      render json: @node, serializer: NodeSerializer
+    end
+
+    def toggle_folded
+      @node.update(folded: !@node.folded)
+      render json: @node, serializer: NodeSerializer
+    end
+
+    private
+
+    def load_node
+      @node = Node.find(params[:id])
+    end
+
+    def authorize_access
+      authorize! :update, @node
+    end
+  end
+end

data/app/controllers/alchemy/api/pages_controller.rb

@@ -13,6 +13,7 @@ module Alchemy
       else
         @pages = Page.accessible_by(current_ability, :index)
       end
+      @pages = @pages.where.not(parent_id: nil)
       @pages = @pages.includes(*page_includes)
       if params[:page_layout].present?
         Alchemy::Deprecation.warn <<~WARN
@@ -104,6 +105,7 @@ module Alchemy
       [
         :tags,
         {
+          language: :site,
           elements: [
             {
               nested_elements: [

data/app/decorators/alchemy/content_editor.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class ContentEditor < SimpleDelegator
+    alias_method :content, :__getobj__
+
+    def to_partial_path
+      "alchemy/essences/#{essence_partial_name}_editor"
+    end
+
+    def css_classes
+      [
+        "content_editor",
+        essence_partial_name,
+      ].compact
+    end
+
+    def data_attributes
+      {
+        content_id: id,
+        content_name: name,
+      }
+    end
+
+    # Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
+    #
+    # === Example:
+    #
+    #   <%= text_field_tag content_editor.form_field_name, content_editor.ingredient %>
+    #
+    # === Options:
+    #
+    # You can pass an Essence column_name. Default is 'ingredient'
+    #
+    # ==== Example:
+    #
+    #   <%= text_field_tag content_editor.form_field_name(:link), content_editor.ingredient %>
+    #
+    def form_field_name(essence_column = "ingredient")
+      "contents[#{id}][#{essence_column}]"
+    end
+
+    def form_field_id(essence_column = "ingredient")
+      "contents_#{id}_#{essence_column}"
+    end
+
+    # Fixes Rails partial renderer calling to_model on the object
+    # which reveals the delegated content instead of this decorator.
+    def respond_to?(method_name)
+      return false if method_name == :to_model
+
+      super
+    end
+  end
+end

data/app/helpers/alchemy/admin/pages_helper.rb

@@ -9,13 +9,13 @@ module Alchemy
       #
       def preview_sizes_for_select
         options_for_select([
-          'auto',
-          [Alchemy.t('240', scope: 'preview_sizes'), 240],
-          [Alchemy.t('320', scope: 'preview_sizes'), 320],
-          [Alchemy.t('480', scope: 'preview_sizes'), 480],
-          [Alchemy.t('768', scope: 'preview_sizes'), 768],
-          [Alchemy.t('1024', scope: 'preview_sizes'), 1024],
-          [Alchemy.t('1280', scope: 'preview_sizes'), 1280]
+          "auto",
+          [Alchemy.t("240", scope: "preview_sizes"), 240],
+          [Alchemy.t("320", scope: "preview_sizes"), 320],
+          [Alchemy.t("480", scope: "preview_sizes"), 480],
+          [Alchemy.t("768", scope: "preview_sizes"), 768],
+          [Alchemy.t("1024", scope: "preview_sizes"), 1024],
+          [Alchemy.t("1280", scope: "preview_sizes"), 1280],
         ])
       end
 
@@ -27,30 +27,30 @@ module Alchemy
         if page.persisted? && page.definition.blank?
           [
             page_layout_missing_warning,
-            Alchemy.t(:page_type)
-          ].join(' ').html_safe
+            Alchemy.t(:page_type),
+          ].join(" ").html_safe
         else
           Alchemy.t(:page_type)
         end
       end
 
-      def page_status_checkbox(page, attribute)
-        label = page.class.human_attribute_name(attribute)
+      def page_status_checkbox(page, attribute, label: nil)
+        label_text = label || page.class.human_attribute_name(attribute)
 
         if page.attribute_fixed?(attribute)
           checkbox = check_box(:page, attribute, disabled: true)
-          hint = content_tag(:span, class: 'hint-bubble') do
+          hint = content_tag(:span, class: "hint-bubble") do
             Alchemy.t(:attribute_fixed, attribute: attribute)
           end
-          content = content_tag(:span, class: 'with-hint') do
-            "#{checkbox}\n#{label}\n#{hint}".html_safe
+          content = content_tag(:span, class: "with-hint") do
+            "#{checkbox}\n#{label_text}\n#{hint}".html_safe
           end
         else
           checkbox = check_box(:page, attribute)
-          content = "#{checkbox}\n#{label}".html_safe
+          content = "#{checkbox}\n#{label_text}".html_safe
         end
 
-        content_tag(:label, class: 'checkbox') { content }
+        content_tag(:label, class: "checkbox") { content }
       end
     end
   end

data/app/helpers/alchemy/pages_helper.rb

@@ -188,7 +188,7 @@ module Alchemy
     # @param [String] - Name of the menu
     # @param [Hash] - A set of options available in your menu partials
     def render_menu(name, options = {})
-      root_node = Alchemy::Node.roots.find_by(name: name)
+      root_node = Alchemy::Node.roots.find_by(name: name, site: Alchemy::Site.current)
       if root_node.nil?
         warning("Menu with name #{name} not found!")
         return
@@ -198,7 +198,7 @@ module Alchemy
         node_partial_name: "#{root_node.view_folder_name}/node"
       }.merge(options)
 
-      render(root_node, menu: root_node, node: root_node, options: options)
+      render(root_node.to_partial_path, menu: root_node, node: root_node, options: options)
     rescue ActionView::MissingTemplate => e
       warning <<~WARN
         Menu partial not found for #{name}.

data/app/models/alchemy/content.rb

@@ -172,28 +172,6 @@ module Alchemy
       definition['validate'].present?
     end
 
-    # Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
-    #
-    # === Example:
-    #
-    #   <%= text_field_tag content.form_field_name, content.ingredient %>
-    #
-    # === Options:
-    #
-    # You can pass an Essence column_name. Default is 'ingredient'
-    #
-    # ==== Example:
-    #
-    #   <%= text_field_tag content.form_field_name(:link), content.ingredient %>
-    #
-    def form_field_name(essence_column = 'ingredient')
-      "contents[#{id}][#{essence_column}]"
-    end
-
-    def form_field_id(essence_column = 'ingredient')
-      "contents_#{id}_#{essence_column}"
-    end
-
     # Returns a string used as dom id on html elements.
     def dom_id
       return '' if essence.nil?
@@ -245,6 +223,14 @@ module Alchemy
       "has_tinymce" + (has_custom_tinymce_config? ? " #{element.name}_#{name}" : "")
     end
 
+    def editor
+      @_editor ||= ContentEditor.new(self)
+    end
+    delegate :form_field_name, to: :editor
+    deprecate form_field_name: "use Alchemy::ContentEditor#form_field_name instead", deprecator: Alchemy::Deprecation
+    delegate :form_field_id, to: :editor
+    deprecate form_field_id: "use Alchemy::ContentEditor#form_field_id instead", deprecator: Alchemy::Deprecation
+
     # Returns the default value from content definition
     #
     # If the value is a symbol it gets passed through i18n

data/app/models/alchemy/node.rb

@@ -4,11 +4,12 @@ module Alchemy
   class Node < BaseRecord
     VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
 
-    acts_as_nested_set scope: 'language_id', touch: true
+    acts_as_nested_set scope: "language_id", touch: true
     stampable stamper_class_name: Alchemy.user_class_name
 
-    belongs_to :language, class_name: 'Alchemy::Language'
-    belongs_to :page, class_name: 'Alchemy::Page', optional: true, inverse_of: :nodes
+    belongs_to :site, class_name: "Alchemy::Site"
+    belongs_to :language, class_name: "Alchemy::Language"
+    belongs_to :page, class_name: "Alchemy::Page", optional: true, inverse_of: :nodes
 
     validates :name, presence: true, if: -> { page.nil? }
     validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? }
@@ -24,9 +25,32 @@ module Alchemy
     class << self
       # Returns all root nodes for current language
       def language_root_nodes
-        raise 'No language found' if Language.current.nil?
+        raise "No language found" if Language.current.nil?
+
         roots.where(language_id: Language.current.id)
       end
+
+      def available_menu_names
+        read_definitions_file
+      end
+
+      private
+
+      # Reads the element definitions file named +menus.yml+ from +config/alchemy/+ folder.
+      #
+      def read_definitions_file
+        if ::File.exist?(definitions_file_path)
+          ::YAML.safe_load(File.read(definitions_file_path)) || []
+        else
+          raise LoadError, "Could not find menus.yml file! Please run `rails generate alchemy:install`"
+        end
+      end
+
+      # Returns the +menus.yml+ file path
+      #
+      def definitions_file_path
+        Rails.root.join "config/alchemy/menus.yml"
+      end
     end
 
     # Returns the url
@@ -34,7 +58,7 @@ module Alchemy
     # Either the value is stored in the database, aka. an external url.
     # Or, if attached, the values comes from a page.
     def url
-      page && "/#{page.urlname}" || read_attribute(:url).presence
+      page&.url_path || read_attribute(:url).presence
     end
 
     def to_partial_path