alchemy_cms 2.4.beta2 → 2.4.rc1

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

@@ -7,33 +7,33 @@
         <%= f.select('page_layout', @page_layouts, {}, {:class => 'alchemy_selectbox long'}) %>
       </td>
     </tr>
-    <%- unless @page.layoutpage -%>
+    <% unless @page.layoutpage %>
     <tr>
       <td class="label"><%= t("page_status") %>: </td>
       <td class="checkbox long">
-        <%= f.check_box :public -%>
+        <%= f.check_box :public %>
         <%= f.label :public %><br/>
-        <%= f.check_box :visible -%>
+        <%= f.check_box :visible %>
         <%= f.label :visible %><br/>
-        <%= f.check_box :restricted -%>
+        <%= f.check_box :restricted %>
         <%= f.label :restricted %>
-        <%- if configuration(:sitemap)[:show_flag] -%><br/>
-        <%= f.check_box :sitemap -%>
+        <% if configuration(:sitemap)[:show_flag] %><br/>
+        <%= f.check_box :sitemap %>
         <%= f.label :sitemap %>
-        <%- end -%>
+        <% end %>
       </td>
     </tr>
-    <%- end -%>
-    <%- unless @page.layoutpage -%>
+    <% end %>
+    <% unless @page.layoutpage %>
     <tr>
       <td colspan="2" class="heading"><%= t("names") %></td>
     </tr>
-    <%- end -%>
+    <% end %>
     <tr>
       <td class="label"><%= f.label "name" %>: </td>
       <td class="input"><%= f.text_field "name", :size => 31, :class => "thin_border long", :autofocus => true %></td>
     </tr>
-    <%- unless @page.layoutpage -%>
+    <% unless @page.layoutpage %>
     <tr>
       <td class="label"><%= f.label "urlname" %>: </td>
       <td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
@@ -64,12 +64,22 @@
         <%= f.text_area "meta_keywords", :class => "thin_border long" %><br/>
       </td>
     </tr>
-    <%- end -%>
+    <% end %>
+    <% if @page.taggable? %>
+    <tr>
+      <td class="label"><%= f.label :tag_list %>*:&nbsp;</td>
+      <td class="input">
+        <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => @page %>
+      </td>
+    </tr>
+    <% end %>
     <tr>
       <td colspan="2" class="submit">
+        <% if !@page.layoutpage || @page.taggable? %>
         <p class="foot_note">
           *<%= t('pages.update.comma_seperated') %>
         </p>
+        <% end %>
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>

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

@@ -1,11 +1,11 @@
-<% content_for(:title) { @page.name } -%>
+<% content_for(:title) { @page.name } %>
 
-<%- content_for(:subnav_additions) do -%>
+<% content_for(:subnav_additions) do %>
   <label><%= t('Active Pages') %> &raquo;</label>
-  <%- @locked_pages.each do |page| -%>
-  <%- if @page == page -%>
+  <% @locked_pages.each do |page| %>
+  <% if @page == page %>
   <%= render :partial => 'page_status' %>
-  <%- else -%>
+  <% else %>
   <div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
     <%= link_to alchemy.edit_admin_page_path(page) do %>
     <span class="page_name" title="<%= page.name %>">
@@ -18,11 +18,11 @@
       </button>
     <% end %>
   </div>
-  <%- end -%>
-  <%- end -%>
-<%- end -%>
+  <% end %>
+  <% end %>
+<% end %>
 
-<%- content_for(:toolbar) do -%>
+<% content_for(:toolbar) do %>
 <div id="toolbar_buttons">
   <div class="button_with_label">
     <%= form_tag alchemy.unlock_admin_page_path(@page, :redirect_to => @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), :id => 'unlock_page_form' do %>
@@ -32,7 +32,7 @@
       <label><%= t("unlock_page") %></label>
     <% end %>
   </div>
-  <%- unless @page.layoutpage? -%>
+  <% unless @page.layoutpage? %>
   <div class="button_with_label">
     <%= form_tag alchemy.visit_admin_page_path(@page), :id => 'visit_page_form' do %>
       <button class="icon_button" title="<%= t('Visit page') %>">
@@ -41,30 +41,30 @@
       <label><%= t("Visit page") %></label>
     <% end %>
   </div>
-  <%- end -%>
+  <% end %>
   <div class="button_with_label">
     <%= link_to_overlay_window(
       render_icon('settings'),
       alchemy.configure_admin_page_path(@page),
       {
         :title => t('edit_page_properties'),
-        :size => @page.layoutpage? ? '340x150' : '410x660'
+        :size => @page.layoutpage? ? '410x150' : '410x650'
       },
       :class => :icon_button,
       :title => t('edit_page_properties')
-    ) -%>
+    ) %>
     <label><%= t('page_properties') %></label>
   </div>
