alchemy_cms 5.2.0 → 6.0.0.b3

data/config/initializers/dragonfly.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 require "dragonfly_svg"
+require "alchemy/dragonfly/processors/crop_resize"
+require "alchemy/dragonfly/processors/auto_orient"
 
 # Logger
 Dragonfly.logger = Rails.logger
@@ -9,3 +11,11 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend Dragonfly::Model
   ActiveRecord::Base.extend Dragonfly::Model::Validations
 end
+
+# Dragonfly 1.4.0 only allows `quality` as argument to `encode`
+Dragonfly::ImageMagick::Processors::Encode::WHITELISTED_ARGS << "flatten"
+
+Rails.application.config.after_initialize do
+  Dragonfly.app(:alchemy_pictures).add_processor(:crop_resize, Alchemy::Dragonfly::Processors::CropResize.new)
+  Dragonfly.app(:alchemy_pictures).add_processor(:auto_orient, Alchemy::Dragonfly::Processors::AutoOrient.new)
+end

data/config/locales/alchemy.en.yml

@@ -57,6 +57,90 @@ en:
       main_menu: Main Menu
       footer_menu: Footer Menu
 
+    # == Mime Types translations
+    # These are human readable mime types used for the document-type row in archive files.
+    #
+    mime_types: &mime_types
+      application/msexcel: Excel Spreadsheet
+      application/mspowerpoint: PowerPoint Presentation
+      application/msword: Word Document
+      application/pdf: PDF Document
+      application/rtf: RTF Document
+      application/vcard: vCard
+      application/vnd:
+        ms-excel: Excel Spreadsheet
+        ms-powerpoint: PowerPoint Presentation
+        ms-word: Word Document
+        openxmlformats-officedocument:
+          presentationml:
+            presentation: PowerPoint 2007 Presentation
+          spreadsheetml:
+            sheet: Excel 2007 Spreadsheet
+          wordprocessingml:
+            document: Word 2007 Document
+      application/x-flash-video: Flash Video
+      application/x-rar: RAR Archive
+      application/x-shockwave-flash: Flash Movie
+      application/zip: ZIP Archive
+      audio/mp4: MPEG-4 Audio
+      audio/mpeg: MP3 Audio
+      audio/wav: WAV Audio
+      audio/x-wav: WAV Audio
+      image/gif: GIF Image
+      image/jpeg: JPG Image
+      image/png: PNG Image
+      image/tiff: TIFF Image
+      image/x-psd: Photoshop File
+      image/svg+xml: SVG Image
+      text/plain: Plain Text Document
+      text/x-vcard: vCard
+      video/mp4: MPEG-4 Video
+      video/mpeg: MPEG Video
+      video/quicktime: Quicktime Video
+      video/x-flv: Flash Video
+      video/x-ms-wmv: Windows Media Video
+      video/x-msvideo: AVI Video
+
+    # === Translations for filter names and values
+    # Used in the right filter column in case the model has `alchemy_resource_filters` defined.
+    #
+    filters:
+      page:
+        by_page_layout:
+          name: Page Type
+        status:
+          name: Status
+          values:
+            not_public: Unpublished
+            published: Published
+            restricted: Restricted
+      picture:
+        by_file_format:
+          name: File Type
+          values:
+            gif: GIF Image
+            jpeg: JPG Image
+            png: PNG Image
+            tiff: TIFF Image
+        misc:
+          name: Miscellaneous
+          values:
+            last_upload: Last upload only
+            recent: Recently uploaded only
+            without_tag: Without tag
+      attachment:
+        by_file_type:
+          name: File Type
+          values:
+            <<: *mime_types
+        misc:
+          name: Miscellaneous
+          values:
+            last_upload: Last upload only
+            recent: Recently uploaded only
+            without_tag: Without tag
+            deletable: Not linked by file content
+
     # === Translations for content validations
     # Used when a user did not enter (correct) values to the content field.
     #
@@ -89,6 +173,11 @@ en:
         right: 'Right from text'
         no_float: 'Above the text'
 
+    ingredient_values:
+      boolean:
+        true: "True"
+        false: "False"
+
     # == Contactform translations
     contactform:
       labels:
@@ -127,49 +216,6 @@ en:
       editor: "Editor"
       admin: "Administrator"
 
