alchemy_cms 2.2.rc13 → 2.2.rc14

data/app/views/alchemy/elements/_download_editor.html.erb

@@ -1 +1,4 @@
-<%= render_essence_editor_by_name(element, 'file') %>
+<% element.contents.each do |content| %>
+  <%= render_essence_editor(content) %>
+<% end %>
+<%= render_create_content_link(element, 'file') %>

data/app/views/alchemy/elements/_download_view.html.erb

@@ -1,3 +1,7 @@
-<div class="download" <%= element_preview_code(element) -%>>
-  <%= render_essence_view_by_name(element, 'file') %>
-</div>
+<div class="downloads" <%= element_preview_code(element) %>>
+  <% element.contents.each do |content| %>
+  <div class="download">
+    <%= render_essence(content) %>
+  </div>
+  <% end %>
+</div>

data/app/views/alchemy/elements/_image_mosaic_editor.html.erb

@@ -1,2 +1,3 @@
 <%= render_picture_editor(element, :image_size => '300x200', :crop => true) %>
 <%= render_essence_editor_by_name(element, 'caption') %>
+<%= render_essence_editor_by_name(element, 'show_caption', :default_value => true) %>

data/app/views/alchemy/elements/_image_mosaic_view.html.erb

@@ -1,12 +1,14 @@
 <div class="image_mosaic" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
-    <div class="image_mosaic_images">
-    <%- element.contents.find_all_by_essence_type("Alchemy::EssencePicture").each do |essence| -%>
-        <div class="image_mosaic_image">
-            <%= render_essence_view(essence, :image_size => '300x200', :crop => true) %>
-        </div>
-    <%- end -%>
-    </div>
-    <div class="caption">
-        <%= render_essence_view_by_name(element, 'caption') %>
+  <div class="image_mosaic_images">
+  <%- element.contents.find_all_by_essence_type("Alchemy::EssencePicture").each do |essence| -%>
+    <div class="image_mosaic_image">
+      <%= render_essence_view(essence, :image_size => '300x200', :crop => true) %>
     </div>
+  <%- end -%>
+  </div>
+  <% if element.ingredient(:show_caption) %>
+  <div class="caption">
+    <%= render_essence_view_by_name(element, 'caption') %>
+  </div>
+  <% end %>
 </div>

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

@@ -0,0 +1,14 @@
+<% cache(content) do %>
+  <div class="content_editor essence_boolean" id="<%= content_dom_id(content) %>">
+    <%= check_box_tag(content.form_field_name, 1,
+      !content.ingredient.nil? ? content.ingredient : options[:default_value],
+      :onclick => "Alchemy.handleEssenceCheckbox(this)",
+      :class => html_options[:class],
+      :style => html_options[:style]
+    ) %>
+    <label for="<%= content.form_field_id %>" style="display: inline">
+      <%= render_content_name(content) %>
+      <%= delete_content_link(content) %>
+    </label>
+  </div>
+<% end %>

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

@@ -0,0 +1 @@
+<%= t(content.ingredient) %>

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

@@ -1,5 +1,5 @@
 <div class="content_editor essence_date" id="<%= content_dom_id(content) %>">
