alchemy_cms 4.6.6 → 5.0.0.beta1

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

@@ -1,22 +1,25 @@
-<div class="content_editor essence_spree_page" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
+<%= content_tag :div,
+  id: essence_page_editor.dom_id,
+  class: essence_page_editor.css_classes,
+  data: essence_page_editor.data_attributes do %>
+  <%= content_label(essence_page_editor) %>
   <%= text_field_tag(
-    content.form_field_name,
-    content.essence.page_id,
-    id: content.form_field_id,
+    essence_page_editor.form_field_name("page_id"),
+    essence_page_editor.essence.page_id,
+    id: essence_page_editor.form_field_id,
     class: 'alchemy_selectbox full_width'
   ) %>
-</div>
+<% end %>
 
 <script>
-  $('#<%= content.form_field_id %>').alchemyPageSelect({
+  $('#<%= essence_page_editor.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 %>
+    query_params: <%== essence_page_editor.settings[:query_params].to_json %>,
+    <% if essence_page_editor.essence.page %>
     initialSelection: {
-      id: <%= content.essence.page_id %>,
-      text: "<%= content.essence.page.name %>"
+      id: <%= essence_page_editor.essence.page_id %>,
+      text: "<%= essence_page_editor.essence.page.name %>"
     }
     <% end %>
   })

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

@@ -1,42 +1,44 @@
 <% 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) %>
+<%= content_tag :div,
+  id: essence_picture_editor.dom_id,
+  class: essence_picture_editor.css_classes,
+  data: essence_picture_editor.data_attributes do %>
+  <%= content_label(essence_picture_editor) %>
   <div class="picture_thumbnail">
     <span class="picture_tool delete">
       <%= link_to render_icon(:times), '#',
-        onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
+        onclick: "return Alchemy.removePicture('##{essence_picture_editor.form_field_id(:picture_id)}');" %>
     </span>
     <div class="picture_image">
       <div class="thumbnail_background">
-        <%- if content.ingredient -%>
-          <%= essence_picture_thumbnail(content, options) %>
+        <%- if essence_picture_editor.ingredient -%>
+          <%= essence_picture_thumbnail(essence_picture_editor) %>
         <% else %>
           <%= render_icon(:image, style: 'regular') %>
         <% end %>
       </div>
     </div>
-    <%- if content.essence.css_class.present? -%>
+    <%- if essence_picture_editor.essence.css_class.present? -%>
       <div class="essence_picture_css_class">
-        <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}",
-          default: content.essence.css_class.camelcase) %>
+        <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{essence_picture_editor.essence.css_class}",
+          default: essence_picture_editor.essence.css_class.camelcase) %>
       </div>
     <%- end -%>
     <div class="edit_images_bottom">
       <%= render 'alchemy/essences/shared/essence_picture_tools', {
-        content: content,
-        options: options
+        content: essence_picture_editor.content
       } %>
     </div>
   </div>
-  <%= hidden_field_tag content.form_field_name(:picture_id),
-    content.ingredient.try!(:id) %>
-  <%= hidden_field_tag content.form_field_name(:link),
-    content.essence.link %>
-  <%= hidden_field_tag content.form_field_name(:link_title),
-    content.essence.link_title %>
-  <%= hidden_field_tag content.form_field_name(:link_class_name),
-    content.essence.link_class_name %>
-  <%= hidden_field_tag content.form_field_name(:link_target),
-    content.essence.link_target %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:picture_id),
+    essence_picture_editor.ingredient.try!(:id) %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:link),
+    essence_picture_editor.essence.link %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_title),
+    essence_picture_editor.essence.link_title %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_class_name),
+    essence_picture_editor.essence.link_class_name %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_target),
+    essence_picture_editor.essence.link_target %>
 <% end %>

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

