alchemy_cms 3.4.2 → 3.5.0.rc1

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

@@ -1,5 +1,3 @@
-<%- cache(content) do -%>
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- plain_text = !!content.settings_value(:plain_text, options) -%>
-<%= raw content.essence.send(plain_text ? :stripped_body : :body) -%>
-<%- end -%>
+<%= raw content.essence.public_send(plain_text ? :stripped_body : :body) -%>

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

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

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

@@ -1,3 +1 @@
-<% cache(content) do %>
-<%= content.ingredient %>
-<% end %>
+<%= content.ingredient %>

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

@@ -1,19 +1,17 @@
-<% cache(content) do %>
-  <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
-    <%= content_label(content) %>
-    <%= 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"
-    ) %>
-    <% 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 %>
-    <% end %>
-  </div>
-<% end %>
+<div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
+  <%= content_label(content) %>
+  <%= 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"
+  ) %>
+  <% 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 %>
+  <% end %>
+</div>

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

@@ -1,4 +1,3 @@
-<%- cache(content) do -%>
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%- if content.essence.link.blank? ||
@@ -14,5 +13,4 @@
     'data-link-target' => content.essence.link_target
   }.merge(html_options)
 ) -%>
-<%- end -%>
 <%- end -%>

data/app/views/alchemy/pages/_meta_data.html.erb

@@ -0,0 +1,9 @@
+<% if @page %>
+  <meta charset="utf8">
+  <title><%= page_title prefix: local_assigns.fetch(:title_prefix, nil), separator: local_assigns.fetch(:title_separator, nil) %></title>
+  <%= tag(:meta, name: 'created', content: @page.updated_at) %>
+  <%= tag(:meta, name: 'robots', content: meta_robots) %>
+  <%= tag(:meta, name: 'description', content: meta_description, lang: @page.language_code) if meta_description.present? %>
+  <%= tag(:meta, name: 'keywords', content: meta_keywords, lang: @page.language_code) if meta_keywords.present? %>
+  <%= auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss)) if @page.contains_feed? %>
+<% end %>

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

@@ -37,7 +37,7 @@
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
     <%= yield :javascript_includes %>
   </head>
-  <body id="alchemy" class="<%= alchemy_body_class %>">
+  <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>
     <noscript>
       <h1><%= Alchemy.t(:javascript_disabled_headline) %></h1>
       <p><%= Alchemy.t(:javascript_disabled_text) %></p>
@@ -72,24 +72,22 @@
     </div>
     <% if current_alchemy_user %>
     <div id="top_menu">
-      <div id="sub_navigation">
-        <%= admin_subnavigation %>
+      <div id="header">
         <% if @locked_pages.present? %>
           <div id="locked_pages">
-            <label><%= Alchemy.t(:locked_pages) %> &raquo;</label>
             <%= render partial: 'alchemy/admin/pages/locked_page', collection: @locked_pages %>
           </div>
         <% end %>
+        <div id="user_info">
+          <%= current_alchemy_user_name %>
+          <%= select_tag 'change_locale',
+            options_for_select(translations_for_select, ::I18n.locale),
+            class: 'alchemy_selectbox tiny' %>
+        </div>
       </div>
       <div id="toolbar">
         <%= yield(:toolbar) %>
       </div>
-      <div id="user_info">
-        <%= current_alchemy_user_name %>
-        <%= select_tag 'change_locale',
-          options_for_select(translations_for_select, ::I18n.locale),
-          class: 'alchemy_selectbox tiny' %>
-      </div>
     </div>
     <% end %>
     <%= render :partial => 'alchemy/admin/partials/flash_notices' %>
@@ -104,5 +102,5 @@
     </script>
     <%= render 'alchemy/admin/uploader/setup' %>
     <%= yield(:javascripts) %>
-  </body>
+  <% end %>
 </html>

data/bin/alchemy

@@ -113,7 +113,7 @@ EOF
       <<-GITIGNORE
 
 # Ignore Alchemy uploads folder