-  <%- if configuration(:cache_pages) && !@page.layoutpage? -%>
+  <% if configuration(:cache_pages) && !@page.layoutpage? %>
   <div class="button_with_label">
-    <%= form_tag alchemy.publish_admin_page_path(@page), :id => 'publish_page_form' do -%>
+    <%= form_tag alchemy.publish_admin_page_path(@page), :id => 'publish_page_form' do %>
       <button class="icon_button" title="<%= t('explain_publishing') %>">
         <%= render_icon('publish') %>
       </button>
       <label><%= t("Publish page") %></label>
-    <% end -%>
+    <% end %>
   </div>
-  <%- end -%>
+  <% end %>
 </div>
 <div id="toolbar_buttons_right">
   <div class="button_with_label" id="show_preview_window">
@@ -84,34 +84,34 @@
     <label><%= t('Show Elements Window') %></label>
   </div>
 </div>
-<%- end -%>
+<% end %>
 
-<%- content_for :javascripts do -%>
+<% content_for :javascripts do %>
 <%= tinymce_javascript_tags %>
 <script type="text/javascript" charset="utf-8">
 
   Alchemy.openPreviewWindow = function() {
-    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
+    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") %>');
   }
 
   Alchemy.openElementsWindow = function() {
-    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
+    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) %>', {
       texts: {
-        title: '<%= t("Elements") -%>',
-        dirtyTitle: '<%= t("Warning!") -%>',
-        dirtyMessage: '<%= t(:element_dirty_close_window_notice) -%>',
-        okLabel: '<%= t("Yes") -%>',
-        cancelLabel: '<%= t("No") -%>'
+        title: '<%= t("Elements") %>',
+        dirtyTitle: '<%= t("Warning!") %>',
+        dirtyMessage: '<%= t(:element_dirty_close_window_notice) %>',
+        okLabel: '<%= t("Yes") %>',
+        cancelLabel: '<%= t("No") %>'
       },
       toolbarButtons: [
         {
-          title: '<%= t("New Element") -%>',
-          label: '<%= t("New Element") -%>',
+          title: '<%= t("New Element") %>',
+          label: '<%= t("New Element") %>',
           iconClass: 'new_element',
           onClick: function() {
             Alchemy.openWindow(
-              '<%= alchemy.new_admin_element_path(:page_id => @page.id) -%>',
-              '<%= t("New Element") -%>',
+              '<%= alchemy.new_admin_element_path(:page_id => @page.id) %>',
+              '<%= t("New Element") %>',
               320,
               120,
               false,
@@ -121,14 +121,14 @@
           }
         },
         {
-          title: '<%= t("Clipboard") -%>',
-          label: '<%= t("Show clipboard") -%>',
-          iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" -%>',
+          title: '<%= t("Clipboard") %>',
+          label: '<%= t("Show clipboard") %>',
+          iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
             Alchemy.openWindow(
-              '<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") -%>',
-              '<%= t("Clipboard") -%>',
+              '<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") %>',
+              '<%= t("Clipboard") %>',
               380,
               270,
               false,
@@ -138,12 +138,12 @@
           }
         },
         {
-          title: '<%= t("Show trash") -%>',
-          label: '<%= t("Show trash") -%>',
-          iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" -%>',
+          title: '<%= t("Show trash") %>',
+          label: '<%= t("Show trash") %>',
+          iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
           buttonId: 'element_trash_button',
           onClick: function() {
-            Alchemy.openTrashWindow(<%= @page.id %>, '<%= t("Trash") -%>');
+            Alchemy.openTrashWindow(<%= @page.id %>, '<%= t("Trash") %>');
           }
         }
       ]
@@ -181,4 +181,4 @@
   });
 
 </script>
-<%- end -%>
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="autocomplete_tag_list">
+  <%= f.label :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list_#{object.id}", :title => t(:tag_list) %>
+  <%= f.autocomplete_field(
+    :tag_list,
+    alchemy.autocomplete_admin_tags_path,
+    :data => {:delimiter => ', '},
+    :id => "autocomplete_tag_list_#{object.id}"
+  ) %>
+</div>

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

@@ -13,7 +13,7 @@
     <tr>
       <td class="label"><%= f.label :tag_list %>*</td>
       <td class="input">
-        <%= f.text_field :tag_list, :class => "thin_border long" %>
+        <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => @picture %>
       </td>
     </tr>
     <tr>

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

