alchemy_cms 2.2.4 → 2.3.rc5

data/app/views/alchemy/admin/elements/{_add_content.html.erb → _add_picture.html.erb}

@@ -1,13 +1,13 @@
-<div class="add_content" id="add_content_<%= element.id %>">
+<div class="add_picture" id="add_picture_<%= element.id %>">
   <%= link_to_overlay_window(
-    render_icon('assign'),
+    render_icon('add'),
     alchemy.admin_pictures_path(
       :element_id => element,
       :options => options
     ),
     {
-      :title => t('assign_image'),
-      :size => '720x580',
+      :title => t('add_image_to_element'),
+      :size => '780x580',
       :resizable => true
     }
   ) %>

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

@@ -4,5 +4,6 @@
   :prompt => t("choose_element_to_link"),
   :class => "elements_from_page_selector alchemy_selectbox",
   :onchange => "jQuery('#page_anchor').val(value)",
-  :title => t("choose_element_as_target")
+  :title => t("choose_element_as_target"),
+  :autofocus => true
 ) %>

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

@@ -17,7 +17,7 @@
             'name',
             @page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
             { :prompt => t('select_element') },
-            { :class => "alchemy_selectbox" }
+            { :class => "alchemy_selectbox", :autofocus => true }
           ) -%>
         </td>
       </tr>

data/app/views/alchemy/admin/elements/{_picture_editor.html.erb → _picture_gallery_editor.html.erb}

@@ -1,27 +1,23 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
-<div class="content_editor">
+<div class="content_editor picture_gallery_editor">
   <label><%= t("picture_gallery_editor.#{element.name}", :default => t('picture_gallery_editor')) %></label>
   <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
-    <%- picture_contents.each do |picture_content| -%>
-      <%= render_essence_editor(picture_content, {
-        :dragable => (picture_contents.size > 1)
-      }.merge(options)) %>
+    <%- pictures.each do |picture| -%>
+      <%= render_essence_editor(picture, {:dragable => (pictures.size > 1)}.merge(options)) %>
     <%- end -%>
-    <%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
+    <%- if max_image_count.blank? || pictures.length < max_image_count.to_i -%>
       <%= render(
-        :partial => 'alchemy/admin/elements/add_content',
+        :partial => 'alchemy/admin/elements/add_picture',
         :locals => {
           :element => element,
-          :essence_type => "Alchemy::EssencePicture",
-          :link_text => t("add_image_to_element"),
           :options => options,
-          :dragable => (picture_contents.size > 1)
+          :dragable => (pictures.size > 1)
         }
       ) %>
     <%- end -%>
   </div>
 </div>
-<%- if picture_contents.size > 1 -%>
+<%- if pictures.size > 1 -%>
 <script type="text/javascript" charset="utf-8">
   Alchemy.SortableContents('#element_<%= element.id %>_contents', '<%= form_authenticity_token %>');
 </script>

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

