alchemy_cms 4.6.2 → 5.0.0.beta1

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"

data/config/routes.rb

@@ -1,17 +1,18 @@
-require 'alchemy/routing_constraints'
+# frozen_string_literal: true
+require "alchemy/routing_constraints"
 
 Alchemy::Engine.routes.draw do
-  root to: 'pages#index'
+  root to: "pages#index"
 
-  get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
+  get "/sitemap.xml" => "pages#sitemap", format: "xml"
 
   scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
-    get '/' => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
-    get '/dashboard' => 'admin/dashboard#index', as: :admin_dashboard
-    get '/dashboard/info' => 'admin/dashboard#info', as: :dashboard_info
-    get '/help' => 'admin/dashboard#help', as: :help
-    get '/dashboard/update_check' => 'admin/dashboard#update_check', as: :update_check
-    get '/leave' => 'admin/base#leave', as: :leave_admin
+    get "/" => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
+    get "/dashboard" => "admin/dashboard#index", as: :admin_dashboard
+    get "/dashboard/info" => "admin/dashboard#info", as: :dashboard_info
+    get "/help" => "admin/dashboard#help", as: :help
+    get "/dashboard/update_check" => "admin/dashboard#update_check", as: :update_check
+    get "/leave" => "admin/base#leave", as: :leave_admin
   end
 
   namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
@@ -94,7 +95,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :clipboard, only: :index, controller: 'clipboard' do
+    resource :clipboard, only: :index, controller: "clipboard" do
       collection do
         get :index
         delete :clear
@@ -103,7 +104,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :trash, only: :index, controller: 'trash' do
+    resource :trash, only: :index, controller: "trash" do
       collection do
         get :index
         delete :clear
@@ -118,38 +119,38 @@ Alchemy::Engine.routes.draw do
 
     resources :sites
 
-    get '/styleguide' => 'styleguide#index'
+    get "/styleguide" => "styleguide#index"
   end
 
-  get '/attachment/:id/download(/:name)' => 'attachments#download',
+  get "/attachment/:id/download(/:name)" => "attachments#download",
       as: :download_attachment
-  get '/attachment/:id/show' => 'attachments#show',
+  get "/attachment/:id/show" => "attachments#show",
       as: :show_attachment
 
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
   resources :contents, only: :show
 
-  namespace :api, defaults: {format: 'json'} do
+  namespace :api, defaults: {format: "json"} do
     resources :contents, only: [:index, :show]
 
     resources :elements, only: [:index, :show] do
-      get '/contents' => 'contents#index', as: 'contents'
-      get '/contents/:name' => 'contents#show', as: 'content'
+      get "/contents" => "contents#index", as: "contents"
+      get "/contents/:name" => "contents#show", as: "content"
     end
 
     resources :pages, only: [:index] do
-      get 'elements' => 'elements#index', as: 'elements'
-      get 'elements/:named' => 'elements#index', as: 'named_elements'
+      get "elements" => "elements#index", as: "elements"
+      get "elements/:named" => "elements#index", as: "named_elements"
       collection do
         get :nested
       end
     end
 
-    get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
-    get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+    get "/pages/*urlname(.:format)" => "pages#show", as: "page"
+    get "/admin/pages/:id(.:format)" => "pages#show", as: "preview_page"
 
-    resources :nodes, only: [] do
+    resources :nodes, only: [:index] do
       member do
         patch :move
         patch :toggle_folded
@@ -157,13 +158,13 @@ Alchemy::Engine.routes.draw do
     end
   end
 
-  get '/:locale' => 'pages#index',
+  get "/:locale" => "pages#index",
     constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
     as: :show_language_root
 
   # The page show action has to be last route
   constraints(locale: Alchemy::RoutingConstraints::LOCALE_REGEXP) do
-    get '(/:locale)/*urlname(.:format)' => 'pages#show',
+    get "(/:locale)/*urlname(.:format)" => "pages#show",
       constraints: Alchemy::RoutingConstraints.new,
       as: :show_page
   end