alchemy_cms 2.2.rc13 → 2.2.rc14

data/app/models/alchemy/essence_boolean.rb

@@ -0,0 +1,8 @@
+# Stores boolean values.
+# Provides a checkbox in the editor views.
+module Alchemy
+  class EssenceBoolean < ActiveRecord::Base
+    acts_as_essence :ingredient_column => :value
+    attr_accessible :value
+  end
+end

data/app/models/alchemy/essence_select.rb

@@ -0,0 +1,7 @@
+# Provides a select box that stores string values.
+module Alchemy
+  class EssenceSelect < ActiveRecord::Base
+    acts_as_essence :ingredient_column => :value
+    attr_accessible :value
+  end
+end

data/app/sweepers/alchemy/content_sweeper.rb

@@ -33,12 +33,10 @@ module Alchemy
       end
     end
 
-    # Expires all content editor cache fragments that have a :display_as => :select setting
+    # Expires all EssenceSelect content editor cache fragments.
     def expire_contents_displayed_as_select(page)
       return unless page.urlname_changed? || page.name_changed?
-      Content.essence_texts.all.select { |c| c.settings[:display_as] == 'select'}.each do |content|
-        expire_fragment(content)
-      end
+      Content.essence_selects.each { |content| expire_fragment(content) }
     end
 
   end

data/app/views/alchemy/admin/clipboard/clear.js.erb

@@ -1,6 +1,7 @@
 (function($) {
-  
+
   $("#clipboard_items").replaceWith("<p><%= t('No items in your clipboard') -%></p>");
   $('#clipboard_button .icon.clipboard').removeClass('full');
-  
+  Alchemy.pleaseWaitOverlay(false);
+
 })(jQuery);

data/app/views/alchemy/admin/clipboard/index.html.erb

@@ -8,7 +8,7 @@
   <div id="clipboard_items">
     <ul>
       <%- @clipboard_items.each do |item| -%>
-      <% item_class = item.class.name.demodulize.underscore %>
+      <% item_class = item.class.name.demodulize.underscore.pluralize %>
       <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
         <%= item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text(60) : item.name %>
         <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item_class, :remarkable_id => item.id), :remote => true, :method => :delete, :title => t('Remove item from clipboard')) %></span>
@@ -16,7 +16,7 @@
       <%- end -%>
     </ul>
     <p>
-      <%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path, :class => 'button') %>
+      <%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(:remarkable_type => params[:remarkable_type]), :class => 'button') %>
     </p>
   </div>
   <%- end -%>

data/app/views/alchemy/admin/contents/create.js.erb

@@ -16,6 +16,8 @@
       :locals => @locals
     )
   ) -%>');
+  Alchemy.enableButton('.disabled.button');
+  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
 
   <% end -%>
 

data/app/views/alchemy/admin/contents/destroy.js.coffee

@@ -0,0 +1,4 @@
+$('#<%= content_dom_id(@content_dup) %>').remove()
+Alchemy.growl '<%= escape_javascript(@notice) %>'
+Alchemy.reloadPreview()
+Alchemy.pleaseWaitOverlay false

data/app/views/alchemy/admin/contents/new.html.erb

@@ -8,7 +8,7 @@
         <%= hidden_field_tag('options', @options) %>
       </td>
       <td class="submit">
-        <%= f.button t('save'), :class => 'button' %>
+        <%= f.button t(:create), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/elements/_element_foot.html.erb

