alchemy_cms 2.2.4 → 2.3.rc5

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

@@ -29,7 +29,7 @@
     <%- end -%>
     <tr>
       <td class="label"><%= f.label "name" %>: </td>
-      <td class="input"><%= f.text_field "name", :size => 31, :class => "thin_border long" %></td>
+      <td class="input"><%= f.text_field "name", :size => 31, :class => "thin_border long", :autofocus => true %></td>
     </tr>
     <%- unless @page.layoutpage -%>
     <tr>
@@ -64,7 +64,7 @@
     </tr>
     <%- end -%>
     <tr>
-      <td colspan="2" align="right"><%= f.button t("save"), :class => 'button' %></td>
+      <td colspan="2" class="right"><%= f.button t("save"), :class => 'button' %></td>
     </tr>
   </table>
   <p class="foot_note">

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

@@ -2,14 +2,14 @@
   <div id="errors" style="display:none"></div>
   <table id="page_names">
     <tr>
-      <td><%= t("page_type") %>: </td>
-      <td>
-        <%= @page.layout_display_name %>
+      <td class="label"><%= t("page_type") %>: </td>
+      <td class="value long">
+        <p><%= @page.layout_display_name %></p>
       </td>
     </tr>
     <tr>
-      <td><%= t("page_status") %>: </td>
-      <td>
+      <td class="label"><%= t("page_status") %>: </td>
+      <td class="checkbox long">
         <%= f.check_box :visible -%>
         <%= f.label :visible %><br/>
         <%- if configuration(:sitemap)[:show_flag] -%><br/>
@@ -19,22 +19,22 @@
       </td>
     </tr>
     <tr>
-      <td colspan="2"><strong><%= t("names") %></strong></td>
+      <td colspan="2" class="heading"><%= t("names") %></td>
     </tr>
     <tr>
-      <td><%= f.label "name" %>:&nbsp;</td>
-      <td><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
+      <td class="label"><%= f.label "name" %>:&nbsp;</td>
+      <td class="input"><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
     </tr>
     <tr>
-      <td><%= f.label "urlname" %>: </td>
-      <td><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
+      <td class="label"><%= f.label "urlname" %>: </td>
+      <td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
     </tr>
     <tr>
-      <td><%= f.label "title" %>: </td>
-      <td><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
+      <td class="label"><%= f.label "title" %>: </td>
+      <td class="input"><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
     </tr>
     <tr>
-      <td colspan="2" align="right"><%= f.button t("save"), :class => 'button' %></td>
+      <td colspan="2" class="submit"><%= f.button t("save"), :class => 'button' %></td>
     </tr>
   </table>
 <% end %>

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

@@ -48,7 +48,7 @@
       alchemy.configure_admin_page_path(@page),
       {
         :title => t('edit_page_properties'),
-        :size => @page.layoutpage? ? '340x150' : '410x620'
+        :size => @page.layoutpage? ? '340x150' : '410x660'
       },
       :class => :icon_button,
       :title => t('edit_page_properties')
