alchemy_cms 5.1.4 → 6.0.0.b1

data/app/views/alchemy/ingredients/_text_view.html.erb

@@ -0,0 +1,16 @@
+<%- options = local_assigns.fetch(:options, {}) -%>
+<%- html_options = local_assigns.fetch(:html_options, {}) -%>
+<%- if text_view.link.blank? ||
+    text_view.settings_value(:disable_link, options) -%>
+<%= text_view.value -%>
+<%- else -%>
+  <%= link_to(
+    text_view.value,
+    url_for(text_view.link),
+    {
+      title: text_view.link_title,
+      target: (text_view.link_target == "blank" ? "_blank" : nil),
+      'data-link-target' => text_view.link_target
+    }.merge(html_options)
+) -%>
+<%- end -%>

data/app/views/alchemy/ingredients/_video_editor.html.erb

@@ -0,0 +1,5 @@
+<%= render(
+  "alchemy/ingredients/file_editor",
+  element_form: element_form,
+  file_editor: video_editor,
+) %>

data/app/views/alchemy/ingredients/_video_view.html.erb

@@ -0,0 +1,17 @@
+<%- if video_view.attachment -%>
+  <%= content_tag :video,
+    controls: video_view.controls,
+    autoplay: video_view.autoplay,
+    loop: video_view.loop,
+    muted: video_view.muted,
+    preload: video_view.preload.presence,
+    width: video_view.width.presence,
+    height: video_view.height.presence do %>
+    <%= tag :source,
+      src: alchemy.show_attachment_path(
+        video_view.attachment,
+        format: video_view.attachment.suffix
+      ),
+      type: video_view.attachment.file_mime_type %>
+  <% end %>
+<%- end -%>

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -0,0 +1,20 @@
+<span class="linkable_essence_tools">
+  <%= link_to(
+    render_icon(:link),
+    '#',
+    onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
+    class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-essence",
+    "data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
+    title: Alchemy.t(:place_link),
+    id: "edit_link_#{ingredient_editor.id}"
+  ) %>
+  <%= link_to(
+    render_icon(:unlink),
+    '#',
+    onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{ingredient_editor.id}\"]')",
+    class: "icon_button unlink-essence #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
+    tabindex: ingredient_editor.linked? ? nil : '-1',
+    'data-ingredient-id' => ingredient_editor.id,
+    title: Alchemy.t(:unlink)
+  ) %>
+</span>

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -0,0 +1,57 @@
+<% linkable = picture_editor.settings[:linkable] != false %>
+<% croppable = picture_editor.allow_image_cropping? %>
+
+<%= link_to_dialog render_icon(:crop),
+  alchemy.crop_admin_ingredient_path(picture_editor.ingredient, {
+    crop_from_form_field_id: picture_editor.form_field_id(:crop_from),
+    crop_size_form_field_id: picture_editor.form_field_id(:crop_size),
+    picture_id: picture_editor.picture&.id
+  }), {
+    size: "1080x615",
+    title: Alchemy.t("Edit Picturemask"),
+    image_loader: false,
+    padding: false
+  }, {
+    title: Alchemy.t("Edit Picturemask"),
+    class: croppable ? "crop_link" : "disabled crop_link",
+    tabindex: croppable ? nil : "-1",
+    onclick: "return false"
+  } %>
+
+<%= link_to_dialog render_icon("file-image", style: "regular"),
+  alchemy.admin_pictures_path(
+    form_field_id: picture_editor.form_field_id(:picture_id)
+  ),
+  {
+    title: (picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
+    size: "790x590",
+    padding: false
+  },
+  title: (picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)) %>
+
+<%= link_to_if linkable, render_icon(:link), "", {
+  onclick: "new Alchemy.LinkDialog(this).open(); return false;",
+  class: picture_editor.linked? ? "linked" : nil,
+  title: Alchemy.t(:link_image),
+  "data-parent-selector": "[data-ingredient-id='#{picture_editor.id}']",
+  id: "edit_link_#{picture_editor.id}"
+} do %>
+  <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>
+<% end %>
+
+<%= link_to_if linkable, render_icon(:unlink), "", {
+  onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{picture_editor.id}\"]')",
+  class: picture_editor.linked? ? "linked" : "disabled",
+  tabindex: picture_editor.linked? ? nil : "-1",
+  title: Alchemy.t(:unlink)
+} do %>
+  <span class="disabled" tabindex="-1"><%= render_icon(:unlink) %></span>
+<% end %>
+
+<%= link_to_dialog render_icon(:edit),
+  alchemy.edit_admin_ingredient_path(id: picture_editor.id),
+  {
+    title: Alchemy.t(:edit_image_properties),
+    size: "380x255"
+  },
+  title: Alchemy.t(:edit_image_properties) %>