@@ -1,11 +1,14 @@
-<div class="content_editor essence_richtext" id="<%= content.dom_id %>">
-  <%= content_label(content) %>
+<%= content_tag :div,
+  id: essence_richtext_editor.dom_id,
+  class: essence_richtext_editor.css_classes,
+  data: essence_richtext_editor.data_attributes do %>
+  <%= content_label(essence_richtext_editor) %>
   <div class="tinymce_container">
     <%= text_area_tag(
-      content.form_field_name,
-      content.ingredient || '',
-      class: content.tinymce_class_name,
-      id: "tinymce_#{content.id}"
+      essence_richtext_editor.form_field_name,
+      essence_richtext_editor.ingredient || '',
+      class: essence_richtext_editor.tinymce_class_name,
+      id: "tinymce_#{essence_richtext_editor.id}"
     ) %>
   </div>
-</div>
+<% end %>

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

@@ -1,32 +1,28 @@
-<% 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, {}) %>
+<% select_values = essence_select_editor.settings[:select_values] %>
 
 <%= content_tag :div,
-  id: content.dom_id,
+  id: essence_select_editor.dom_id,
   class: [
-    "content_editor",
-    "essence_select",
-    inline ? 'display_inline' : nil
-  ].compact, data: {content_id: content.id} do %>
-  <%= content_label(content) %>
+    essence_select_editor.css_classes,
+    essence_select_editor.settings[:display_inline] ? 'display_inline' : ''
+  ], data: essence_select_editor.data_attributes do %>
+  <%= content_label(essence_select_editor) %>
 
   <% if select_values.nil? %>
     <%= warning(':select_values is nil',
     "<strong>No select values given.</strong>
-    <br>Please provide :<code>select_values</code> either as argument to
-    <code>render_essence_editor</code> helper or as setting on the content definition in
+    <br>Please provide <code>select_values</code> on the
+    content definition <code>settings</code> in
     <code>elements.yml</code>.") %>
   <% else %>
     <%
     if select_values.is_a?(Hash)
-      options_tags = grouped_options_for_select(select_values, content.ingredient)
+      options_tags = grouped_options_for_select(select_values, essence_select_editor.ingredient)
     else
-      options_tags = options_for_select(select_values, content.ingredient)
+      options_tags = options_for_select(select_values, essence_select_editor.ingredient)
     end %>
-    <%= select_tag content.form_field_name, options_tags, {
-      class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].compact,
-      style: html_options[:style]
+    <%= select_tag essence_select_editor.form_field_name, options_tags, {
+      class: ["alchemy_selectbox", "essence_editor_select"]
     } %>
   <% end %>
 <% end %>

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

@@ -1,20 +1,21 @@
-<% 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) %>
+<%= content_tag :div,
+  id: essence_text_editor.dom_id,
+  class: [
+    essence_text_editor.css_classes,
+    essence_text_editor.settings[:display_inline] ? 'display_inline' : ''
+  ], data: essence_text_editor.data_attributes do %>
+  <%= content_label(essence_text_editor) %>
   <%= text_field_tag(
-    content.form_field_name,
-    content.ingredient,
-    class: ["thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}", html_options[:class]].join(' '),
-    style: html_options[:style],
-    type: content.settings_value(:input_type) || "text"
+    essence_text_editor.form_field_name,
+    essence_text_editor.ingredient,
+    class: "thin_border #{essence_text_editor.settings[:linkable] ? ' text_with_icon' : ''}",
+    type: essence_text_editor.settings[:input_type] || "text"
   ) %>
-  <% if content.settings[:linkable] %>
-    <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
-    <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
-    <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
-    <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
-    <%= render 'alchemy/essences/shared/linkable_essence_tools', content: content %>
+  <% if essence_text_editor.settings[:linkable] %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link), essence_text_editor.essence.link %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_title), essence_text_editor.essence.link_title %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_class_name), essence_text_editor.essence.link_class_name %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_target), essence_text_editor.essence.link_target %>
+    <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_text_editor.content %>
   <% end %>