-    # == Mime Types translations
-    # These are human readable mime types used for the document-type row in archive files.
-    mime_types:
-      application/msexcel: Excel Spreadsheet
-      application/mspowerpoint: PowerPoint Presentation
-      application/msword: Word Document
-      application/pdf: PDF Document
-      application/rtf: RTF Document
-      application/vcard: vCard
-      application/vnd:
-        ms-excel: Excel Spreadsheet
-        ms-powerpoint: PowerPoint Presentation
-        ms-word: Word Document
-        openxmlformats-officedocument:
-          presentationml:
-            presentation: PowerPoint 2007 Presentation
-          spreadsheetml:
-            sheet: Excel 2007 Spreadsheet
-          wordprocessingml:
-            document: Word 2007 Document
-      application/x-flash-video: Flash Video
-      application/x-rar: RAR Archive
-      application/x-shockwave-flash: Flash Movie
-      application/zip: ZIP Archive
-      audio/mp4: MPEG-4 Audio
-      audio/mpeg: MP3 Audio
-      audio/wav: WAV Audio
-      audio/x-wav: WAV Audio
-      image/gif: GIF Image
-      image/jpeg: JPG Image
-      image/png: PNG Image
-      image/tiff: TIFF Image
-      image/x-psd: Photoshop File
-      image/svg+xml: SVG Image
-      text/plain: Plain Text Document
-      text/x-vcard: vCard
-      video/mp4: MPEG-4 Video
-      video/mpeg: MPEG Video
-      video/quicktime: Quicktime Video
-      video/x-flv: Flash Video
-      video/x-ms-wmv: Windows Media Video
-      video/x-msvideo: AVI Video
-
     link_target_options:
       default: Same Window
       blank: New Window/Tab
@@ -194,7 +240,6 @@ en:
     'An error happened': 'An error happened'
     "Change password": "Change password"
     "Choose page": "Choose page"
-    "Cleared trash": "Cleared trash"
     "Clear selection": "Clear selection"
     "Forgot your password?": "Forgot your password?"
     "Clipboard": "Clipboard"
@@ -204,15 +249,14 @@ en:
     "Currently locked pages": "Currently locked pages"
     "Default language has to be public": "Default language has to be public"
     "Delete image": "Delete image"
+    "Delete element": "Delete element"
     "Do you really want to clear the clipboard?": "Do you really want to clear the clipboard?"
-    "Do you really want to clear the trash?": "Do you really want to clear the trash?"
     "Do you really want to delete this content?": "Do you really want to delete this content?"
     "Drag an element over to the element window to restore it": "Drag an element over to the element window to restore it"
     "Edit Picturemask": "Edit picturemask"
     "Edit image": "Edit image"
     "Edit multiple pictures": "Edit multiple pictures"
     "Elements": "Elements"
-    "Element trashed": "Element trashed"
     "Error with the Flash® Uploader!": "Error with the Flash® Uploader!"
     "Excerpt": "Excerpt"
     "File successfully updated": "File successfully updated"
@@ -268,7 +312,6 @@ en:
     "Please log in": "Please log in."
     "Please seperate the tags with commata": "* Please seperate the tags with commas."
     "Properties": "Properties"
-    "Publish page": "Publish page"
     "Read the License": "Read the License"
     "Redirects to": "Redirects to"
     "Reload Preview": "Reload Preview"
@@ -287,7 +330,6 @@ en:
     "Show clipboard": "Show clipboard"
     "Copied to clipboard": "Copied to clipboard"
     "Show picture infos": "Show picture infos"
-    "Show trash": "Show trash"
     "Site successfully created": "Website successfully created."
     "Site successfully removed": "Website successfully removed."
     "Site successfully updated": "Website successfully updated."
@@ -295,6 +337,7 @@ en:
     "Sort pages": "Reorder pages"
     "Successfully added content": "Successfully added %{content}"
     "Successfully deleted content": "Successfully deleted %{content}"
+    "Successfully deleted element": "Successfully deleted %{element}"
     "Tags": "Tags"
     "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"
     "This page is locked": "This page is currently locked by %{name}"
@@ -310,6 +353,7 @@ en:
     "Warning!": "Warning!"
     content_definition_missing: "Warning: Content is missing its definition. Please check the elements.yml"
     content_deprecated: "WARNING! This content is deprecated and will be removed soon. Please do not use it anymore."