data/config/brakeman.ignore

@@ -1,14 +1,65 @@
 {
   "ignored_warnings": [
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "068b12d24047e2ece633115ba065ce46fc8c8a26827be7de2565ab721e1c2e82",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped parameter value",
+      "file": "app/views/alchemy/admin/elements/update.js.erb",
+      "line": 21,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "Element.find(params[:id]).ingredients_with_errors.map do\n \"[data-ingredient-id=\\\"#{ingredient.id}\\\"]\"\n end.join(\", \")",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Alchemy::Admin::ElementsController",
+          "method": "update",
+          "line": 61,
+          "file": "app/controllers/alchemy/admin/elements_controller.rb",
+          "rendered": {
+            "name": "alchemy/admin/elements/update",
+            "file": "app/views/alchemy/admin/elements/update.js.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "alchemy/admin/elements/update"
+      },
+      "user_input": "params[:id]",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "154e5d85347ab40256b60182d3143830247b33b81de2ae9ac0622155a1de8e51",
+      "check_name": "SendFile",
+      "message": "Parameter value used in file name",
+      "file": "app/controllers/alchemy/admin/attachments_controller.rb",
+      "line": 69,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Attachment.find(params[:id]).file.path, :filename => Attachment.find(params[:id]).file_name, :type => Attachment.find(params[:id]).file_mime_type)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Alchemy::Admin::AttachmentsController",
+        "method": "download"
+      },
+      "user_input": "params[:id]",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Mass Assignment",
       "warning_code": 70,
       "fingerprint": "1dd8f69d9b1bdd4017212f38098f03d2ecb2db06269fb940090f209eee7570c6",
       "check_name": "MassAssignment",
-      "message": "Parameters should be whitelisted for mass assignment",
+      "message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
       "file": "app/controllers/alchemy/admin/resources_controller.rb",
-      "line": 130,
-      "link": "http://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "line": 136,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
       "code": "params.require(resource_handler.namespaced_resource_name).permit!",
       "render_path": null,
       "location": {
@@ -23,31 +74,43 @@
     {
       "warning_type": "Dynamic Render Path",
       "warning_code": 15,
-      "fingerprint": "79e194e21561d40888d86ebc7fd2ab474fdb0ce32d605dbe9ac6e8984ecc5e92",
+      "fingerprint": "384ec61125c6390d59fb7ebcf52792ba284bfd463d70d4ef552ab6c328e776f6",
       "check_name": "Render",
       "message": "Render path contains parameter value",
-      "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) })",
-      "render_path": [{"type":"controller","class":"Alchemy::Admin::ContentsController","method":"create","line":21,"file":"app/controllers/alchemy/admin/contents_controller.rb"}],
+      "file": "app/views/alchemy/admin/elements/fold.js.erb",
+      "line": 11,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(action => Alchemy::ElementEditor.new(Element.find(params[:id])), {})",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Alchemy::Admin::ElementsController",
+          "method": "fold",
+          "line": 97,
+          "file": "app/controllers/alchemy/admin/elements_controller.rb",
+          "rendered": {
+            "name": "alchemy/admin/elements/fold",
+            "file": "app/views/alchemy/admin/elements/fold.js.erb"
+          }
+        }
+      ],
       "location": {
         "type": "template",
-        "template": "alchemy/admin/contents/create"
+        "template": "alchemy/admin/elements/fold"
       },