-uploads/*
+/uploads
 
 # Ignore sensitive data
 config/database.yml
@@ -123,7 +123,6 @@ GITIGNORE
     `
       cd #{@application}
       mkdir -p ./uploads
-      touch ./uploads/.gitkeep
     `
   end
 

data/config/alchemy/config.yml

@@ -61,7 +61,7 @@ url_nesting: true
 
 # === Picture rendering settings
 #
-# Alchemy uses Dragonfly to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
+# Alchemy uses Dragonfly to render images. Use {size: "XXXxYYY", crop: BOOLEAN [true]} to resize images.
 #
 # See http://markevans.github.com/dragonfly for further infos.
 #

data/config/alchemy/modules.yml

@@ -8,10 +8,6 @@
     controller: 'alchemy/admin/dashboard'
     action: index
     image: 'alchemy/icon.svg'
-    sub_navigation:
-      - name: 'modules.dashboard'
-        controller: 'alchemy/admin/dashboard'
-        action: index
 
 - name: pages
   engine_name: alchemy
@@ -40,10 +36,6 @@
     controller: 'alchemy/admin/languages'
     action: index
     icon: languages
-    sub_navigation:
-      - name: 'modules.languages'
-        controller: 'alchemy/admin/languages'
-        action: index
 
 - name: sites
   engine_name: alchemy
@@ -53,10 +45,6 @@
     controller: 'alchemy/admin/sites'
     action: index
     icon: sites
-    sub_navigation:
-    - name: 'modules.sites'
-      controller: 'alchemy/admin/sites'
-      action: index
 
 - name: tags
   engine_name: alchemy
@@ -66,10 +54,6 @@
     controller: 'alchemy/admin/tags'
     action: index
     icon: tags
-    sub_navigation:
-    - name: 'modules.tags'
-      controller: 'alchemy/admin/tags'
-      action: index
 
 - name: archive
   engine_name: alchemy

data/config/initializers/dragonfly.rb

@@ -1,23 +1,5 @@
 require 'dragonfly_svg'
 
-# Alchemy CMS Dragonfly configuration.
-
-# Pictures
-Dragonfly.app(:alchemy_pictures).configure do
-  plugin :imagemagick
-  plugin :svg
-  datastore :file,
-    root_path:  Rails.root.join('uploads/pictures').to_s,
-    store_meta: false
-end
-
-# Attachments
-Dragonfly.app(:alchemy_attachments).configure do
-  datastore :file,
-    root_path:  Rails.root.join('uploads/attachments').to_s,
-    store_meta: false
-end
-
 # Logger
 Dragonfly.logger = Rails.logger
 

data/config/initializers/mini_profiler.rb

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

data/config/locales/alchemy.de.yml

@@ -161,6 +161,7 @@ de:
         aliases: Weitere Domains bitte mit Leerzeichen oder Leerzeile getrennt angeben.
 
     anchor: 'Sprungmarke'
+    attribute_fixed: Dieser Wert ist für diesen Seitentyp nicht veränderbar
     back: 'zurück'
     create_tree_as_new_language: "%{language} als neuen Sprachbaum anlegen"
     locked_pages: "Aktive Seiten"
@@ -263,6 +264,7 @@ de:
     "Show all files": Alle Dateien anzeigen
     "Show childpages": "Unterseiten anzeigen"
     "Show clipboard": "Zwischenablage anzeigen"
+    "Copied to clipboard": "In die Zwischenablage kopiert"
     "Show picture infos": "Bild Informationen anzeigen"
     "Show trash": "Papierkorb anzeigen"
     "Site successfully created": "Website wurde erfolgreich erstellt."
@@ -284,6 +286,7 @@ de:
     "Validation failed": "Einige Pflichtfelder wurden nicht richtig ausgefüllt."
     "Version": "Version"
     "View File": "Datei anzeigen"
+    "Attachment Preview": "Dateivorschau"
     "Visit page": "zur Seite gehen"
     "Warning!": "Achtung!"
     content_definition_missing: "Warnung: Für diesen Content konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
@@ -324,7 +327,7 @@ de:
     confirm_to_delete_image: "Wollen Sie dieses Bild wirklich löschen?"
     confirm_to_delete_image_from_server: "Wollen Sie dieses Bild wirklich vom Server löschen?"
     confirm_to_delete_images_from_server: "Wollen Sie diese Bilder wirklich vom Server löschen?"
-    confirm_to_delete_page: "Wollen Sie diese Seite wirklich löschen? Alle Inhalte gehen dabei unwiderruflich verloren!"
+    confirm_to_delete_page: "Wollen Sie diese Seite wirklich löschen? Alle Inhalte (auch die aus dem Papierkorb) gehen dabei unwiderruflich verloren!"
     content_essence_not_found: "Essenz wurde nicht gefunden"
     content_not_found: "Das Feld für diesen Inhalt ist nicht vorhanden."
     content_validations_headline: "Bitte überprüfen Sie die markierten Felder."
@@ -514,6 +517,7 @@ de:
     rename_file: "Datei umbenennen"
     rename: umbenennen
     replace: ersetzen
+    replace_file: Datei ersetzen
     'Replaced Tag': "Das Tag '%{old_tag}' wurde durch das Tag '%{new_tag}' ersetzt"
     resources:
       relation_select:
@@ -585,6 +589,7 @@ de:
     "Create": "Hinzufügen"
     "Edit": "Bearbeiten"
     "Delete": "Löschen"
+    "Show error details": Fehlerdetails anzeigen
     "Succesfully created": "Erfolgreich erstellt"
     "Succesfully updated": "Erfolgreich aktualisiert"
     "Succesfully removed": "Erfolgreich gelöscht"
@@ -593,6 +598,7 @@ de:
     "Update available": 'Es ist ein Update verfügbar'
     "Update status unavailable": 'Update Status konnte nicht ermittelt werden'
     "Uploading": "Hochladen"
+    "Your user role does not allow you to edit this page": Ihre Benutzerrolle erlaubt es Ihnen nicht diese Seite zu bearbeiten
 
   # END of Alchemy translation
 
@@ -838,6 +844,8 @@ de:
         name: "Name"
         file_size: "Dateigröße"
         tag_list: Tags
+        url: "URL"
+        download_url: "Download-URL"
 
       alchemy/element:
         display_name: "Name"

data/config/locales/alchemy.en.yml

@@ -160,6 +160,7 @@ en:
         aliases: Please separate additional domains with spaces or new lines.
 
     anchor: 'Anchor'
+    attribute_fixed: Value can't be changed for this page type
     back: 'back'
     create_tree_as_new_language: "Create %{language} as a new language tree"
     locked_pages: "Active pages"
@@ -261,6 +262,7 @@ en:
     show_element: "Show element"
     "Show childpages": "Show childpages"
     "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."
@@ -282,6 +284,7 @@ en:
     "Validation failed": "Validation failed"
     "Version": "Version"
     "View File": "View File"
+    "Attachment Preview": "Attachment Preview"
     "Visit page": "Visit page"
     "Warning!": "Warning!"
     content_definition_missing: "Warning: Content is missing its definition. Please check the elements.yml"
@@ -322,7 +325,7 @@ en:
     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_page: "Do you really want to delete this page? All its elements will get lost!"
+    confirm_to_delete_page: "Do you really want to delete this page? All its elements (even trashed ones) will get lost!"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
     content_validations_headline: "Please check marked fields below"
@@ -509,6 +512,7 @@ en:
     rename_file: "Rename this file."
     rename: "Rename"
     replace: replace
+    replace_file: Replace file
     'Replaced Tag': "Tag '%{old_tag}' was replaced with '%{new_tag}'"
     resources:
       relation_select:
@@ -833,6 +837,8 @@ en:
         name: Name
         file_size: Filesize
         tag_list: Tags
+        url: "URL"
+        download_url: "Download-URL"
 
       alchemy/element:
         display_name: "Name"

data/config/locales/alchemy.es.yml

@@ -160,6 +160,7 @@ es:
         aliases: Por favor separa con espacios o en una nueva línea los dominios adicionales.
 
     anchor: 'Ancla'
+    attribute_fixed: Este atributo no se puede cambiar
     back: 'Atras'
     create_tree_as_new_language: "Crear %{language} como nuevo árbol de idioma"
     locked_pages: "Páginas activas"
@@ -262,6 +263,7 @@ es:
     show_element: "Mostrar elemento"
     "Show childpages": "Mostrar páginas hijas"
     "Show clipboard": "Mostrar portapapeles"
+    "Copied to clipboard": "Copiado al portapapeles"
     "Show picture infos": "Mostrar información de la imagen"
     "Show trash": "Mostrar papelera"
     "Site successfully created": "Sitio web creado correctamente."
@@ -283,6 +285,7 @@ es:
     "Validation failed": "Fallo de validación"
     "Version": "Versión"
     "View File": "Ver archivo"
+    "Attachment Preview": "Vista previa"
     "Visit page": "Visitar página"
     "Warning!": "¡Atención!"
     content_definition_missing: "Atención: Falta la descripción del contenido. Por favor comprueba el archivo elements.yml"
@@ -510,6 +513,7 @@ es:
     rename_file: "Renombrar este archivo."
     rename: "Renombrar"
     replace: Reemplazar
+    replace_file: Reemplazar el archivo
     'Replaced Tag': "La etiqueta '%{old_tag}' fue reemplazada por '%{new_tag}'"
     resources:
       relation_select:
@@ -870,6 +874,8 @@ es:
         name: Nombre
         file_size: Tamaño del archivo
         tag_list: Etiquetas
+        url: "URL"
+        download_url: "URL de descarga"
 
       alchemy/element:
         display_name: "Nombre"

data/config/locales/alchemy.fr.yml

@@ -175,6 +175,7 @@ fr:
         aliases: "S'il vous plaît indiquer Autres domaines séparés par des espaces ou ligne blanche."
 
     anchor: 'ancre'
+    attribute_fixed: La valeur ne peut être modifiée
     back: 'arrière'
     create_tree_as_new_language: "%{language} Création d'un nouvel arbre de la langue"
     "<a href=\"http://get.adobe.com/flashplayer\" target=\"_blank\">%{value}</a>": ""
@@ -529,6 +530,7 @@ fr:
     rename_file: "Renommer un fichier"
     rename: rebaptiser
     replace: remplacer
+    replace_file: Remplacer le fichier
     'Replaced Tag %{old_tag} with %{new_tag}': "Le Tag '%{old_tag}' á été rmplacé par le Tag '%{new_tag}'"
     resources:
       relation_select: