alchemy_cms 4.4.4 → 5.0.0.beta2

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

@@ -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.
     #
@@ -155,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'
@@ -455,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'
@@ -468,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."
@@ -565,8 +575,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?"
     "We need at least one default.": "A default language must exist."
@@ -629,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"
@@ -662,9 +670,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:
@@ -696,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
@@ -772,8 +794,9 @@ en:
         locale: Localization
         code: ISO Code
       alchemy/legacy_page_url:
-        urlname: "URL path"
+        urlname: "URL-Path"
       alchemy/node:
+        menu_type: Menu Type
         name: "Name"
         title: "Title"
         nofollow: "Search engine must not follow"
@@ -797,8 +820,8 @@ en:
         tag_list: Tags
         title: "Title"
         updated_at: "Updated at"
-        urlname: "Urlname"
-        visible: "visible in navigation"
+        urlname: "URL-Path"
+        slug: "Slug"
       alchemy/picture:
         image_file_name: "Filename"
         image_file_height: "Height"

data/config/routes.rb

@@ -1,27 +1,24 @@
-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
     resources :contents, only: [:create]
 
-    resources :nodes do
-      member do
-        patch :toggle
-      end
-    end
+    resources :nodes
 
     resources :pages do
       resources :elements
@@ -98,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
@@ -107,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
@@ -122,45 +119,52 @@ 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: [:index] do
+      member do
+        patch :move
+        patch :toggle_folded
+      end
+    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

data/config/spring.rb

@@ -1,2 +1,3 @@
-Spring.application_root = './spec/dummy'
-Spring.watch 'lib/**/*'
+# frozen_string_literal: true
+Spring.application_root = "./spec/dummy"
+Spring.watch "lib/**/*"

data/db/migrate/20200226213334_alchemy_four_point_four.rb