-      "user_input": "params[:content][:element_id]",
+      "user_input": "params[:id]",
       "confidence": "Weak",
-      "note": "This dynamic render path comes from the Contents essence not from any params or user mutated string. This can safely be ignored."
+      "note": ""
     },
     {
       "warning_type": "Mass Assignment",
       "warning_code": 70,
       "fingerprint": "4b4dc24a6f5251bc1a6851597dfcee39608a2932eb7f81a4a241c00fca8a3043",
       "check_name": "MassAssignment",
-      "message": "Parameters should be whitelisted for mass assignment",
+      "message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
       "file": "app/controllers/alchemy/admin/elements_controller.rb",
-      "line": 168,
-      "link": "http://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "line": 150,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
       "code": "params.fetch(:contents, {}).permit!",
       "render_path": null,
       "location": {
@@ -58,8 +121,140 @@
       "user_input": null,
       "confidence": "Medium",
       "note": "`Alchemy::Content` is a polymorphic association of any kind of model extending `Alchemy::Essence`. Since we can't know the attributes of all potential essences we need to permit all attributes. As this all happens inside the password protected /admin namespace this can be considered a false positive."
+    },
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 4,
+      "fingerprint": "6e6ed4f8b20c07868bc04a4dc419103ecce33bb514eff77790abd57246a4513f",
+      "check_name": "LinkToHref",
+      "message": "Potentially unsafe model attribute in `link_to` href",
+      "file": "app/views/alchemy/admin/nodes/_node.html.erb",
+      "line": 62,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
+      "code": "link_to((Unresolved Model).new.url, (Unresolved Model).new.url, :target => \"_blank\", :title => (Unresolved Model).new.url)",
+      "render_path": [
+        {
+          "type": "template",
+          "name": "alchemy/admin/nodes/_node",
+          "line": 71,
+          "file": "app/views/alchemy/admin/nodes/_node.html.erb",
+          "rendered": {
+            "name": "alchemy/admin/nodes/_node",
+            "file": "app/views/alchemy/admin/nodes/_node.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "alchemy/admin/nodes/_node"
+      },
+      "user_input": "(Unresolved Model).new.url",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "6f642c32a45d9f6bbdff89c51873485c930479f4d72885ad0a1883c4372140bf",
+      "check_name": "SendFile",
+      "message": "Parameter value used in file name",
+      "file": "app/controllers/alchemy/attachments_controller.rb",
+      "line": 25,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Attachment.find(params[:id]).file.path, :filename => Attachment.find(params[:id]).file_name, :type => Attachment.find(params[:id]).file_mime_type)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Alchemy::AttachmentsController",
+        "method": "download"
+      },
+      "user_input": "params[:id]",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "Dynamic Render Path",
+      "warning_code": 15,
+      "fingerprint": "80b9b11d658cd393c549d568b3655c62566862f55b2fa16ed688de7c2e9343ac",
+      "check_name": "Render",
+      "message": "Render path contains parameter value",
+      "file": "app/views/alchemy/admin/elements/index.html.erb",
+      "line": 18,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(action => PageVersion.find(params[:page_version_id]).elements.order(:position).includes(*element_includes).not_nested.unfixed.map do\n Alchemy::ElementEditor.new(element)\n end, {})",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Alchemy::Admin::ElementsController",
+          "method": "index",
+          "line": 15,
+          "file": "app/controllers/alchemy/admin/elements_controller.rb",
+          "rendered": {
+            "name": "alchemy/admin/elements/index",
+            "file": "app/views/alchemy/admin/elements/index.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "alchemy/admin/elements/index"
+      },
+      "user_input": "params[:page_version_id]",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "Dynamic Render Path",
+      "warning_code": 15,
+      "fingerprint": "80b9b11d658cd393c549d568b3655c62566862f55b2fa16ed688de7c2e9343ac",
+      "check_name": "Render",
+      "message": "Render path contains parameter value",
+      "file": "app/views/alchemy/admin/elements/index.html.erb",
+      "line": 31,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(action => PageVersion.find(params[:page_version_id]).elements.order(:position).includes(*element_includes).not_nested.unfixed.map do\n Alchemy::ElementEditor.new(element)\n end, {})",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Alchemy::Admin::ElementsController",
+          "method": "index",
+          "line": 15,
+          "file": "app/controllers/alchemy/admin/elements_controller.rb",
+          "rendered": {
+            "name": "alchemy/admin/elements/index",
+            "file": "app/views/alchemy/admin/elements/index.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "alchemy/admin/elements/index"
+      },
+      "user_input": "params[:page_version_id]",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "a1197cfa89e3a66e6d10ee060cd87af97d5e978d6d93b5936eb987288f1c02e6",
+      "check_name": "SendFile",
+      "message": "Parameter value used in file name",
+      "file": "app/controllers/alchemy/attachments_controller.rb",
+      "line": 12,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Attachment.find(params[:id]).file.path, :filename => Attachment.find(params[:id]).file_name, :type => Attachment.find(params[:id]).file_mime_type, :disposition => \"inline\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Alchemy::AttachmentsController",
+        "method": "show"
+      },
+      "user_input": "params[:id]",
+      "confidence": "Weak",
+      "note": ""
     }
   ],