@@ -22,9 +22,18 @@
       </td>
     </tr>
     <tr>
-      <td class="label"><%= label_tag :pictures_tag_list, t('Tags') %></td>
+      <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" %>
+        <div class="autocomplete_tag_list">
+          <%= label_tag :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list", :title => t(:tag_list) %>
+          <%= autocomplete_field_tag(
+            :pictures_tag_list,
+            @pictures.collect(&:tag_list).flatten.uniq.join(', '),
+            alchemy.autocomplete_admin_tags_path,
+            :data => {:delimiter => ', '},
+            :id => "autocomplete_tag_list"
+          ) %>
+        </div>
       </td>
     </tr>
     <tr>

data/app/views/alchemy/admin/tags/_radio_tag.html.erb

@@ -0,0 +1,6 @@
+<li class="<%= cycle('even', 'odd') %>" name="<%= radio_tag.name.downcase %>">
+  <%= radio_button_tag name + "[merge_to]", radio_tag.id, false, :id => radio_tag.name + "_tag_list" %>
+  <label for="<%= radio_tag.name + "_tag_list" %>">
+    <%= radio_tag.name %>
+  </label>
+</li>

data/app/views/alchemy/admin/tags/_tag.html.erb

@@ -0,0 +1,29 @@
+<tr class="<%= cycle('even', 'odd') %>">
+  <td class="icon"><%= render_icon :tag %></td>
+  <td class="name"><%= tag.name %></td>
+  <td class="count">
+    <%= tag.taggings.collect(&:taggable).collect { |t| t.class.model_name.human }.uniq.join(', ') %>
+  </td>
+  <td class="count"><%= tag.taggings.count %></td>
+  <td class="tools">
+    <%= link_to_overlay_window(
+      "",
+      edit_admin_tag_path(tag),
+      {
+        :title => t(:edit_tag),
+        :size => '380x385'
+      },
+      {
+        :title => t(:edit_tag),
+        :class => 'icon tag_edit'
+      }
+    ) %>
+    <%= link_to_confirmation_window(
+      '',
+      t(:do_you_really_want_to_delete_this_tag?),
+      admin_tag_path(tag),
+      :title => t(:delete_tag),
+      :class => "icon tag_delete"
+    ) %>
+  </td>
+</tr>

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

@@ -0,0 +1,41 @@
+<h2 class="with_padding"><%= t(:you_can_rename_this_tag) %></h2>
+<%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id}, :html => {:method => :put}, :remote => true do |f| %>
+  <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
+    <tr>
+      <td class="label medium">
+        <%= f.label :name, "Name" %>
+      </td>
+      <td class="input">
+        <%= f.text_field :name, :class => "thin_border very_long" %>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" class="submit">
+        <%= f.button t(:rename), :class => "button" %>
+      </td>
+    </tr>
+  </table>
+<% end %>
+<% if @tags.any? -%>
+  <h2 class="with_padding"><%= t(:or_replace_it_with_an_existing_tag) %>:</h2>
+  <%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id, :replace => true}, :html => {:method => :put, :style => "clear: both"}, :remote => true do |f| %>
+    <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
+      <tr>
+        <td class="label medium">
+          <label>Tags</label>
+        </td>
+        <td class="input" id="tags_tag_list">
+          <%= js_filter_field :onkeyup => "Alchemy.ListFilter('#tag_list li')" %>
+          <ul id="tag_list" class="tags">
+            <%= render :partial => "radio_tag", :collection => @tags, :locals => {:name => "tag"} %>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" class="submit">
+          <%= f.button t(:replace), :class => "button", :id => "tag_replace_button" %>
+        </td>
+      </tr>
+    </table>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,46 @@
+<% content_for :toolbar do %>
+  <div id="toolbar_buttons">
+    <div class="button_with_label">
+      <%= link_to_overlay_window(
+        content_tag('span', '', :class => 'icon tag_add'),
+        new_admin_tag_path,
+        {
+          :title => t('New Tag'),
+          :size => '310x210'
+        },
+        :title => t('New Tag'),
+        :class => 'icon_button'
+      ) %><br />
+      <label><%= t('New Tag') %></label>
+    </div>
+  </div>
+  <%= render :partial => 'alchemy/admin/partials/search_form' %>
+<% end %>
+
+<div id="archive_all">
+  <% if @tags.any? %>
+
+  <table class="list" id="tag_list">
+    <tr class="legend">
+      <th class="icon"></th>
+      <th class="name"><%= ActsAsTaggableOn::Tag.human_attribute_name(:name) %></th>
+      <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></th>
+      <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count) %></th>
+      <th class="tools"></th>
+    </tr>
+    <%= render :partial => 'tag', :collection => @tags %>
+  </table>
+
+  <%= render 'alchemy/admin/partials/pagination_links', :items => @tags %>
+
+  <% else %>
+
+  <%= render_message do %>
+    <h2><%= t('No Tags found') %></h2>
+    <% if params[:query].blank? %>
+      <p><%= t(:tags_get_created_if_used_the_first_time) %></p>
+    <% end %>
+  <% end %>
+
+  <% end %>
+</div>

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