@@ -0,0 +1,313 @@
+# frozen_string_literal: true
+
+class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
+  def up
+    unless table_exists?("alchemy_attachments")
+      create_table "alchemy_attachments", force: :cascade do |t|
+        t.string "name"
+        t.string "file_name"
+        t.string "file_mime_type"
+        t.integer "file_size"
+        t.references "creator"
+        t.references "updater"
+        t.timestamps null: false
+        t.string "file_uid"
+        t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
+      end
+    end
+
+    unless table_exists?("alchemy_contents")
+      create_table "alchemy_contents", force: :cascade do |t|
+        t.string "name"
+        t.references "essence", null: false, polymorphic: true, index: { unique: true }
+        t.references "element", null: false
+      end
+    end
+
+    unless table_exists?("alchemy_elements")
+      create_table "alchemy_elements", force: :cascade do |t|
+        t.string "name"
+        t.integer "position"
+        t.references "page", null: false, index: false
+        t.boolean "public", default: true
+        t.boolean "folded", default: false
+        t.boolean "unique", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.references "parent_element", index: false
+        t.boolean "fixed", default: false, null: false
+        t.index ["fixed"], name: "index_alchemy_elements_on_fixed"
+        t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id"
+        t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position"
+      end
+    end
+
+    unless table_exists?("alchemy_elements_alchemy_pages")
+      create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
+        t.references "element"
+        t.references "page"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_booleans")
+      create_table "alchemy_essence_booleans", force: :cascade do |t|
+        t.boolean "value"
+        t.index ["value"], name: "index_alchemy_essence_booleans_on_value"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_dates")
+      create_table "alchemy_essence_dates", force: :cascade do |t|
+        t.datetime "date"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_files")
+      create_table "alchemy_essence_files", force: :cascade do |t|
+        t.references "attachment"
+        t.string "title"
+        t.string "css_class"
+        t.string "link_text"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_htmls")
+      create_table "alchemy_essence_htmls", force: :cascade do |t|
+        t.text "source"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_links")
+      create_table "alchemy_essence_links", force: :cascade do |t|
+        t.string "link"
+        t.string "link_title"
+        t.string "link_target"
+        t.string "link_class_name"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_pages")
+      create_table "alchemy_essence_pages", force: :cascade do |t|
+        t.references "page"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_pictures")
+      create_table "alchemy_essence_pictures", force: :cascade do |t|
+        t.references "picture"
+        t.string "caption"
+        t.string "title"
+        t.string "alt_tag"
+        t.string "link"
+        t.string "link_class_name"
+        t.string "link_title"
+        t.string "css_class"
+        t.string "link_target"
+        t.string "crop_from"
+        t.string "crop_size"
+        t.string "render_size"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_richtexts")
+      create_table "alchemy_essence_richtexts", force: :cascade do |t|
+        t.text "body"
+        t.text "stripped_body"
+        t.boolean "public"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_selects")
+      create_table "alchemy_essence_selects", force: :cascade do |t|
+        t.string "value"
+        t.index ["value"], name: "index_alchemy_essence_selects_on_value"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_texts")
+      create_table "alchemy_essence_texts", force: :cascade do |t|
+        t.text "body"
+        t.string "link"
+        t.string "link_title"
+        t.string "link_class_name"
+        t.boolean "public", default: false
+        t.string "link_target"
+      end
+    end
+
+    unless table_exists?("alchemy_folded_pages")
+      create_table "alchemy_folded_pages", force: :cascade do |t|
+        t.references "page", null: false, index: false
+        t.references "user", null: false, index: false
+        t.boolean "folded", default: false
+        t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true
+      end
+    end
+
+    unless table_exists?("alchemy_languages")
+      create_table "alchemy_languages", force: :cascade do |t|
+        t.string "name"
+        t.string "language_code"
+        t.string "frontpage_name"
+        t.string "page_layout", default: "intro"
+        t.boolean "public", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.boolean "default", default: false
+        t.string "country_code", default: "", null: false
+        t.references "site", null: false
+        t.string "locale"
+        t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
+        t.index ["language_code"], name: "index_alchemy_languages_on_language_code"
+      end
+    end
+
+    unless table_exists?("alchemy_legacy_page_urls")
+      create_table "alchemy_legacy_page_urls", force: :cascade do |t|
+        t.string "urlname", null: false
+        t.references "page", null: false
+        t.timestamps null: false
+        t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_nodes")
+      create_table "alchemy_nodes", force: :cascade do |t|
+        t.string "name"
+        t.string "title"
+        t.string "url"
+        t.boolean "nofollow", default: false, null: false
+        t.boolean "external", default: false, null: false
+        t.boolean "folded", default: false, null: false
+        t.references "parent"
+        t.integer "lft", null: false
+        t.integer "rgt", null: false
+        t.integer "depth", default: 0, null: false
+        t.references "page"
+        t.references "language", null: false
+        t.references "creator"
+        t.references "updater"
+        t.timestamps null: false
+        t.references "site", null: false
+        t.index ["lft"], name: "index_alchemy_nodes_on_lft"
+        t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
+      end
+    end
+
+    unless table_exists?("alchemy_pages")
+      create_table "alchemy_pages", force: :cascade do |t|
+        t.string "name"
+        t.string "urlname"
+        t.string "title"
+        t.string "language_code"
+        t.boolean "language_root"
+        t.string "page_layout"
+        t.text "meta_keywords"
+        t.text "meta_description"
+        t.integer "lft"
+        t.integer "rgt"
+        t.references "parent", index: false
+        t.integer "depth"
+        t.boolean "visible", default: false
+        t.integer "locked_by"
+        t.boolean "restricted", default: false
+        t.boolean "robot_index", default: true
+        t.boolean "robot_follow", default: true
+        t.boolean "sitemap", default: true
+        t.boolean "layoutpage", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.references "language"
+        t.datetime "published_at"
+        t.datetime "public_on"
+        t.datetime "public_until"
+        t.datetime "locked_at"
+        t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by"
+        t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
+        t.index ["public_on", "public_until"], name: "index_alchemy_pages_on_public_on_and_public_until"
+        t.index ["rgt"], name: "index_alchemy_pages_on_rgt"
+        t.index ["urlname"], name: "index_pages_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_pictures")
+      create_table "alchemy_pictures", force: :cascade do |t|
+        t.string "name"
+        t.string "image_file_name"
+        t.integer "image_file_width"
+        t.integer "image_file_height"
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.string "upload_hash"
+        t.string "image_file_uid"
+        t.integer "image_file_size"
+        t.string "image_file_format"
+      end
+    end
+
+    unless table_exists?("alchemy_sites")
+      create_table "alchemy_sites", force: :cascade do |t|
+        t.string "host"
+        t.string "name"
+        t.timestamps null: false
+        t.boolean "public", default: false
+        t.text "aliases"
+        t.boolean "redirect_to_primary_host"
+        t.index ["host", "public"], name: "alchemy_sites_public_hosts_idx"
+        t.index ["host"], name: "index_alchemy_sites_on_host"
+      end
+    end
+
+    unless foreign_key_exists?("alchemy_contents", column: "element_id")
+      add_foreign_key "alchemy_contents", "alchemy_elements", column: "element_id", on_update: :cascade, on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_elements", column: "page_id")
+      add_foreign_key "alchemy_elements", "alchemy_pages", column: "page_id", on_update: :cascade, on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_essence_pages", column: "page_id")
+      add_foreign_key "alchemy_essence_pages", "alchemy_pages", column: "page_id"
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "language_id")
+      add_foreign_key "alchemy_nodes", "alchemy_languages", column: "language_id"
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "page_id")
+      add_foreign_key "alchemy_nodes", "alchemy_pages", column: "page_id", on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "site_id")
+      add_foreign_key "alchemy_nodes", "alchemy_sites", column: "site_id", on_delete: :cascade
+    end
+  end
+
+  def down
+    drop_table "alchemy_attachments" if table_exists?("alchemy_attachments")
+    drop_table "alchemy_contents" if table_exists?("alchemy_contents")
+    drop_table "alchemy_elements" if table_exists?("alchemy_elements")
+    drop_table "alchemy_elements_alchemy_pages" if table_exists?("alchemy_elements_alchemy_pages")
+    drop_table "alchemy_essence_booleans" if table_exists?("alchemy_essence_booleans")
+    drop_table "alchemy_essence_dates" if table_exists?("alchemy_essence_dates")
+    drop_table "alchemy_essence_files" if table_exists?("alchemy_essence_files")
+    drop_table "alchemy_essence_htmls" if table_exists?("alchemy_essence_htmls")
+    drop_table "alchemy_essence_links" if table_exists?("alchemy_essence_links")
+    drop_table "alchemy_essence_pages" if table_exists?("alchemy_essence_pages")
+    drop_table "alchemy_essence_pictures" if table_exists?("alchemy_essence_pictures")
+    drop_table "alchemy_essence_richtexts" if table_exists?("alchemy_essence_richtexts")
+    drop_table "alchemy_essence_selects" if table_exists?("alchemy_essence_selects")
+    drop_table "alchemy_essence_texts" if table_exists?("alchemy_essence_texts")
+    drop_table "alchemy_folded_pages" if table_exists?("alchemy_folded_pages")
+    drop_table "alchemy_languages" if table_exists?("alchemy_languages")
+    drop_table "alchemy_legacy_page_urls" if table_exists?("alchemy_legacy_page_urls")
+    drop_table "alchemy_nodes" if table_exists?("alchemy_nodes")
+    drop_table "alchemy_pages" if table_exists?("alchemy_pages")
+    drop_table "alchemy_pictures" if table_exists?("alchemy_pictures")
+    drop_table "alchemy_sites" if table_exists?("alchemy_sites")
+  end
+end