@@ -150,7 +150,7 @@
     }, function() {
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditorSelector.init();
-      Alchemy.SelectBox('.element_editor select');
+      Alchemy.SelectBox('.element_editor');
       Alchemy.Tinymce.init(function() {
         Alchemy.ElementDirtyObserver('#element_area');
       });

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

@@ -64,37 +64,39 @@
 </div>
 <%- end -%>
 
+<div id="archive_all">
 <%- if @page_root -%>
 
-<div id="sort_panel" style="display: none">
-  <div class="info">
-    <%= render_icon('info') %>
-    <%= t('explain_sitemap_dragndrop_sorting') %>
+  <div id="sort_panel" style="display: none">
+    <div class="info">
+      <%= render_icon('info') %>
+      <%= t('explain_sitemap_dragndrop_sorting') %>
+    </div>
+    <div class="buttons">
+      <%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
+      <%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
+    </div>
   </div>
-  <div class="buttons">
-    <%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
-    <%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
-  </div>
-</div>
 
-<h2 id="sitemap_heading">
-  <span class="page_name"><%= t('Name') %></span>
-  <span class="page_infos"><%= t('Status') %></span>
-</h2>
+  <h2 id="sitemap_heading">
+    <span class="page_name"><%= t('Name') %></span>
+    <span class="page_infos"><%= t('Status') %></span>
+  </h2>
 
-<%= render :partial => 'sitemap' %>
+  <%= render :partial => 'sitemap' %>
 
 <%- else -%>
 
-<%= render :partial => 'create_language_form' %>
-<% content_for(:javascripts) do %>
-<script type="text/javascript">
-  jQuery(document).ready(function($) {
-    $('#create_language_tree_form').dialog({modal: true, width: 360, close: function() {
-      $(this).appendTo('#archive_all').show().removeClass().removeAttr('style');
-    }});
-  });
-</script>
-<%- end -%>
+  <%= render :partial => 'create_language_form' %>
+  <% content_for(:javascripts) do %>
+  <script type="text/javascript">
+    jQuery(document).ready(function($) {
+      $('#create_language_tree_form').dialog({modal: true, width: 360, close: function() {
+        $(this).appendTo('#archive_all').show().removeClass().removeAttr('style');
+      }});
+    });
+  </script>
+  <%- end -%>
 
 <% end -%>
+</div>

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

@@ -18,13 +18,10 @@
 </div>
 
 <script type="text/javascript" charset="utf-8">
-
-  jQuery(function() {
-    jQuery( "#overlay_tabs" ).tabs();
+  jQuery(function($) {
+    $( "#overlay_tabs" ).tabs();
   });
-  
   if (Alchemy.LinkOverlay.current.linked_element) {
     Alchemy.LinkOverlay.selectTab();
   }
-
 </script>

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -8,7 +8,7 @@
     <li id="explain_drag_n_drop"><%= t('explain_upload.dragndrop', :name => item_type) %></li>
   </ol>
   <%- unless file_types.first == '*' -%>
-  <p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
+    <p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
   <%- end -%>
   <small>*<%= t('explain_upload.footnote', :name => item_type) %></small>
 </div>
@@ -16,7 +16,8 @@
 <%= render 'alchemy/admin/partials/flash_upload' %>
 
 <div class="browse">
-  <input id="multiple" type="file" multiple value="<%= t('browse') %>">
+  <%= label_tag :multiple, t('browse'), :style => 'display:none;' %>
+  <input name="Filedata" id="multiple" type="file" multiple value="<%= t('browse') %>">
   <a href="#" class="button no-spinner" id="cancelHTML5Queue" style="display: none">
     <%= t("swfupload.cancel_uploads") %>
   </a>
@@ -36,20 +37,35 @@
   :content_id => @content.blank? ? nil : @content.id,
   :element_id => @element.blank? ? nil : @element.id,
   :size => @size,
+  :upload_hash => Time.now.hash,
   :options => @options.to_param
-}.delete_if { |k,v| v.nil? }.to_json -%>
+}.delete_if { |k, v| v.nil? }.to_json -%>
 
 <script type='text/javascript'>
 
-  Alchemy.Uploader.init({
-    upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
-    post_params: <%= post_params.html_safe %>,
-    file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
-    file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
-    file_types_description: "<%= file_types_description %>",
-    file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
-    locale: "<%= ::I18n.locale || 'en' %>"
-  });
+  (function() {
+    var options = {
+      upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
+      post_params: <%= post_params.html_safe %>,
+      file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
+      file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
+      file_types_description: "<%= file_types_description %>",
+      file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
+      locale: "<%= ::I18n.locale || 'en' %>",
+      onQueueComplete: function() {
+        <% if @while_assigning && model_name == 'picture' %>
+        var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload, :element_id => @element.id, :content_id => @content ? @content.id : nil, :options => @options).html_safe %>';
+        $.get(url, null, null, 'script');
+        <% elsif controller.class.name == 'Alchemy::Admin::PicturesController' %>
+        var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload).html_safe %>';
+        Alchemy.pleaseWaitOverlay();
+        window.location = url;
+        <% end %>
+      }
+    };
+
+    Alchemy.Uploader.init(options);
+  })();
 
   (function($) {
     $('#uploadswitcher').click(function() {

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

@@ -0,0 +1,54 @@
+<div id="library_sidebar">
+  <%= render :partial => 'filter_bar' %>
+  <div id="tag_list">
+    <%= render :partial => 'tag_list' %>
+  </div>
+</div>
+<%= form_tag delete_multiple_admin_pictures_path, :method => :delete do %>
+  <div class="selected_item_tools">
+    <h2><%= t("edit_selected_pictures") %></h2>
+    <%= link_to(
+      render_icon('edit') + t("Edit"),
+      edit_multiple_admin_pictures_path,
+      :class => 'button with_icon',
+      :title => t('Edit multiple pictures'),
+      :id => 'edit_multiple_pictures',
+      :style => 'float: none'
+    ) %>
+    <%= button_tag render_icon('destroy') + t("Delete"), 'data-alchemy-confirm' => {
+      :title => t("please_confirm"),
+      :message => t("confirm_to_delete_images_from_server"),
+      :okLabel => t("Yes"),
+      :cancelLabel => t("No")
+    }.to_json, :class => 'button with_icon' %>
+    &nbsp;<%= t('or') %>&nbsp;
+    <%= link_to(
+      render_icon('delete-small') + t("Clear selection"),
+      admin_pictures_path(
+        :query => params[:query],
+        :tagged_with => params[:tagged_with],
+        :size => params[:size],
+        :filter => params[:filter]
+      ),
+      :class => 'button with_icon',
+      :style => 'float: none'
+    ) %>
+  </div>
+  <%= content_tag :h3, t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
+  <div id="pictures">
+  <% if @pictures.blank? and @recent_pictures.blank? and params[:query].nil? %>
+    <div class="info">
+      <%= render_icon('info') %>
+      <%= t("no_images_in_archive") %>
+    </div>
+  <% elsif @pictures.blank? and @recent_pictures.blank? %>
+    <div class="info">
+      <%= render_icon('info') %>
+      <%= t("no_search_results") %>
+    </div>
+  <% else %>
+    <%= render :partial => 'picture', :collection => @pictures %>
+    <%= paginate @pictures %>
+  <% end %>
+  </div>
+<% end %>

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

@@ -1,13 +1,16 @@
 <div id="alchemy_window_body">
   <div id="overlay_toolbar">
-    <%= render :partial => 'filter_and_size_bar' %>
+    <%= render 'filter_and_size_bar' %>
   </div>
   <div id="assign_image_list" class="with_padding">
-  <% if @pictures.empty? -%>
-    <p><%= t("no_images_in_archive") %></p>
-  <% else -%>
-    <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
-    <%= paginate @pictures, :remote => true %>
-  <% end -%>
+    <div id="library_sidebar">
+      <%= render 'filter_bar' %>
+      <div id="tag_list">
+        <%= render 'tag_list' %>
+      </div>
+    </div>
+    <div id="overlay_picture_list">
+      <%= render 'overlay_picture_list' %>
+    </div>
   </div>
 </div>

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

@@ -47,27 +47,26 @@
   </div>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
-  <%= link_to_overlay_window(
-    render_icon('upload'),
-    alchemy.new_admin_picture_path(
-      :element_id => @element.blank? ? nil : @element.id,
-      :content_id => @content.blank? ? nil : @content.id,
-      :swap => @swap,
-      :page => params[:page],
-      :per_page => params[:per_page],
-      :size => @size,
-      :options => @options
-    ),
-    {
-      :size => "540x550",
-      :title => t('upload_image')
-    },
-    {
-      :class => 'icon_button',
-      :title => t('upload_image')
-    }
-  ) %>
-  <label><%= t('upload_image') %></label>
+    <%= link_to_overlay_window(
+      render_icon('upload'),
+      alchemy.new_admin_picture_path(
+        :element_id => @element.blank? ? nil : @element.id,
+        :content_id => @content.blank? ? nil : @content.id,
+        :swap => @swap,
+        :page => params[:page],
+        :size => @size,
+        :options => @options
+      ),
+      {
+        :size => "540x550",
+        :title => t('upload_image')
+      },
+      {
+        :class => 'icon_button',
+        :title => t('upload_image')
+      }
+    ) %>
+    <label><%= t('upload_image') %></label>
   </div>
-  <%= render(:partial => 'alchemy/admin/partials/remote_search_form') %>
+  <%= render :partial => 'alchemy/admin/partials/remote_search_form' %>
 </div>

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

@@ -0,0 +1,31 @@
+<% params_to_keep = [:size, :tagged_with, :query, :element_id, :content_id, :_] %>
+
+<div id="filter_bar">
+  <h2><%= t('Filter') %></h2>
+  <%= select_tag(
+    'picture_filter',
+    options_for_select([
+      [t("all_pictures"), ''],
+      [t("last_upload_only"), 'last_upload'],
+      [t("recently_uploaded_only"), 'recent']
+    ], params[:filter]),
+    :data => { :remote => !!request.xhr? }
+  ) %>
+</div>
+
+<script type="text/javascript">
+  $(function() {
+    $('#picture_filter').on('change', function(e) {
+      var $this = $(this);
+      var url = '<%= alchemy.admin_pictures_path(merge_params_only(params_to_keep)).html_safe %>';
+      if ($this.data('remote') === true) {
+        $.get(url, {filter: $this.val()}, null, 'script');
+      } else {
+        Alchemy.pleaseWaitOverlay();
+        delimiter = url.match(/\?/) ? '&' : '?';
+        window.location = url + delimiter + 'filter=' + $this.val();
+      }
+      return false;
+    });
+  });
+</script>

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

@@ -0,0 +1,9 @@
+<% if @pictures.empty? %>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t("no_images_in_archive") %>
+  </div>
+<% else %>
+  <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
+  <%= paginate @pictures, :remote => true %>
+<% end %>

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

@@ -1,6 +1,9 @@
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
-  <%- permitted_to?(:destroy, :alchemy_admin_pictures) do -%>
-  <span class="picture_tool_delete">
+  <span class="picture_tool select">
+    <%= check_box_tag "picture_ids[]", picture.id %>
+  </span>
+  <% permitted_to?(:destroy, :alchemy_admin_pictures) do %>
+  <span class="picture_tool delete">
     <%= link_to_confirmation_window(
       "",
       t("confirm_to_delete_image_from_server"),
@@ -8,14 +11,38 @@
         :id => picture,
         :query => params[:query],
         :page => params[:page],
-        :per_page => params[:per_page]
+        :tagged_with => params[:tagged_with],
+        :size => params[:size],
+        :filter => params[:filter]
       ),
       {
         :title => t('Delete image')
       }
     ) -%>
   </span>
-  <%- end -%>
+  <% end %>
+  <% permitted_to?(:edit, :alchemy_admin_pictures) do %>
+  <span class="picture_tool edit">
+    <%= link_to_overlay_window(
+      "",
+      alchemy.edit_admin_picture_path(
+        :id => picture,
+        :query => params[:query],
+        :page => params[:page],
+        :tagged_with => params[:tagged_with],
+        :size => params[:size],
+        :filter => params[:filter]
+      ),
+      {
+        :title => t('Edit image'),
+        :size => "400x180"
+      },
+      {
+        :title => t('Edit image')
+      }
+    ) -%>
+  </span>
+  <% end %>
   <div class="image_spinner spinner">
     <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
   </div>
@@ -29,7 +56,10 @@
     ),
     '#',
     :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
-    :class => 'thumbnail_background'
+    :class => 'thumbnail_background',
+    :id => 'show_in_window'
   ) %>
-  <span class="picture_name<%= ' rename' if permitted_to?(:edit, :alchemy_admin_pictures) -%>" title="<%= permitted_to?(:edit, :alchemy_admin_pictures) ? picture.name + ' (' + t('Click to rename') + ')' : picture.name %>" id="image_picture_<%= picture.id %>_name"><%= picture.name %></span>
+  <span class="picture_name" title="<%= picture.name %>" id="image_picture_<%= picture.id %>_name">
+    <%= picture.name %>
+  </span>
 </div>