-  <label><%= render_content_name(content) %></label>
+  <%= label_and_remove_link(content) %>
   <%= alchemy_datepicker(
     content.essence, :date, {
       :name => content.form_field_name,

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

@@ -1,6 +1,7 @@
 <div class="content_editor" id="<%= content_dom_id(content) %>">
   <label style="display: inline">
     <%= render_content_name(content) %>
+    <%= delete_content_link(content) %>
   </label>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">

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

@@ -1,5 +1,5 @@
 <div class="content_editor content_text_editor"<%= " style=\"float: left;\"" if options[:css_class] == "text_short" %>>
-  <label><%= render_content_name(content) %></label>
+  <%= label_and_remove_link(content) %>
   <%= text_field_tag(
     content.form_field_name,
     content.ingredient,

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

@@ -1,6 +1,6 @@
 <% cache(content) do -%>
 <div class="content_editor content_rtf_editor" id="<%= content_dom_id(content) %>">
-  <label><%= render_content_name(content) %></label>
+  <%= label_and_remove_link(content) %>
   <div style="position: relative">
     <% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>
     <div class="essence_richtext_loader">

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

@@ -0,0 +1,35 @@
+<% cache(content) do %>
+  <div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
+
+  <%= label_and_remove_link(content) %>
+
+  <% if options[:select_values].nil? %>
+
+    <%= warning('options[:select_values] is nil', "No select values given. Please provide :select_values as argument to render_essence_editor_by_name() helper inside this element editor view.") %>
+
+  <% else %>
+
+    <%
+    if options[:select_values].is_a?(Hash)
+      options_method = grouped_options_for_select(
+        options[:select_values],
+        content.ingredient,
+        ''
+      )
+    else
+      options_method = options_for_select(
+        options[:select_values],
+        content.ingredient
+      )
+    end
+    %>
+
+    <%= select_tag(content.form_field_name, options_method, {
+      :class => ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
+      :style => html_options[:style]
+    }) %>
+
+  <% end %>
+
+  </div>
+<% end %>

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

@@ -0,0 +1 @@
+<%= content.ingredient %>

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

@@ -1,88 +1,40 @@
-<%- cache(content) do -%>
-<div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
+<% cache(content) do %>
+  <div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
 
-  <%- if content.settings[:display_as] == "checkbox" -%>
+    <% if content.settings[:display_as].present? %>
 
-  <%= check_box_tag(
-    content.form_field_name,
-    "1",
-    content.ingredient == "1",
-    :onclick => "Alchemy.handleEssenceCheckbox(this)",
-    :class => html_options[:class],
-    :style => html_options[:style]
-  ) %>
-  <label for="<%= content.form_field_id %>" style="display: inline">
-    <%= render_content_name(content) %>
-  </label>
+      <%= warning 'The display_as setting is deprecated! Please run rake alchemy:upgrade', 'You are using the display_as setting in your elements.yml. Please run rake alchemy:upgrade' %>
 
-  <%- elsif content.settings[:display_as] == "select" -%>
+    <% else %>
 
-  <label><%= render_content_name(content) %></label>
+      <%= label_and_remove_link(content) %>
 
-  <%- if options[:select_values].nil? -%>
-  <%= warning('options[:select_values] is nil', "No select values given. Please provide :select_values as argument to render_essence_editor_by_name() helper inside this element editor view.") %>
-  <%- else -%>
-  <%- if options[:select_values].is_a?(Hash)
-    options_method = grouped_options_for_select(
-      options[:select_values],
-      content.ingredient,
-      ''
-    )
-    else
-      options_method = options_for_select(
-        options[:select_values],
-        content.ingredient
-      )
-    end
-  %>
-  <%= select_tag(
-    content.form_field_name,
-    options_method,
-    {
-      :class => ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
-      :style => html_options[:style]
-    }
-  ) %>
-  <%- end -%>
+      <%= 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]
+      ) %>
 
-  <%- else -%>
+      <% if content.settings[:linkable] %>
 
-  <label>
-    <%= render_content_name(content) %>
-    <%= link_to_confirmation_window(
-      render_icon('delete-small'),
-      t('Do you really want to delete this content?'),
-      alchemy.admin_content_path(content),
-      :class => 'icon_button small',
-      :title => t('Remove this content')
-    ) if content.settings[:deletable] %>
-  </label>
-  <%= 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]
-  ) %>
+        <%= 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 %>
 
-  <%- if content.settings[:linkable] -%>
+        <span class="linkable_text_essence_tools">
+          <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
+            <span class="icon link"></span>
+          </a>
+          <a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
+            <span class="icon unlink"></span>
+          </a>
+        </span>
 
-  <%= 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 %>
+      <% end %>
 
-  <span class="linkable_text_essence_tools">
-    <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
-      <span class="icon link"></span>
-    </a>
-    <a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
-      <span class="icon unlink"></span>
-    </a>
-  </span>
+    <% end %>
 
-  <%- end -%>
-
-  <%- end -%>
-
-</div>
-<%- end -%>
+  </div>
+<% end %>

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