+    ingredient_deprecated: "WARNING! This content is deprecated and will be removed soon. Please do not use it anymore."
     element_definition_missing: "WARNING! Missing element definition. Please check your elements.yml file."
     element_deprecated: "WARNING! This element is deprecated and will be removed soon. Please do not use it anymore."
     page_definition_missing: "WARNING! Missing page layout definition. Please check your page_layouts.yml file."
@@ -321,7 +365,6 @@ en:
     element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
     "Your last login was on": "Your last login was on %{time}."
     "Your last updated pages": "Your last updated pages"
-    "Your trash is empty": "Your trash is empty"
     above: "above"
     add: "Add"
     align_in_text: "Alignment in text"
@@ -329,7 +372,6 @@ en:
     all_pictures: "All pictures"
     apply: "apply"
     assign_file: "Assign a file"
-    assign_file_from_archive: "assign a file from your archive"
     assign_image: "Assign an image"
     attached_to: "attached to"
     attachment_filename_notice: "* Please do not use any special characters for the filename."
@@ -337,17 +379,18 @@ en:
     big_thumbnails: "Big thumbnails"
     cancel: "cancel"
     cannot_delete_picture_notice: "Cannot delete Picture %{name}, because it's still in use."
+    cannot_visit_unpublic_page: "Publish page before visiting it."
     choose_file_to_link: "Please choose a file to link"
     "clear clipboard": "clear clipboard"
-    "clear trash": "clear trash"
     click_to_show_all: "Click to show all again."
+    confirm_to_delete_element: "Do you really want to delete this element? It cannot be restored!"
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
     confirm_to_delete_image: "Do you really want to delete this image from server?"
     confirm_to_delete_image_from_server: "Do you really want to delete this image from the server?"
     confirm_to_delete_images_from_server: "Do you really want to delete these images from the server?"
     confirm_to_delete_menu: "Do you really want to delete this menu?"
     confirm_to_delete_node: "Do you really want to delete this menu node?"
-    confirm_to_delete_page: "Do you really want to delete this page? All its elements (even trashed ones) will get lost!"
+    confirm_to_delete_page: "Do you really want to delete this page?"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
     content_validations_headline: "Please check marked fields below"
@@ -393,7 +436,7 @@ en:
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
     explain_cropping: "<p>Move the frame and change its size with the mouse or arrow keys to adjust the image mask. Click on \"apply\" when you are satisfied with your selection.</p><p>If you want to return to the original centered image mask like it was defined in the layout, click \"reset\" and \"apply\" afterwards.</p>"
-    explain_publishing: "Publish the page and remove the cached version from the server."
+    explain_publishing: "Publish current page content"
     explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."
     external_link_notice_1: "Please enter the complete url with http:// or a similar protocol."
@@ -401,6 +444,7 @@ en:
     female: "Female"
     file: "File"
     file_rename_error: "Error renaming file."
+    filtered_by: "Filtered by"
     from_at: "from %{by} at %{at}"
     height: "Height"
     help:
@@ -422,7 +466,7 @@ en:
     dashboard: "Dashboard"
     image_alt_tag: "Alt-tag"
     image_caption: "Caption"
-    image_name: "Name"
+    image_name: "Name: %{name}"
     image_title: "Title-tag"
     internal_link_headline: "Search for a page to link to by entering its name into the Page select."
     internal_link_page_elements_explanation: "Additionally you can choose an anchor to an element from selected page."
@@ -433,7 +477,6 @@ en:
     javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
     language_code_placeholder: 'i.e. en'
     language_pages_copied: "Language tree successfully copied."
-    last_upload_only: "Last upload only"
     left: "left"
     legacy_url_info_text: "A link is a redirect from an old URL to the current URL of this page. This redirect happens with a <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
     link_image: "Link this image."
@@ -491,7 +534,7 @@ en:
     or_replace_it_with_an_existing_tag: 'Or replace it with an existing tag'
     "Page created": "Page: '%{name}' created."
     page_infos: 'Page info'
-    page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been moved into the trash."
+    page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been hided."
     page_properties: "Page properties"
     page_public: "published"
     page_published: "Published page"
@@ -517,11 +560,6 @@ en:
         comma_seperated: "Separate by comma"
     password: "Password"
     paste: "paste"
-    picture_library:
-      filter:
-        last_upload: "from last upload"
-        recent: "that where recently uploaded"
-        without_tag: "without tag"
     pictures_in_page: "%{page} in %{pictures}"
     place_link: "Link text"
     player_version: "Flash Player version"