-  "updated": "2017-10-23 11:49:41 +0200",
-  "brakeman_version": "4.0.1"
+  "updated": "2021-06-29 20:56:10 +0200",
+  "brakeman_version": "5.0.1"
 }

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

@@ -89,6 +89,11 @@ en:
         right: 'Right from text'
         no_float: 'Above the text'
 
+    ingredient_values:
+      boolean:
+        true: "True"
+        false: "False"
+
     # == Contactform translations
     contactform:
       labels:
@@ -130,31 +135,45 @@ en:
     # == Mime Types translations
     # These are human readable mime types used for the document-type row in archive files.
     mime_types:
-      audio/mp4: 'MP4-Audio'
-      application/msword: 'Word-Document'
-      application/rtf: 'RTF-Document'
-      audio/mpeg: 'MP3-Audio'
-      text/plain: 'Text-Document'
-      video/mp4: 'MP4-Video'
-      video/mpeg: 'MPEG-Video'
-      application/pdf: 'PDF-Document'
-      application/x-flash-video: 'Flash-Video'
-      video/x-flv: 'Flash-Video'
-      application/x-shockwave-flash: 'Flash-Movie'
-      application/zip: 'ZIP-Archive'
-      application/x-rar: 'RAR-Archive'
+      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-Document'
-      video/quicktime: 'Quicktime-Video'
-      image/x-psd: 'Photoshop-File'
-      image/gif: 'GIF-Image'
-      image/png: 'PNG-Image'
-      image/jpeg: 'JPG-Image'
-      video/x-msvideo: 'AVI-Video'
-      video/x-ms-wmv: 'Windows Media Video'
-      image/tiff: 'TIFF-Image'
-      'text/x-vcard': 'vCard'
-      application/vcard: 'vCard'
+        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
@@ -180,7 +199,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"
@@ -190,15 +208,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"
@@ -254,7 +271,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"
@@ -273,7 +289,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."
@@ -281,6 +296,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}"
@@ -295,7 +311,10 @@ en:
     "Visit page": "Visit page"
     "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."
     "Welcome to Alchemy": "Welcome to Alchemy"
     "Who else is online": "Who else is online"
@@ -305,7 +324,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"
@@ -313,7 +331,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."
@@ -321,17 +338,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"
@@ -377,7 +395,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."
@@ -406,7 +424,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."
@@ -475,7 +493,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"
@@ -522,6 +540,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"
@@ -552,7 +572,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"
@@ -562,7 +581,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"
@@ -688,11 +706,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'
@@ -769,7 +794,6 @@ en:
         name: "Name"
         public: "visible"
         tag_list: Tags
-        trashed: Trashed
       alchemy/essence_file:
         css_class: Style
       alchemy/essence_picture: