alchemy_cms 2.2.4 → 2.3.rc5

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -0,0 +1,27 @@
+<h2><%= t("Filter by tag") %></h2>
+<ul>
+  <% Alchemy::Picture.tag_counts.each do |t| %>
+    <% picture_tags = pictures_filtered_by_tag?(t) ? picture_tag_filter(:remove => t) : picture_tag_filter(:add => t) %>
+    <%= content_tag 'li', :class => params[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
+      <%= link_to(
+        "#{t.name} (#{t.count})",
+        url_for(
+          params.delete_if { |k, v| k == "page" }.merge(
+            :action => :index,
+            :tagged_with => picture_tags
+          )
+        ),
+        :remote => request.xhr?,
+        :class => 'please_wait'
+      ) %>
+    <% end %>
+  <% end %>
+</ul>
+<% if params[:tagged_with].present? %>
+  <%= link_to(
+    render_icon('delete-small') + t('Remove tag filter'),
+    url_for(params.delete_if { |k, v| k == "tagged_with" }.merge(:action => :index)),
+    :remote => request.xhr?,
+    :class => 'button small with_icon please_wait'
+  ) %>
+<% end %>

data/app/views/alchemy/admin/pictures/archive_overlay.js.erb

@@ -1 +1,3 @@
-jQuery('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) %>');
+jQuery('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) %>');
+Alchemy.SelectBox('#filter_bar');
+Alchemy.overlayObserver('#alchemy_window_body');

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

@@ -2,11 +2,10 @@
 <%- if @while_assigning -%>
   $('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) -%>');
 <%- else -%>
-  $('#picture_archive').html('<%= escape_javascript(render(:partial => "pictures_list")) -%>');
-  Alchemy.inPlaceEditor({
-    save_label: "<%= t('save') -%>",
-    cancel_label: "<%= t('cancel') -%>"
-  });
+  $('#picture_archive').html("<%= escape_javascript(render :partial => 'archive') %>");
+  Alchemy.pictureSelector();
+  Alchemy.overlayObserver('#picture_archive');
+  Alchemy.SelectBox('#filter_bar');
 <%- end -%>
   Alchemy.growl('<%= @message -%>');
 })(jQuery);

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

@@ -0,0 +1,26 @@
+<%= form_for [:admin, @picture] do |f| %>
+  <%= hidden_field_tag :query, params[:query] %>
+  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :tagged_with, params[:tagged_with] %>
+  <%= hidden_field_tag :filter, params[:filter] %>
+  <table>
+    <tr>
+      <td class="label"><%= f.label :name %></td>
+      <td class="input">
+        <%= f.text_field :name, :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label :tag_list %>*</td>
+      <td class="input">
+        <%= f.text_field :tag_list, :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= f.button t(:save), :name => nil, :class => 'button' %>
+      </td>
+    </tr>
+  </table>
+  <p class="foot_note"><%= t('Please seperate the tags with commata') %></p>
+<% end %>

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -0,0 +1,39 @@
+<%= form_tag update_multiple_admin_pictures_path do %>
+
+  <%= hidden_field_tag :query, params[:query] %>
+  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :tagged_with, params[:tagged_with] %>
+  <%= hidden_field_tag :filter, params[:filter] %>
+
+  <% @pictures.each do |pic| %>
+  <%= hidden_field_tag "picture_ids[]", pic.id %>
+  <% end %>
+
+  <div class="info">
+    <%= render_icon :info %>
+    <p><%= t("You are about to edit %{length} pictures at once") % {:length => @pictures.length} %></p>
+  </div>
+
+  <table>
+    <tr>
+      <td class="label"><%= label_tag :pictures_name, t('Name') %></td>
+      <td class="input">
+        <%= text_field_tag :pictures_name, nil, :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label"><%= label_tag :pictures_tag_list, t('Tags') %></td>
+      <td class="input">
+        <%= text_field_tag :pictures_tag_list, @pictures.collect(&:tag_list).flatten.uniq.join(', '), :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= button_tag t(:save), :name => nil, :class => 'button' %>
+      </td>
+    </tr>
+  </table>
+
+  <p class="foot_note"><%= t('Please seperate the tags with commata') %></p>
+
+<% end %>

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

@@ -1,83 +1,94 @@
-<%- content_for(:toolbar) do -%>
-<div id="toolbar_buttons">
-  <%= toolbar_button(
-    :icon => 'upload',
-    :label => t('upload_image'),
-    :url => alchemy.new_admin_picture_path(:size => @size),
-    :overlay_options => {
+<% content_for(:toolbar) do %>
+  <div id="toolbar_buttons">
+    <%= toolbar_button(
+      :icon => 'upload',
+      :label => t('upload_image'),
+      :url => alchemy.new_admin_picture_path(:size => @size),
+      :overlay_options => {
+        :title => t('upload_image'),
+        :size => '540x590'
+      },
+      :class => 'icon_button',
       :title => t('upload_image'),
-      :size => '540x590'
-    },
-    :class => 'icon_button',
-    :title => t('upload_image'),
-    :if_permitted_to => [:new, :alchemy_admin_pictures]
-  ) %>
-  <div class="toolbar_spacer"></div>
-  <div class="button_with_label">
-    <%= link_to(
-      render_icon('zoom-out'),
-      alchemy.admin_pictures_path({
-        :size => "small",
-        :query => params[:query]
-      }),
-      :title => t("small_thumbnails"),
-      :class => "icon_button please_wait"
+      :if_permitted_to => [:new, :alchemy_admin_pictures]
     ) %>
-    <%= link_to(
-      render_icon('zoom-equal'),
-      alchemy.admin_pictures_path({
-        :size => "medium",
-        :query => params[:query]
-      }),
-      :title => t("medium_thumbnails"),
-      :class => "icon_button please_wait"
-    ) %>
-    <%= link_to(
-      render_icon('zoom-in'),
-      alchemy.admin_pictures_path({
-        :size => "large",
-        :query => params[:query]
-      }),
-      :title => t("big_thumbnails"),
-      :class => "icon_button please_wait"
-    ) %>
-    <label><%= t('Image size') %></label>
-    <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+    <div class="toolbar_spacer"></div>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon('zoom-out'),
+        alchemy.admin_pictures_path({
+          :size => "small",
+          :query => params[:query]
+        }),
+        :title => t("small_thumbnails"),
+        :class => "icon_button please_wait"
+      ) %>
+      <%= link_to(
+        render_icon('zoom-equal'),
+        alchemy.admin_pictures_path({
+          :size => "medium",
+          :query => params[:query]
+        }),
+        :title => t("medium_thumbnails"),
+        :class => "icon_button please_wait"
+      ) %>
+      <%= link_to(
+        render_icon('zoom-in'),
+        alchemy.admin_pictures_path({
+          :size => "large",
+          :query => params[:query]
+        }),
+        :title => t("big_thumbnails"),
+        :class => "icon_button please_wait"
+      ) %>
+      <label><%= t('Image size') %></label>
+      <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+    </div>
+
+    <% permitted_to?(:flush, :alchemy_admin_pictures) do %>
+      <div class="toolbar_spacer"></div>
+      <%= toolbar_button(
+        :icon => 'flush',
+        :url => alchemy.flush_admin_pictures_path,
+        :overlay => false,
+        :link_options => {
+          :remote => true,
+          :method => :post
+        },
+        :label => t('Flush picture cache'),
+        :class => 'icon_button please_wait',
+        :title => t('Flush picture cache'),
+        :skip_permission_check => true
+      ) %>
+    <% end %>
+    <div class="toolbar_spacer"></div>
+    <div class="button_with_label">
+      <%= link_to render_icon('select_all'), '', :id => 'select_all_pictures', :class => 'icon_button' %>
+      <label><%= t("Select all") %></label>
+    </div>
   </div>
 