@@ -0,0 +1,16 @@
+<%= form_for [:admin, @tag], :as => :tag, :url => admin_tags_path, :html => {:id => 'new_tag'}, :remote => true do |form| %>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t(:tags_get_created_if_used_the_first_time) %>
+  </div>
+  <div id="errors" style="display: none"></div>
+  <table>
+    <tr>
+      <td class="label"><%= form.label :name %></td>
+      <td class="input"><%= form.text_field :name, :class => 'input_field' %></td>
+    </tr>
+    <tr>
+      <td colspan="2" class="submit"><%= form.button t('save'), :name => nil, :class => 'button' %></td>
+    </tr>
+  </table>
+<% end %>

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

@@ -1,47 +1,55 @@
 <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', :autofocus => true -%></td>
+    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, :class => 'alchemy_selectbox long', :autofocus => true -%></td>
   </tr>
   <tr>
     <td class="label"><%= f.label 'firstname' %></td>
-    <td class="input"><%= f.text_field 'firstname', :class => 'thin_border' %></td>
+    <td class="input"><%= f.text_field 'firstname', :class => 'thin_border long' %></td>
   </tr>
   <tr>
     <td class="label"><%= f.label 'lastname' %></td>
-    <td class="input"><%= f.text_field 'lastname', :class => 'thin_border' %></td>
+    <td class="input"><%= f.text_field 'lastname', :class => 'thin_border long' %></td>
   </tr>
   <tr>
     <td class="label mandatory"><%= f.label 'login' %></td>
-    <td class="input"><%= f.text_field 'login', :class => 'thin_border', :required => true %></td>
+    <td class="input"><%= f.text_field 'login', :class => 'thin_border long', :required => true, :autofocus => true %></td>
   </tr>
   <tr>
     <td class="label mandatory"><%= f.label 'email' %></td>
-    <td class="input"><%= f.email_field 'email', :class => 'thin_border', :required => true %></td>
+    <td class="input"><%= f.email_field 'email', :class => 'thin_border long', :required => true %></td>
   </tr>
   <tr>
     <td class="label"><%= f.label 'language' %></td>
-    <td class="select"><%= f.select 'language', translations_for_select, {}, {:class => 'alchemy_selectbox'} %></td>
+    <td class="select"><%= f.select 'language', translations_for_select, {}, {:class => 'alchemy_selectbox long'} %></td>
   </tr>
   <tr>
     <td class="label mandatory"><%= f.label 'password' %></td>
-    <td class="input mandatory"><%= f.password_field 'password', :class => 'thin_border', :autocomplete => "off", :required => action_name == 'signup' %></td>
+    <td class="input mandatory"><%= f.password_field 'password', :class => 'thin_border long', :autocomplete => "off", :required => action_name == 'signup' %></td>
   </tr>
   <tr>
     <td class="label mandatory"><%= f.label 'password_confirmation' %></td>
-    <td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border', :autocomplete => "off", :required => action_name == 'signup' %></td>
+    <td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border long', :autocomplete => "off", :required => action_name == 'signup' %></td>
   </tr>
   <% if action_name == 'signup' %>
   <%= f.hidden_field :role %>
   <% elsif permitted_to? :update_role %>
   <tr>
     <td class="label"><%= f.label 'role' %></td>
-    <td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, {:class => 'alchemy_selectbox'} %></td>
+    <td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, {:class => 'alchemy_selectbox long'} %></td>
+  </tr>
+  <% end %>
+  <% unless action_name == 'signup' %>
+  <tr>
+    <td class="label"><%= f.label :tag_list %></td>
+    <td class="input">
+      <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => @user %>
+    </td>
   </tr>
   <% end %>
   <tr>
     <td>&nbsp;</td>
-    <td class="checkbox">
+    <td class="checkbox long">
       <%= check_box_tag('send_credentials', true, @user.new_record?) %>
       <%= label_tag('send_credentials', t('Send email with credentials')) %>
     </td>