@@ -538,6 +576,8 @@ en:
       '1024': '1024px (iPad - Landscape)'
       '1280': '1280px (Desktop)'
     preview_url: Preview
+    publish_page_language_not_public: Cannot publish page if language is not public
+    publish_page_not_allowed: You have not the permission to publish this page
     recently_uploaded_only: 'Recently uploaded only'
     "regular method": "Regular method"
     remove: "Remove"
@@ -568,7 +608,6 @@ en:
     subject: "Subject"
     successfully_added_element: "Successfully added new element."
     successfully_deleted_tag: "Successfully deleted tag"
-    successfully_restored_element: "Element restored successfully."
     successfully_saved_element_position: "Element position updated successfully."
     successfully_updated_tag: "Successfully updated tag"
     swap_image: "Change image"
@@ -578,7 +617,6 @@ en:
     this_picture_is_used_on_these_pages: "This picture is used on following pages"
     title: "Title"
     to_alchemy: "To Alchemy"
-    "trash element": "Put element into trash"
     unknown: "unknown"
     unlink: "Remove link from this image."
     unlock_page: "Leave page"
@@ -704,11 +742,18 @@ en:
   # Translations for Alchemy models
   activemodel:
     models:
+      alchemy/essence_headline:
+        one: Headline
+        other: Headline
       alchemy/message:
         one: Message
         other: Messages
       alchemy/admin/preview_url: Internal
     attributes:
+      alchemy/essence_headline:
+        body: Headline
+        level: Level
+        size: Size
       alchemy/message:
         salutation: 'Salutation'
         firstname: 'Firstname'
@@ -785,7 +830,6 @@ en:
         name: "Name"
         public: "visible"
         tag_list: Tags
-        trashed: Trashed
       alchemy/essence_file:
         css_class: Style
       alchemy/essence_picture:

data/config/routes.rb

@@ -6,7 +6,7 @@ Alchemy::Engine.routes.draw do
 
   get "/sitemap.xml" => "pages#sitemap", format: "xml"
 
-  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
+  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
@@ -15,7 +15,7 @@ Alchemy::Engine.routes.draw do
     get "/leave" => "admin/base#leave", as: :leave_admin
   end
 
-  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
+  namespace :admin, { path: Alchemy.admin_path, constraints: Alchemy.admin_constraints } do
     resources :contents, only: [:create]
 
     resources :nodes
@@ -35,7 +35,6 @@ Alchemy::Engine.routes.draw do
         post :unlock
         post :publish
         post :fold
-        post :visit
         get :configure
         get :preview
         get :info
@@ -50,7 +49,6 @@ Alchemy::Engine.routes.draw do
       member do
         patch :publish
         post :fold
-        delete :trash
       end
     end
 
@@ -63,6 +61,8 @@ Alchemy::Engine.routes.draw do
         get :edit_multiple
       end
       member do
+        get :url
+        put :assign
         delete :remove
       end
     end
@@ -70,23 +70,25 @@ Alchemy::Engine.routes.draw do
     resources :attachments, except: [:new] do
       member do
         get :download
+        put :assign
       end
     end
 
-    resources :essence_pictures, except: [:show, :new, :create] do
-      collection do
-        put :assign
-      end
+    resources :essence_audios, only: [:edit, :update]
+
+    concern :croppable do
       member do
         get :crop
       end
     end
 
-    resources :essence_files, only: [:edit, :update] do
-      collection do
-        put :assign
-      end
-    end
+    resources :essence_pictures, only: [:edit, :update], concerns: [:croppable]
+
+    resources :essence_files, only: [:edit, :update]
+
+    resources :essence_videos, only: [:edit, :update]
+
+    resources :ingredients, only: [:edit, :update], concerns: [:croppable]
 
     resources :legacy_page_urls
     resources :languages do
@@ -104,13 +106,6 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :trash, only: :index, controller: "trash" do
-      collection do
-        get :index
-        delete :clear
-      end
-    end
-
     resources :tags do
       collection do
         get :autocomplete
@@ -131,7 +126,7 @@ Alchemy::Engine.routes.draw do
   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
@@ -159,7 +154,7 @@ Alchemy::Engine.routes.draw do
   end
 
   get "/:locale" => "pages#index",
-    constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
+    constraints: { locale: Alchemy::RoutingConstraints::LOCALE_REGEXP },
     as: :show_language_root
 
   # The page show action has to be last route