-  <%- permitted_to?(:flush, :alchemy_admin_pictures) do -%>
-  <div class="toolbar_spacer"></div>
-  <%= toolbar_button(
-    :icon => 'flush',
-    :url => alchemy.flush_admin_pictures_path,
-    :overlay => false,
-    :link_options => {
-      :remote => true,
-      :method => :post
-    },
-    :label => t('Flush picture cache'),
-    :class => 'icon_button please_wait',
-    :title => t('Flush picture cache'),
-    :skip_permission_check => true
-  ) %>
-  <%- end -%>
-</div>
-<%= render :partial => 'alchemy/admin/partials/search_form' %>
-<%- end -%>
+  <%= render :partial => 'alchemy/admin/partials/search_form' %>
+<% end %>
 
 <div id="picture_archive">
-  <%= render :partial => 'pictures_list' %>
+  <%= render 'archive' %>
 </div>
 
 <%- content_for :javascripts do -%>
-<script type="text/javascript" charset="utf-8">
+  <script type="text/javascript" charset="utf-8">
+
+    jQuery(document).ready(function($) {
+
+      Alchemy.pictureSelector();
+
+      $('#select_all_pictures').on('click', function(e) {
+        $('.picture_tool.select :checkbox').prop('checked', true).change();
+        e.preventDefault;
+        return false;
+      });
 
-  jQuery(document).ready(function($) {
-    Alchemy.inPlaceEditor({
-      save_label: "<%= t('save') %>",
-      cancel_label: "<%= t('cancel') %>"
     });
-  });
 
-</script>
+  </script>
 <%- end -%>

data/app/views/alchemy/admin/pictures/index.js.erb

@@ -0,0 +1,3 @@
+Alchemy.pleaseWaitOverlay(false);
+jQuery('#archive_all').html('<%= escape_javascript(render(:partial => "archive")) %>');
+jQuery('#filter_bar').replaceWith('<%= escape_javascript(render(:partial => "filter_bar")) %>');

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

@@ -8,4 +8,5 @@
       :item_type => t('images')
     }
   ) %>
+  <%= f.submit :upload, :style => 'display: none' %>
 <% end %>

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

@@ -17,4 +17,6 @@
   :search_url => resources_path
 ) -%>
 
-<%= render 'table' %>
+<div id="archive_all">
+  <%= render 'table' %>
+</div>

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

@@ -1,7 +1,7 @@
 <table>
   <tr>
     <td class="label"><%= f.label 'gender' %></td>
-    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, :class => 'alchemy_selectbox' -%></td>
+    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, :class => 'alchemy_selectbox', :autofocus => true -%></td>
   </tr>
   <tr>
     <td class="label"><%= f.label 'firstname' %></td>

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

@@ -13,29 +13,33 @@
   ]
 ) %>
 
-<%- if @users.any? -%>
-<table class="list" id="user_list">
-  <tr>
-    <th class="icon"></th>
-    <th class="login_status"></th>
-    <th class="login"><%= Alchemy::User.human_attribute_name('login') %></th>
-    <th class="name"><%= Alchemy::User.human_attribute_name('firstname') %></th>
-    <th><%= Alchemy::User.human_attribute_name('lastname') %></th>
-    <th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
-    <th><%= Alchemy::User.human_attribute_name('language') %></th>
-    <th><%= Alchemy::User.human_attribute_name('last_login_at') %></th>
-    <th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
-    <th class="tools"></th>
-  </tr>
-  <%= render :partial => 'alchemy/admin/users/user', :collection => @users %>
-</table>
-<%= paginate @users %>
+<div id="archive_all">
+<% if @users.any? %>
 