-</div>
+<% end %>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -1,11 +1,8 @@
-<% linkable = content.settings_value(:linkable, options) != false %>
+<% linkable = content.settings[:linkable] != false %>
 
-<% if content.essence && content.essence.allow_image_cropping?(options) %>
+<% if content.essence && content.essence.allow_image_cropping? %>
   <%= link_to_dialog render_icon(:crop),
-    alchemy.crop_admin_essence_picture_path(
-      content.essence,
-      options: content.settings.update(options)
-    ), {
+    alchemy.crop_admin_essence_picture_path(content.essence), {
       size: "1080x615",
       title: Alchemy.t('Edit Picturemask'),
       image_loader: false,
@@ -19,8 +16,7 @@
   alchemy.admin_pictures_path(
     element_id: content.element,
     content_id: content.id,
-    swap: true,
-    options: options
+    swap: true
   ),
   {
     title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
@@ -51,9 +47,8 @@
 <%= link_to_dialog render_icon(:edit),
   alchemy.edit_admin_essence_picture_path(
     id: content.essence.id,
-    content_id: content.id,
-    options: options
+    content_id: content.id
   ), {
     title: Alchemy.t(:edit_image_properties),
-    size: edit_picture_dialog_size(content, options)
+    size: edit_picture_dialog_size(content)
   }, title: Alchemy.t(:edit_image_properties) %>

data/app/views/alchemy/pages/show.rss.builder

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 xml.instruct! :xml, version: "1.0"
 xml.rss version: "2.0" do
   xml.channel do
@@ -9,8 +10,8 @@ xml.rss version: "2.0" do
       xml.item do
         xml.title element.content_for_rss_title.try(:ingredient)
         xml.description element.content_for_rss_description.try(:ingredient)
-        if element.has_ingredient?('date')
-          xml.pubDate element.ingredient('date').to_s(:rfc822)
+        if element.has_ingredient?("date")
+          xml.pubDate element.ingredient("date").to_s(:rfc822)
         end
         xml.link show_alchemy_page_url(@page, anchor: element_dom_id(element))
         xml.guid show_alchemy_page_url(@page, anchor: element_dom_id(element))

data/app/views/layouts/alchemy/admin.html.erb

@@ -36,6 +36,7 @@
     </script>
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
+    <%= javascript_pack_tag('alchemy/admin') %>
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>

data/babel.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        targets: {
+          node: "current"
+        }
+      }
+    ]
+  ]
+}

data/bin/rails

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/alchemy/engine', __dir__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/alchemy/engine", __dir__)
 
-require 'rails/all'
-require 'rails/engine/commands'
+require "rails/all"
+require "rails/engine/commands"

data/config/alchemy/config.yml

@@ -11,7 +11,7 @@ auto_logout_time: 30
 
 # === Redirect Options
 #
-#   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not visible.
+#   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not public.
 #
 redirect_to_public_child: true
 
@@ -38,24 +38,24 @@ sitemap:
   show_root: true
   show_flag: false
 
-# === URL nesting
-#
-# Since Alchemy 2.6.0, page urls are nested, respectively to their tree position.
-#
-# Disable +url_nesting+ to get slug only urls.
-#
-# NOTE: After changing the url_nesting, you should run one of these convert rake tasks:
-#
-#   rake alchemy:convert:urlnames:to_nested
-#   rake alchemy:convert:urlnames:to_slug
-#
-url_nesting: true
-
 # === Default items per page in admin views
 #
 # In Alchemy's Admin, change how many items you would get shown per page by Kaminari
 items_per_page: 15
 
+# === Preview window URL configuration
+#
+# By default Alchemy uses its internal page preview renderer,
+# but you can configure it to be any URL instead.
+#
+# Basic Auth is supported.
+#
+# preview:
+#   host: https://www.my-static-site.com
+#   auth:
+#     username: <%= ENV["BASIC_AUTH_USERNAME"] %>
+#     password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
+
 # === Picture rendering settings
 #
 # Alchemy uses Dragonfly to render images. Use {size: "XXXxYYY", crop: BOOLEAN [true]} to resize images.