@@ -0,0 +1,46 @@
+(function($) {
+
+  var $el = $('.element_editor[data-element-id="<%= @element.id %>"]');
+
+  function removeTinyMCEs(ids) {
+    for (var i = ids.length - 1; i >= 0; i--) {
+      tinymce.get(ids[i]).remove();
+    };
+  }
+
+  <% if @error %>
+
+    $("#element_<%= @element.id -%>_folder_spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
+
+  <% else %>
+
+    $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
+    $el = $('#element_<%= @element.id %>');
+    $('#element_area .sortable_cell').sortable('refresh');
+    Alchemy.ElementEditorSelector.reinit($el);
+
+    <% if @element.folded %>
+
+      <% if @element.rtf_contents.any? %>
+        removeTinyMCEs(<%=raw @element.rtf_contents.collect(&:form_field_id).to_json %>);
+      <% end %>
+
+    <% else %>
+
+      $el.trigger('Alchemy.SelectElementEditor');
+      Alchemy.SelectBox($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 %>
+
+})(jQuery);

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

@@ -1,28 +1,28 @@
 <div id="element_area">
-  <% if @cells.any? -%>
-  <div id="cells">
-    <ul>
+  <% if @cells.any? %>
+    <div id="cells">
+      <ul>
+        <li><a href="#cell_for_other_elements"><%= t(:main_content) %></a></li>
+        <% @elements.each do |cell, elements| %>
+          <li>
+            <a href="#cell_<%= cell.name %>">
+              <%= t(cell.name, :scope => :cell_names) %>
+            </a>
+          </li>
+        <% end %>
+      </ul>
+      <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
+        <%= render :partial => 'alchemy/admin/elements/element', :collection => @page.elements.not_trashed.not_in_cell, :locals => {:draggable => true} %>
+      </div>
       <% @elements.each do |cell, elements| -%>
-      <% if elements.any? -%>
-      <li>
-        <a href="#cell_<%= cell.name -%>">
-          <%= cell.name == 'for_other_elements' ? t(:main_content) : t(cell.name, :scope => :cell_names) -%>
-        </a>
-      </li>
-      <% end -%>
-      <% end -%>
-    </ul>
-    <% @elements.each do |cell, elements| -%>
-    <% if elements.any? -%>
-    <div id="cell_<%= cell.name %>" class="sortable_cell <%= cell.name %>_cell" data-cell-id="<%= cell.id %>">
-      <%= render :partial => 'alchemy/admin/elements/element', :collection => elements, :locals => {:draggable => true} %>
+        <div id="cell_<%= cell.name %>" class="sortable_cell <%= cell.name %>_cell" data-cell-id="<%= cell.id %>">
+          <%= render :partial => 'alchemy/admin/elements/element', :collection => elements, :locals => {:draggable => true} %>
+        </div>
+      <% end %>
     </div>
-    <% end -%>
-    <% end -%>
-  </div>
-  <% else -%>
-  <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements">
-    <%= render :partial => 'alchemy/admin/elements/element', :collection => @elements, :locals => {:draggable => true} %>
-  </div>
-  <% end -%>
+  <% else %>
+    <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements">
+      <%= render :partial => 'alchemy/admin/elements/element', :collection => @elements, :locals => {:draggable => true} %>
+    </div>
+  <% end %>
 </div>

data/app/views/alchemy/admin/elements/list.js.erb

@@ -1,20 +1,22 @@
 (function($) {
 
-  $('#elements_for_page_<%= @page_id -%>').html('<%= escape_javascript(
-    render("elements_select")
-  ) %>');
-  $('#elements_for_page_<%= @page_id -%>')
-    .append('<a class=\"close_elements_from_page_selector\" title=\"<%= t("remove") -%>\">–</a>')
-    .click(function(){
-      Alchemy.LinkOverlay.hideElementsSelect(<%= @page_id -%>);
-    });
+  var close = $('<a class="close_elements_from_page_selector" title="<%= t(:remove) -%>">–</a>');
+  $('#elements_for_page_<%= @page_id -%>').html('<%= escape_javascript(render("elements_select")) %>');
+  $('#elements_for_page_<%= @page_id -%>').append(close);
+
+  close.on('click', function() {
+    Alchemy.LinkOverlay.hideElementsSelect(<%= @page_id -%>);
+  });
+
   <%- unless @elements.first.blank? -%>
   $('#page_anchor').val('#<%= @elements.first.dom_id -%>');
   <%- end -%>
+
   <%- if params[:internal_anchor] -%>
   $('select.elements_from_page_selector').val('#<%= params[:internal_anchor] -%>');
   $('#page_anchor').val('#<%= params[:internal_anchor] -%>');
   <%- end -%>
-  Alchemy.SelectBox('#alchemyLinkOverlay select.elements_from_page_selector');
+
+  Alchemy.SelectBox('#alchemyLinkOverlay');
 
 })(jQuery);

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -1,8 +1,10 @@
 (function($) {
 
+  var $el = $('#element_<%= @content.element.id %>');
   $('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "alchemy/essences/essence_file_editor", :formats => [:html], :locals => {:content => @content, :options => @options})) %>');
   Alchemy.closeCurrentWindow();
   Alchemy.reloadPreview();
-  Alchemy.setElementDirty('#element_<%= @content.element.id %>');
+  Alchemy.setElementDirty($el);
+  Alchemy.overlayObserver($el);
 
 })(jQuery);

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

@@ -0,0 +1,28 @@
+(function() {
+  var $picture_editor;
+
+  $('#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_picture', $picture_editor).length === 0) {
+      $('#element_<%= @element.id -%>_contents').append('<%= escape_javascript(
+        render(
+          :partial => "alchemy/admin/elements/add_picture",
+          :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/pages/_contactform_links.html.erb

@@ -50,11 +50,13 @@
         <%= text_field_tag "contactform_link_title", {}, :class => 'thin_border auto_resize link_title' %>
       </td>
     </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= link_to(t(:apply), '#', {
+          :onclick => "Alchemy.LinkOverlay.createLink('contact', jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()), jQuery('#contactform_link_title').val(), null); Alchemy.LinkOverlay.close()",
+          :class => 'button'
+        }) %>
+      </td>
+    </tr>
   </table>
-  <p>
-    <%= link_to(t(:apply), '#', {
-      :onclick => "Alchemy.LinkOverlay.createLink('contact', jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()), jQuery('#contactform_link_title').val(), null); Alchemy.LinkOverlay.close()",
-      :class => 'button'
-    }) %>
-  </p>
 </div>

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

@@ -19,17 +19,19 @@
     </tr>
     <tr>
       <td class="label long">
-        <label for="link_target"><%= t("Open Link in") %>:</label>
+        <label for="external_link_target"><%= t("Open Link in") %>:</label>
       </td>
-      <td>
-        <%= select_tag 'link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      <td class="select left">
+        <%= select_tag 'external_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= link_to(t(:apply), '#', {
+          :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#external_link_target').val()); Alchemy.LinkOverlay.close()",
+          :class => 'button'
+        }) %>
       </td>
     </tr>
   </table>
-  <p>
-    <%= link_to(t(:apply), '#', {
-      :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#link_target').val()); Alchemy.LinkOverlay.close()",
-      :class => 'button'
-    }) %>
-  </p>
 </div>

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

@@ -29,15 +29,17 @@
       <td class="label long">
         <label for="file_link_target"><%= t("Open Link in") %>:</label>
       </td>
-      <td>
-        <%= select_tag 'file_link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      <td class="select left">
+        <%= select_tag 'file_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= link_to(t(:apply), '#', {
+          :onclick => "Alchemy.LinkOverlay.createLink('file', jQuery('#public_filename').val(), jQuery('#file_link_title').val(), jQuery('#file_link_target').val()); Alchemy.LinkOverlay.close()",
+          :class => 'button'
+        }) %>
       </td>
     </tr>
   </table>
-  <p>
-    <%= link_to(t(:apply), '#', {
-      :onclick => "Alchemy.LinkOverlay.createLink('file', jQuery('#public_filename').val(), jQuery('#file_link_title').val(), jQuery('#file_link_target').val()); Alchemy.LinkOverlay.close()",
-      :class => 'button'
-    }) %>
-  </p>
 </div>

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

@@ -4,9 +4,11 @@
     <tr>
       <td colspan="2">
         <div id="page_selector_container">
+          <% if @page_root %>
           <ul id="sitemap">
             <%= render :partial => 'page_for_links', :object => @page_root, :locals => {:area_name => @area_name} %>
           </ul>
+          <% end %>
         </div>
       </td>
     </tr>
@@ -22,17 +24,19 @@
       <td class="label long">
         <label for="internal_link_target"><%= t("Open Link in") %>:</label>
       </td>
-      <td>
-        <%= select_tag 'internal_link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      <td class="select left">
+        <%= select_tag 'internal_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= hidden_field_tag(:internal_urlname) %>
+        <%= hidden_field_tag(:page_anchor) %>
+        <%= link_to(t(:apply), '#', {
+          :onclick => "Alchemy.LinkOverlay.createLink('internal', jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(), jQuery('#internal_link_title').val(), jQuery('#internal_link_target').val()); Alchemy.LinkOverlay.close()",
+          :class => 'button'
+        }) %>
       </td>
     </tr>
   </table>
-  <p>
-    <%= hidden_field_tag(:internal_urlname) %>
-    <%= hidden_field_tag(:page_anchor) %>
-    <%= link_to(t(:apply), '#', {
-      :onclick => "Alchemy.LinkOverlay.createLink('internal', jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(), jQuery('#internal_link_title').val(), jQuery('#internal_link_target').val()); Alchemy.LinkOverlay.close()",
-      :class => 'button'
-    }) %>
-  </p>
 </div>

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

@@ -8,7 +8,7 @@
         <%= f.label :page_layout %>
       </td>
       <td class="select">
-        <%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox' }) %>
+        <%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox', :autofocus => true }) %>
       </td>
     </tr>
     <tr>

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

@@ -31,7 +31,7 @@
         alchemy.configure_admin_page_path(page),
         {
           :title => t('edit_page_properties'),
-          :size => page.redirects_to_external? ? '410x270' : '410x620'
+          :size => page.redirects_to_external? ? '410x270' : '410x660'
         },
         :class => '',
         :title => t('edit_page_properties')

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

@@ -4,17 +4,21 @@
       <span class="site_status <%= page_for_links.locked ? ' locked' : '' %>" ></span>
     </div>
     <div class="sitemap_right_tools">
-      <%= link_to(
-        "&nbsp;",
-        alchemy.list_admin_elements_path(:page_id => page_for_links.id),
-        :remote => true,
-        :onclick => "Alchemy.LinkOverlay.selectPage('#{page_for_links.id}', '#{@url_prefix + page_for_links.urlname}'); Alchemy.LinkOverlay.showElementsSelect(#{page_for_links.id});",
-        :class => "show_elements_to_link",
-        :title => t('show_elements_from_page')
-      ) %>
-      <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page">
-        <%= image_tag("alchemy/ajax_loader.gif", :alt => '') %>
-      </div>
+      <% unless page_for_links.redirects_to_external? %>
+        <%= link_to("",
+          alchemy.list_admin_elements_path(:page_id => page_for_links.id),
+          :remote => true,
+          :data => {
+            'page-id' => page_for_links.id,
+            :url => @url_prefix + page_for_links.urlname
+          },
+          :class => "show_elements_to_link",
+          :title => t('show_elements_from_page')
+        ) %>
+        <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page">
+          <%= image_tag("alchemy/ajax_loader.gif", :alt => '') %>
+        </div>
+      <% end %>
     </div>
     <div class="page_infos">
       <span class="page_status <%= page_for_links.public ? 'public' : 'not_public' %>" title="<%= page_for_links.public ? t('Page public') : t('Page not public') %>"></span>
@@ -22,16 +26,23 @@
       <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_<%= page_for_links.id %>" name="<%= parse_sitemap_name(page_for_links) %>">
-      <%= link_to(page_for_links.name, '#', {
-        :onclick => "Alchemy.LinkOverlay.selectPage('#{page_for_links.id}', '#{@url_prefix + page_for_links.urlname}')",
-        :title => t('page_for_links.choose_page', :name => page_for_links.name),
-        :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
-      }) %>
+      <% if page_for_links.redirects_to_external? %>
+        <span class="sitemap_pagename_link inactive"><%= page_for_links.name %></span>
+      <% else %>
+        <%= link_to(page_for_links.name, '', {
+          :data => {
+            'page-id' => page_for_links.id,
+            :url => @url_prefix + page_for_links.urlname
+          },
+          :title => t('page_for_links.choose_page', :name => page_for_links.name),
+          :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
+        }) %>
+      <% end %>
     </div>
   </div>
-  <%- if !page_for_links.children.empty? -%>
-  <ul id="page_<%= page_for_links.id %>_children">
-    <%= render :partial => 'page_for_links', :collection => page_for_links.children, :locals => {:area_name => @area_name} %>
-  </ul>
-  <%- end -%>
+  <% if !page_for_links.children.empty? %>
+    <ul id="page_<%= page_for_links.id %>_children">
+      <%= render :partial => 'page_for_links', :collection => page_for_links.children, :locals => {:area_name => @area_name} %>
+    </ul>
+  <% end %>
 </li>