-<%- elsif params[:query] -%>
+  <table class="list" id="user_list">
+    <tr>
+      <th class="icon"></th>
+      <th class="login_status"></th>
+      <th class="login"><%= Alchemy::User.human_attribute_name('login') %></th>
+      <th class="name"><%= Alchemy::User.human_attribute_name('firstname') %></th>
+      <th><%= Alchemy::User.human_attribute_name('lastname') %></th>
+      <th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
+      <th><%= Alchemy::User.human_attribute_name('language') %></th>
+      <th><%= Alchemy::User.human_attribute_name('last_login_at') %></th>
+      <th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
+      <th class="tools"></th>
+    </tr>
+    <%= render :partial => 'alchemy/admin/users/user', :collection => @users %>
+  </table>
 
-<div class="info">
-  <%= render_icon('info') %>
-  <%= t('No users found') %>
-</div>
+  <%= paginate @users %>
+
+<% elsif params[:query] %>
 
-<%- end -%>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t('No users found') %>
+  </div>
+
+<% end %>
+</div>

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

@@ -1,6 +1,11 @@
 <%= render_essence_editor_by_name(element, 'intro') %>
-<%= 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, 'image', {
+  :image_size => "450x300",
+  :crop => true,
+  :image_float_selector => true,
+  :fixed_ratio => false
+}) %>
 <% element.contents.where(:name => ['headline', 'text']).each do |content| %>
   <%= render_essence_editor content %>
 <% end %>
-<%= render_new_content_link(element) %>
+<%= render_new_content_link(element) %>

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

@@ -1 +1 @@
-<%= render_picture_editor(element, :image_size => "900x300", :crop => true) %>
+<%= render_essence_editor_by_name(element, 'image', :image_size => "900x300", :crop => true) %>

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

@@ -1,2 +1,7 @@
-<%= render_picture_editor(element, :image_float_selector => true, :image_size => "450x300", :crop => true, :fixed_ratio => false) %>
+<%= render_essence_editor_by_name(element, 'image', {
+  :image_float_selector => true,
+  :image_size => "450x300",
+  :crop => true,
+  :fixed_ratio => false
+}) %>
 <%= render_essence_editor_by_name(element, 'text') %>

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

@@ -1,7 +1,7 @@
 <div class="bild_text" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
-  <%- a = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
-  <div class="image <%= a.essence.css_class %>">
-    <%= render_essence_view(a, :image_size => "450x1000", :crop => true) %>
+  <%- image = element.contents.find_by_name("image") -%>
+  <div class="image <%= image.essence.css_class %>">
+    <%= render_essence_view(image, :image_size => "450x1000", :crop => true) %>
   </div>
   <div class="text">
     <%= render_essence_view_by_name(element, 'text') %>

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

@@ -1,3 +1,3 @@
-<%= render_picture_editor(element, :image_size => '300x200', :crop => true) %>
+<%= render_picture_gallery_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,8 +1,8 @@
 <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| -%>
+  <%- element.contents.gallery_pictures.each do |image| -%>
     <div class="image_mosaic_image">
-      <%= render_essence_view(essence, :image_size => '300x200', :crop => true) %>
+      <%= render_essence_view(image, :image_size => '300x200', :crop => true) %>
     </div>
   <%- end -%>
   </div>

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

@@ -3,10 +3,10 @@
         <%= render_essence_view_by_name(element, 'headline') %>
     </h1>
     <div class="text_bild_container">
-        <%- content = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
-        <%- if content -%>
-        <div class="image <%= content.essence.css_class %>">
-            <%= render_essence_view(content, :image_size => "450x300", :crop => true) %>
+        <%- image = element.contents.essence_pictures.first -%>
+        <%- if image -%>
+        <div class="image <%= image.essence.css_class %>">
+            <%= render_essence_view(image, :image_size => "450x300", :crop => true) %>
         </div>
         <%- end -%>
         <div class="text">

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

@@ -1 +1,4 @@
-<p><%= t(:searchresults_editor_info) %></p>
+<div class="info">
+  <%= render_icon('info') %>
+  <%= t(:searchresults_editor_info) %>
+</div>