@@ -79,7 +79,7 @@ default_site:
   name: Default Site
   host: '*'
 
-# This is the default language when a new site gets created.
+# This is the default language when seeding.
 default_language:
   code: en
   name: English
@@ -173,9 +173,6 @@ uploader:
 #
 link_target_options: [blank]
 
-# Should pages that redirect to an external url open the link in a new tab/window?
-open_external_links_in_new_tab: true
-
 # === Format matchers
 #
 # Named aliases for regular expressions that can be used in various places.

data/config/brakeman.ignore

@@ -29,7 +29,7 @@
       "file": "app/views/alchemy/admin/contents/create.js.erb",
       "line": 1,
       "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => \"alchemy/essences/#{Content.create(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create(Element.find(params[:content][:element_id]), content_params), :options => options_from_params, :html_options => ((params[:html_options] or {})) })",
+      "code": "render(action => \"alchemy/essences/#{Content.create(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create(Element.find(params[:content][:element_id]), content_params) })",
       "render_path": [{"type":"controller","class":"Alchemy::Admin::ContentsController","method":"create","line":21,"file":"app/controllers/alchemy/admin/contents_controller.rb"}],
       "location": {
         "type": "template",

data/config/initializers/assets.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 # Add Alchemy assets for precompiling
-Rails.application.config.assets.precompile << 'alchemy_manifest.js'
+Rails.application.config.assets.precompile << "alchemy_manifest.js"

data/config/initializers/dragonfly.rb

@@ -1,4 +1,5 @@
-require 'dragonfly_svg'
+# frozen_string_literal: true
+require "dragonfly_svg"
 
 # Logger
 Dragonfly.logger = Rails.logger

data/config/initializers/mime_types.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 Mime::Type.register "image/svg+xml", :svg

data/config/initializers/mini_profiler.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 begin
-  require 'rack-mini-profiler'
-  Rack::MiniProfiler.config.position = 'right'
+  require "rack-mini-profiler"
+  Rack::MiniProfiler.config.position = "right"
   Rack::MiniProfiler.config.start_hidden = true
 rescue LoadError
 end

data/config/initializers/simple_form.rb

@@ -77,7 +77,7 @@ SimpleForm.setup do |config|
   config.boolean_style = :inline
 
   # Default class for buttons
-  config.button_class = 'button'
+  config.button_class = "button"
 
   # Method used to tidy up errors. Specify any Rails Array method.
   # :first lists the first message for each field.
@@ -88,7 +88,7 @@ SimpleForm.setup do |config|
   config.error_notification_tag = :div
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'field_with_errors'
+  config.error_notification_class = "field_with_errors"
 
   # ID to add for error notification helper.
   # config.error_notification_id = nil
@@ -103,7 +103,7 @@ SimpleForm.setup do |config|
   config.collection_wrapper_tag = :div
 
   # You can define the class to use on all collection wrappers. Defaulting to none.
-  config.collection_wrapper_class = 'control_group'
+  config.collection_wrapper_class = "control_group"
 
   # You can wrap each item in a collection of radio/check boxes with a tag,
   # defaulting to :span.
@@ -116,7 +116,7 @@ SimpleForm.setup do |config|
   config.label_text = proc { |label, required| "#{label}#{required}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
+  config.label_class = "control-label"
 
   # You can define the default class to be used on forms. Can be overriden
   # with `html: { :class }`. Defaulting to none.
@@ -170,12 +170,12 @@ SimpleForm.setup do |config|
   # config.input_class = nil
 
   # Define the default class of the input wrapper of the boolean input.
-  config.boolean_label_class = 'checkbox'
+  config.boolean_label_class = "checkbox"
 
   # Defines if the default input wrapper class should be included in radio
   # collection wrappers.
   # config.include_default_input_wrapper_class = true
 
   # Defines which i18n scope will be used in Simple Form.
-  config.i18n_scope = 'alchemy.forms'
+  config.i18n_scope = "alchemy.forms"
 end

data/config/locales/alchemy.en.yml

@@ -163,7 +163,8 @@ en:
 
     resource_help_texts:
       site:
-        aliases: Please separate additional domains with spaces or new lines.
+        host: Either enter a <a href="https://en.wikipedia.org/wiki/Fully_qualified_domain_name" target="_blank">FQDN</a> or use a asterisk (*) to allow all domains to access this site.
+        aliases: Enter additional domains this site should be accessible by. Please separate them by space or new line.
 
     add_nested_element: "Add %{name}"
     anchor: 'Anchor'
@@ -463,7 +464,11 @@ en:
     no_files_in_archive: "You do not have any files in your archive."
     no_images_in_archive: "You don't have any images in your archive."
     no_more_elements_to_add: "No more elements available."
-    no_resource_found: "No %{resource} found. Please add your first one below."
+    no_resource_found:
+      default: "No %{resource} found. Please add your first one below."
+      alchemy/language: "<h2>Your website does not have any languages yet.</h2><p>You need at least one language to work with. Please create one below.</p>"
+      alchemy/node: "<h2>You do not have any menus yet.</h2><p>With menus your users can navigate your website. You can have multiple menus on your website. How many depends on your website template.</p><p>Please chose which menu you want to create first.</p>"
+      alchemy/site: "<h2>You do not have any websites yet.</h2><p>In order to serve requests you need to create a website first.</p><p>This form has been filled with sensible defaults that work in most cases.</p>"
     no_search_results: "Your search did not return any results."
     "not a valid image": "This is not an valid image."
     "or": 'or'
@@ -476,9 +481,6 @@ en:
     page_published: "Published page"
     page_restricted: "restricted"
     page_states:
-      visible:
-        "true": "Page is visible in navigation."
-        "false": "Page is not visible in navigation."
       public:
         "true": "Page is published."
         "false": "Page is unpublished."
@@ -573,7 +575,6 @@ en:
         button_label: Upload image(s)
         upload_success: "Picture %{name} uploaded successfully"
         upload_failure: "Error while uploading %{name}: %{error}"
-    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?"
     "We need at least one default.": "A default language must exist."
@@ -636,7 +637,7 @@ en:
   time:
     formats:
       alchemy:
-        default: "%a, %d %b %Y %H:%M:%S %z"
+        default: "%m.%d.%Y %H:%M"
         essence_date: "%Y-%m-%d"
         page_status: "%m.%d.%Y %H:%M"
         short_datetime: "%d %b %H:%M"
@@ -703,6 +704,20 @@ en:
 
   # Translations for Alchemy database models
   activerecord:
+    errors:
+      models:
+        alchemy/node:
+          attributes:
+            base:
+              essence_nodes_present: "This menu item is in use inside an Alchemy element on the following pages: %{page_names}."
+        alchemy/site:
+          attributes:
+            languages:
+              still_present: "are still attached to this site. Please remove them first."
+        alchemy/language:
+          attributes:
+            pages:
+              still_present: "are still attached to this language. Please remove them first."
     models:
       gutentag/tag:
         one: Tag
@@ -781,6 +796,7 @@ en:
       alchemy/legacy_page_url:
         urlname: "URL-Path"
       alchemy/node:
+        menu_type: Menu Type
         name: "Name"
         title: "Title"
         nofollow: "Search engine must not follow"
@@ -806,7 +822,6 @@ en:
         updated_at: "Updated at"
         urlname: "URL-Path"
         slug: "Slug"
-        visible: "visible in navigation"
       alchemy/picture:
         image_file_name: "Filename"
         image_file_height: "Height"