@@ -1,8 +1,8 @@
 <%- if content.essence.link.blank? || options[:disable_link] -%>
-<%= h(content.essence.body) -%>
+<%= content.ingredient -%>
 <%- else -%>
 <%= link_to(
-  h(content.essence.body),
+  content.ingredient,
   url_for(content.essence.link),
   :title => content.essence.link_title,
   :target => (content.essence.link_target == "blank" ? "_blank" : nil),

data/config/alchemy/elements.yml

@@ -1,12 +1,12 @@
 # == In this configuration you setup Alchemy´s element layouts.
-# 
+#
 # Use rails generate alchemy:scaffold to generate this file for your app.
-# 
+#
 # Elements containing all necessary basic tools for displaying and editing content inside Alchemy.
 # They consists of composed contents (different essence-types) as shown in the illustration of an elements-sheme below.
 #
 # == Schema of an element
-# 
+#
 #   =================================
 #   #  Content 1 (EssenceText)      #
 #   #                               #
@@ -16,7 +16,7 @@
 #   =================================
 #
 # == Example of a basic element layout
-# 
+#
 #   - name: a_unique_name (Used for the partial name in +app/views/elements+ and translated as Element.display_name)
 #     unique: Bool //pass true if this element only can be displayed once on page
 #     contents:
@@ -26,55 +26,61 @@
 #       type: EssenceRichtext
 #
 # As already mentioned above, there are different content-types wich can be defined for each content in an element.
+#
 # Defining these types is used to render predefined views in the element.
 #
 # == Content-Types:
 #
 # * EssenceText               (Used to store a String (max. 255 Chars.) i.e. a headline, or productname. The editor is renderd as a single-lined input field. The view output will be sanitized and escaped. So it's XSS save.)
 # * EssenceRichtext           (Used to store editable richtext. Editor is rendered as a textarea with TinyMCE Editor.)
-# * EssencePicture            (Used to store picture ids from pictures assigned through the library. The editor is rendered as a picture-editor collection with a lot of options (i.e. image cropper). The view renders the assigned picture, resizes it, crops it and caches the result.)
-# * EssenceFlash              (Used to store attachment ids from attachments assigned through the library. The view renders an embeded object.)
+# * EssencePicture            (Used to store pictures assigned through the library. The editor view provides a lot of options (i.e. image cropper). The view renders the assigned picture, resizes it, crops it and caches the result.)
+# * EssenceFile               (Used to store attachments assigned through the library. The view renders download link.)
+# * EssenceAudio              (Used to store attachments assigned through the library. The view renders an flash audio player.)
+# * EssenceVideo              (Used to store attachments assigned through the library. The view renders an flash video player.)
+# * EssenceFlash              (Used to store attachments assigned through the library. The view renders the embeded flash object.)
 # * EssenceDate               (Used to store a DateTime object. The view output is passed through Rails I18n Library, so it will be fully localized.)
-# * EssenceHtml               (Used to store a String (max. 255 Chars.). The view output renders the raw, not sanitized or unescaped String. So be carefull!)
-# 
+# * EssenceHtml               (Used to store HTML code. The view output renders the raw, not sanitized or unescaped String. So be careful!)
+# * EssenceSelect             (Used to store a String (max. 255 Chars.) value. The editor view is displayed as a select box)
+# * EssenceBoolean            (Used to store a Boolean (true or false) value. The editor view is displayed as a check box)
+#
 # After finishing the setup of your element layouts, you need to generate the files for the elements before using them in Alchemy.
+#
 # For creating these files, use the following command in your terminal:
 #
+#   rails g alchemy:elements
+#
+# or:
 #
-# 
-#   rails generate alchemy:elements 
+#   rails g alchemy:elements --skip
 #
+# to skip existing elements
 #
-#   or: 
-#  
-#   rails g alchemy:elements --skip 
 #
-#  
-#   to skip existing elements
-# 
+# All new elements will be created as two different partials in +Rails.root/app/views/elements+.
 #
-# All new elements will be created as two different partials in Rails.root/app/views/elements.
 # For each element there is an editor-view wich will be rendered when editing them in Alchemy and another view for the website´s frontend.
-# 
+#
 #   app/views/elements/_elements_name_editor.html.erb
 #   app/views/elements/_elements_name_view.html.erb
-# 
+#
 # For most contents in an element you can specify additional options, so they get rendered in a specific way.
 # These options can be defined as symbols, but its too much to list them up here.
 # You can find these options described in the application_helper.rb, most of them at the render_essence method.
 #
 # == Setting a content as preview-text for the element
-# 
-# You can set a content-essence as preview-text for its element like this
-# take_me_for_preview: true
 #
+# You can set a content-essence as preview-text for its element like this:
+#
+#   take_me_for_preview: true
 #
 # == Adding contents dynamically in the frontend
-# 
+#
 # You are able to add content-essences dynamically to the element from the Alchemy frontend.
+#
 # You just have to make contents available for adding them.
-# This example enables this feature
-# 
+#
+# === Example:
+#
 #   - name: headline
 #     unique: false
 #     contents:
@@ -86,24 +92,32 @@
 #     - name: big_text
 #       type: EssenceRichtext
 #
-# Now an Alchemy user can add the content 'big_text' from the element as much as desired.
+# And add a +<%= render_create_content_link(element, 'big_text') %>+ helper to your element editor partial.
+#
+# Now an Alchemy user can add as many additional +big_text+ contents as s/he wants.
+#
+# If you have more then one additional content defined you should use the:
+#
+#   <%= render_new_content_link(element) %>
+#
+# helper. This opens an overlay from where the user can choose which content to add.
 #
 # === Translate element names
-# 
-# Element names are passed through the I18n library. So you can translate them in your config/locales language yml file.
-# 
-# Example:
-#   
+#
+# Element names are passed through the +I18n+ library. So you can translate them in your config/locales language yml file.
+#
+# === Example:
+#
 #   de:
 #     alchemy:
 #       element_names:
 #         contact: Kontakt
 #         search: Suche
-# 
+#
 # == Validations:
-#   
+#
 #   You can validate the presence of a content. Just pass validate and one of the supported vaidatiosn methods to your content definition:
-#     
+#
 #     - name: article
 #       display_name: Standard-Artikel
 #       contents:
@@ -111,23 +125,32 @@
 #         type: EssenceText
 #         validate:
 #           - presence
-#     
+#
 # Now the user has to enter a value inside of the intro EssenceText textfield to save the element.
 # Currently supported validations are:
-# 
+#
 #    * presence
 #    * uniqueness
-# 
+#
 - name: article
   contents:
   - name: intro
     type: EssenceText
   - name: headline
     type: EssenceText
+    settings:
+      deletable: true
   - name: image
     type: EssencePicture
   - name: text
     type: EssenceRichtext
+    settings:
+      deletable: true
+  available_contents:
+  - name: text
+    type: EssenceRichtext
+  - name: headline
+    type: EssenceText
 
 - name: intro_image_text
   unique: true
@@ -138,19 +161,19 @@
     type: EssencePicture
   - name: text
     type: EssenceRichtext
-  
+
 - name: text
   contents:
   - name: text
     type: EssenceRichtext
 
 - name: bild
-  contents: 
+  contents:
   - name: image
     type: EssencePicture
 
 - name: bild_text
-  contents: 
+  contents:
   - name: image
     type: EssencePicture
   - name: text
@@ -162,11 +185,13 @@
     type: EssenceText
 
 - name: image_mosaic
-  contents: 
+  contents:
   - name: image
     type: EssencePicture
   - name: caption
     type: EssenceText
+  - name: show_caption
+    type: EssenceBoolean
 
 - name: footnote
   unique: true
@@ -206,6 +231,11 @@
   contents:
   - name: file
     type: EssenceFile
+    settings:
+      deletable: true
+  available_contents:
+  - name: file
+    type: EssenceFile
 
 - name: news
   contents:
@@ -238,8 +268,6 @@
     validate:
       - presence
   - name: success_page
-    type: EssenceText
-    settings:
-      display_as: select
+    type: EssenceSelect
     validate:
       - presence