@@ -1,3 +1,4 @@
+<% remarkable_type = element.class.name.demodulize.underscore.pluralize %>
 <div class="element_foot">
   <span class="element_tools">
     <%= link_to(
@@ -10,7 +11,7 @@
     ) -%>
     <%= link_to(
       "",
-      alchemy.insert_admin_clipboard_path(:remarkable_type => element.class.name.demodulize.underscore, :remarkable_id => element.id, :remove => true),
+      alchemy.insert_admin_clipboard_path(:remarkable_type => remarkable_type, :remarkable_id => element.id, :remove => true),
       :remote => true,
       :method => :post,
       :class => "element_move_button",
@@ -18,7 +19,7 @@
     ) %>
     <%= link_to(
       "",
-      alchemy.insert_admin_clipboard_path(:remarkable_type => element.class.name.demodulize.underscore, :remarkable_id => element.id),
+      alchemy.insert_admin_clipboard_path(:remarkable_type => remarkable_type, :remarkable_id => element.id),
       :remote => true,
       :method => :post,
       :class => "element_copy_button",

data/app/views/alchemy/admin/elements/create.js.coffee

@@ -0,0 +1,31 @@
+<% if @cutted_element_id %>
+$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove()
+<% end %>
+
+<% if @page.can_have_cells? %>
+Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>')
+<% end %>
+
+$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>')
+$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh')
+Alchemy.growl('<%= t("successfully_added_element") -%>')
+Alchemy.closeCurrentWindow()
+
+<% @element.rtf_contents.each do |content| %>
+Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>')
+<% end %>
+
+Alchemy.PreviewWindow.refresh()
+Alchemy.ElementEditorSelector.init()
+
+$el = $('#element_<%= @element.id -%>')
+$el.trigger('Alchemy.SelectElementEditor')
+Alchemy.ElementDirtyObserver($el)
+Alchemy.SelectBox('select', $el)
+Alchemy.ButtonObserver('button.button', $el)
+Alchemy.Datepicker('input[type="date"]', $el)
+Alchemy.overlayObserver($el)
+
+<% if @clipboard.blank? %>
+$('#clipboard_button .icon.clipboard').removeClass('full')
+<% end %>

data/app/views/alchemy/admin/elements/fold.js.coffee

@@ -0,0 +1,37 @@
+$el = $('.element_editor[data-element-id="<%= @element.id %>"]')
+
+<% if @error %>
+
+$("#element_<%= @element.id -%>_folder_spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>")
+
+<% else %>
+
+$el = $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>')
+$('#element_area .sortable_cell').sortable('refresh')
+Alchemy.ElementEditorSelector.reinit('.element_editor[data-element-id="<%= @element.id %>"]')
+
+<% if @element.folded %>
+
+<% @element.rtf_contents.each do |content| %>
+rtf_<%= content.id -%> = tinymce.get '<%= content.form_field_id -%>'
+rtf_<%= content.id -%>.remove() if rtf_<%= content.id %>
+`delete rtf_<%= content.id -%>`
+<%- end %>
+
+<%- else %>
+
+$el.trigger('Alchemy.SelectElementEditor')
+Alchemy.SelectBox('select', $el)
+
+<% @element.rtf_contents.each do |content| %>
+Alchemy.Tinymce.addEditor '<%= content.form_field_id -%>'
+<% end %>
+
+Alchemy.ElementDirtyObserver $el
+Alchemy.Datepicker('input[type="date"]', $el)
+Alchemy.ButtonObserver('button.button', $el)
+Alchemy.overlayObserver "#element_<%= @element.id -%>"
+
+<% end %>
+
+<% end %>

data/app/views/alchemy/admin/essence_pictures/assign.js.coffee

@@ -0,0 +1,15 @@
+$('#picture_to_assign_<%= @picture.id %> a').attr('href', '#').off 'click'
+$('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
+  render(
+    :partial => "alchemy/essences/essence_picture_editor",
+    :locals => {:content => @content, :options => @options}
+  )
+) -%>')
+
+<% if @content.siblings.essence_pictures.count > 1 %>
+Alchemy.SortableContents '#<%= @content.element.id -%>_contents', '<%= form_authenticity_token -%>'
+<% end %>
+
+Alchemy.closeCurrentWindow()
+Alchemy.setElementDirty '#element_<%= @content.element.id -%>'
+Alchemy.overlayObserver '#<%= content_dom_id(@content) %>'

data/app/views/alchemy/admin/essence_pictures/destroy.js.coffee

@@ -0,0 +1,19 @@
+$('#essence_picture_<%= @content_id -%>').remove()
+
+<% if max_image_count.present? && @essence_pictures.length < max_image_count.to_i %>
+$picture_editor = $('#element_<%= @element.id -%>_contents')
+if $('div.add_content', $picture_editor).length == 0
+  $('#element_<%= @element.id -%>_contents').append('<%= escape_javascript(
+    render(
+      :partial => "alchemy/admin/elements/add_content",
+      :locals => {
+        :element => @element,
+        :options => @options
+      }
+    )
+  ) %>')
+<% end %>
+
+Alchemy.SortableContents '#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>'
+Alchemy.reloadPreview()
+Alchemy.pleaseWaitOverlay(false)

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -47,7 +47,12 @@
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]], :class => 'alchemy_selectbox' %>
+        <%= f.select(
+          "css_class",
+          [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]],
+          {},
+          {:class => 'alchemy_selectbox'}
+        ) %>
       </td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
@@ -55,7 +60,12 @@
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select("css_class", options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class), :class => 'alchemy_selectbox') %>
+        <%= f.select(
+          "css_class",
+          options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class),
+          {},
+          {:class => 'alchemy_selectbox'}
+        ) %>
       </td>
     </tr>
     <%- elsif @options[:css_classes] && !@options[:css_classes].is_a?(HashWithIndifferentAccess) -%>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -22,7 +22,7 @@
         <%= link_to(
           render_icon("copy_page"),
           alchemy.insert_admin_clipboard_path(
-            :remarkable_type => layoutpage.class.name.demodulize.underscore,
+            :remarkable_type => layoutpage.class.name.demodulize.underscore.pluralize,
             :remarkable_id => layoutpage.id
           ),
           :remote => true,

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -43,7 +43,7 @@
         <%= link_to(
           render_icon("copy_page"),
           alchemy.insert_admin_clipboard_path(
-            :remarkable_type => page.class.name.demodulize.underscore,
+            :remarkable_type => page.class.name.demodulize.underscore.pluralize,
             :remarkable_id => page.id
           ),
           :remote => true,

data/app/views/alchemy/admin/pages/destroy.js.coffee

@@ -0,0 +1,19 @@
+$('#locked_page_<%= @page_id -%>').remove()
+
+<% if @layoutpage %>
+
+window.location.replace '<%= alchemy.admin_layoutpages_path -%>'
+
+<% elsif @page_root %>
+
+$('#sitemap').replaceWith '<%= escape_javascript(render(:partial => "sitemap")) -%>'
+Alchemy.growl '<%= @message -%>'
+Alchemy.Tooltips()^
+
+<% else %>
+
+window.location.replace '<%= alchemy.admin_pages_path -%>'
+
+<% end %>
+
+Alchemy.pleaseWaitOverlay false

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -112,8 +112,8 @@
             Alchemy.openWindow(
               '<%= alchemy.new_admin_element_path(:page_id => @page.id) -%>',
               '<%= t("New Element") -%>',
-              '320',
-              '120',
+              320,
+              120,
               false,
               true,
               true
@@ -129,8 +129,8 @@
             Alchemy.openWindow(
               '<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") -%>',
               '<%= t("Clipboard") -%>',
-              '380',
-              '270',
+              380,
+              270,
               false,
               true,
               true
@@ -154,7 +154,7 @@
       Alchemy.Tinymce.init(function() {
         Alchemy.ElementDirtyObserver('#element_area');
       });
-      if (Alchemy.Tinymce.customInits.length > 0) {
+      if (Alchemy.Tinymce.customInits) {
         for (var i = Alchemy.Tinymce.customInits.length - 1; i >= 0; i--) {
           Alchemy.Tinymce.customInits[i].call();
         }

data/app/views/alchemy/admin/pages/update.js.coffee

@@ -0,0 +1,36 @@
+Alchemy.closeCurrentWindow()
+
+<% if @while_page_edit %>
+
+Alchemy.reloadPreview()
+$('#page_<%= @page.id %>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>')
+
+<% else %>
+$page = $('#page_<%= @page.id %>')
+$('.sitemap_page > .sitemap_sitename .sitemap_pagename_link', $page).html('<%= @page.name -%>')
+
+<% if @page.locked? && @page.locker == current_user %>
+
+$('#locked_page_<%= @page.id %> > a').html('<%= @page.name -%>')
+
+<% end %>
+
+$('#page_<%= @page.id %>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>')
+
+<% if @page.restricted? %>
+
+$('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted')
+
+<% elsif @page.redirects_to_external? %>
+
+$('span.redirect_url', $page).html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>')
+
+<% else %>
+
+$('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted')
+
+<% end %>
+
+<% end %>
+
+Alchemy.growl("<%= @notice -%>")

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -13,7 +13,18 @@
       <td class="input"><%= f.send :text_area, attribute[:name] -%></td>
       <%- else -%>
       <td class="label"><%= f.send :label, attribute[:name] %></td>
-      <td class="input"><%= f.send :text_field, attribute[:name], :class => 'thin_border' -%></td>
+
+      <% attr_array = attribute[:name].split('.') %>
+      <% if attr_array.length > 1 %>
+        <td class="select">
+        <%= f.send :select, "#{attr_array[0]}_id", attr_array[0].classify.constantize.all.collect {|r| [r.send(attr_array[1]), r.id] }, {:prompt => t("Please choose")}, {:class => "alchemy_selectbox"} %>
+      </td>
+      <% else %>
+        <td class="input">
+        <%= f.send :text_field, attribute[:name], :class => 'thin_border' -%>
+      </td>
+      <% end %>
+
       <%- end -%>
     </tr>
     <%- end -%>

data/app/views/alchemy/admin/resources/_resource.html.erb

@@ -2,13 +2,16 @@
   <%- resource_handler.attributes.each do |attribute| -%>
   <%- if attribute[:type] == :boolean -%>
   <td class="center">
-    <% attr_value = resource.send(attribute[:name]) %>
+    <% attr_value = render_attribute(resource, attribute[:name]) %>
     <%= attr_value.blank? ? '' : render_icon(attr_value) -%>
   </td>
   <%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
-  <td class="right"><%= resource.send(attribute[:name]) -%></td>
+
+  <td class="right"><%= render_attribute(resource, attribute[:name]) -%></td>
   <%- else -%>
-  <td><%= resource.send(attribute[:name]) -%></td>
+  <td>
+    <%= render_attribute(resource, attribute[:name]) %>
+  </td>
   <%- end -%>
   <%- end -%>
   <td class="tools">

data/app/views/alchemy/admin/resources/_table.html.erb

@@ -9,7 +9,7 @@
     <%- else -%>
     <th>
     <%- end -%>
-      <%= resource_handler.model.human_attribute_name(attribute[:name]) %>
+    <%= resource_handler.model.human_attribute_name(attribute[:name]) %>
     </th>
     <%- end -%>
     <th class="tools"></th>

data/app/views/alchemy/admin/trash/clear.js.coffee

@@ -0,0 +1,4 @@
+Alchemy.growl '<%= t("Cleared trash") %>'
+Alchemy.refreshTrashWindow <%= @page.id %>
+jQuery('#element_trash_button .icon').removeClass 'full'
+Alchemy.pleaseWaitOverlay false

data/app/views/alchemy/admin/trash/index.html.erb

@@ -11,12 +11,12 @@
   </div>
   <div id="trash_items">
     <%- @elements.each do |element| -%>
-    <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil?} %>
+    <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil? } %>
     <%- end -%>
-    <p>
-      <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
-    </p>
   </div>
+  <p>
+    <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
+  </p>
   <%- end -%>
 </div>
 <script type="text/javascript" charset="utf-8">

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

@@ -1,4 +1,6 @@
 <%= render_essence_editor_by_name(element, 'intro') %>
-<%= render_essence_editor_by_name(element, 'headline') %>
 <%= render_picture_editor(element, :maximum_amount_of_images => 1, :image_size => "450x300", :crop => true, :image_float_selector => true, :fixed_ratio => false) %>
-<%= render_essence_editor_by_name(element, 'text') %>
+<% element.contents.where(:name => ['headline', 'text']).each do |content| %>
+  <%= render_essence_editor content %>
+<% end %>
+<%= render_new_content_link(element) %>

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

@@ -5,12 +5,10 @@
     <%= intro %>
   </div>
   <%- end -%>
-  <%- headline = render_essence_view_by_name(element, 'headline') -%>
-  <%- if !headline.blank? -%>
-  <h1 class="headline">
-    <%= headline %>
-  </h1>
-  <%- end -%>
+  <% element.contents.where(:name => 'headline').each do |content| %>
+  <% next if content.ingredient.blank? %>
+  <h1 class="headline"><%= render_essence content %></h1>
+  <% end %>
   <div class="text_bild_container">
     <%- content = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
     <%- if content -%>
@@ -18,8 +16,10 @@
       <%= render_essence_view(content, :image_size => "450x1000", :crop => true) %>
     </div>
     <%- end -%>
+    <% element.contents.where(:name => 'text').each do |content| %>
     <div class="text">
-      <%= render_essence_view_by_name(element, 'text') %>
+      <%= render_essence content %>
     </div>
+    <% end %>
   </div>
 </div>