alchemy_cms 2.9.1 → 3.0.0.rc5

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -5,7 +5,7 @@
       controller: 'essence_files',
       action: 'assign',
       attachment_id: file_to_assign.id,
-      id: @content.id,
+      content_id: @content.id,
       options: @options.to_json
     },
     remote: true,

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -32,4 +32,4 @@
   <%= render :partial => 'alchemy/admin/attachments/attachment', :collection => @attachments %>
 </table>
 
-<%= paginate @attachments %>
+<%= paginate @attachments, theme: 'alchemy' %>

data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb

@@ -5,7 +5,7 @@
   </div>
 <% else %>
   <ul>
-    <%= render :partial => 'file_to_assign', :collection => @attachments %>
+    <%= render partial: 'file_to_assign', collection: @attachments %>
   </ul>
-  <%= paginate @attachments, :remote => true %>
+  <%= paginate @attachments, theme: 'alchemy', remote: true %>
 <% end %>

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

@@ -1,4 +1,7 @@
-jQuery('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) %>');
-Alchemy.SelectBox('#filter_bar');
-Alchemy.overlayObserver('#alchemy_window_body');
-Alchemy.ListFilter('#alchemy_window_body');
+(function() {
+  var dialog = Alchemy.currentDialog();
+  dialog.dialog_body.html('<%= j render("archive_overlay") %>');
+  Alchemy.SelectBox('#filter_bar');
+  Alchemy.watchForDialogs(dialog.dialog_body);
+  Alchemy.ListFilter(dialog.dialog_body);
+})();

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

@@ -1,9 +1,11 @@
-(function($) {
-<%- if @while_assigning -%>
-    $('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay", :formats => [:html])) -%>');
-<%- else -%>
-  $('#archive_all').html('<%= escape_javascript(render(:partial => "files_list")) %>');
-  Alchemy.growl('<%= @message %>');
-  Alchemy.overlayObserver('#archive_all');
-<%- end -%>
-})(jQuery);
+<% if @while_assigning -%>
+
+Alchemy.currentDialog().dialog_body.html('<%= j render("archive_overlay", formats: [:html]) %>');
+
+<% else -%>
+
+$('#archive_all').html('<%= j render("files_list") %>');
+Alchemy.growl('<%= j @message %>');
+Alchemy.watchForDialogs('#archive_all');
+
+<% end -%>

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

@@ -1,27 +1,10 @@
-<%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}, :remote => true) do |f| -%>
-  <div id="errors"></div>
-  <table>
-    <tr>
-      <td class="label"><%= f.label :name %></td>
-      <td class="input"><%= f.text_field :name, :class => 'thin_border long', :autofocus => true %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label :file_name %>*</td>
-      <td class="input">
-        <%= f.text_field :file_name, :class => 'thin_border long' %>
-        <p class="foot_note"><%= _t(:attachment_filename_notice) %></p>
-      </td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label :tag_list %></td>
-      <td class="input">
-        <%= render 'alchemy/admin/partials/autocomplete_tag_list', :object => @attachment, :f => f %>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button _t(:save), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+<%= alchemy_form_for([:admin, @attachment],
+  url: {action: :update, query: params[:query], page: params[:page]}) do |f| -%>
+  <%= f.input :name, input_html: {autofocus: true} %>
+  <%= f.input :file_name, input_html: {autofocus: true}, hint: _t(:attachment_filename_notice) %>
+  <div class="input string">
+    <%= f.label :tag_list %>
+    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+  </div>
+  <%= f.submit _t(:save) %>
 <% end %>

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

@@ -4,15 +4,15 @@
     {
       icon: 'upload',
       url: alchemy.new_admin_attachment_path,
-      hotkey: 'alt-n',
-      overlay_options: {
+      hotkey: 'alt+n',
+      dialog_options: {
         title: _t(:upload_file),
-        size: '540x550'
+        size: '540x515'
       },
       title: _t(:upload_file),
       class: 'icon_button',
       label: _t(:upload_file),
-      if_permitted_to: [:new, :alchemy_admin_attachments]
+      if_permitted_to: [:create, Alchemy::Attachment]
     }
   ]
 ) %>

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

@@ -1,11 +1,14 @@
-<%= form_for([:admin, @attachment], :html => {:multipart => true}) do |f| %>
-  <%= render(
-    :partial => "alchemy/admin/partials/upload_form",
-    :locals => {
-      :file_types => configuration(:uploader)['allowed_filetypes']['attachments'],
-      :file_types_description => _t(:documents),
-      :model_name => 'attachment',
-      :item_type => _t(:files)
-    }
-  ) %>
+<%= form_for [:admin, @attachment], html: {multipart: true} do |f| %>
+  <%= render 'alchemy/admin/partials/upload_form', {
+      file_types: configuration(:uploader)['allowed_filetypes']['attachments'],
+      file_types_description: _t(:documents),
+      redirect_url: admin_attachments_path(
+        swap: @swap,
+        element_id: @element ? @element.id : nil,
+        content_id: @content ? @content.id : nil,
+        options: @options ? @options.to_json : nil),
+      model_name: 'attachment',
+      file_attribute: 'file',
+      item_type: _t(:files)
+    } %>
 <% end %>

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -1,3 +1,3 @@
 <iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 style="width: 100%; min-height: 90%">
   Your browser does not support frames.
-</iframe>
+</iframe>

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

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

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

@@ -1,23 +1,22 @@
-<div class="with_padding">
-  <%- if @clipboard_items.blank? -%>
-  <div class="info">
-    <%= render_icon('info') %>
-    <%= _t('No items in your clipboard') %>
-  </div>
-  <%- else -%>
-  <div id="clipboard_items">
-    <ul>
-      <%- @clipboard_items.each do |item| -%>
-      <% 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>
-      </li>
-      <%- end -%>
-    </ul>
-    <p>
-      <%= 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 -%>
+<%- if @clipboard_items.blank? -%>
+<div class="info">
+  <%= render_icon('info') %>
+  <%= _t('No items in your clipboard') %>
 </div>
+<%- else -%>
+<div id="clipboard_items">
+  <ul>
+    <%- @clipboard_items.each do |item| -%>
+    <% item_class = item.class.name.demodulize.underscore.pluralize %>
+    <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
+      <%= render_icon("clipboard_#{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>
+    </li>
+    <%- end -%>
+  </ul>
+  <p>
+    <%= link_to_confirm_dialog(_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/clipboard/insert.js.erb

@@ -1,14 +1,19 @@
-(function($) {
-
-<%- if params[:remove] -%>
-  $(".element_editor[data-element-id='<%= @item.id -%>']").remove();
-<%- if @item.class.to_s == 'Element' -%>
-  $('#element_area .sortable_cell').sortable('refresh');
-<%- end -%>
-  Alchemy.growl('<%= escape_javascript _t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>');
-<%- else -%>
-  Alchemy.growl('<%= escape_javascript _t("item copied to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>')
-<%- end -%>
-  $('#clipboard_button .icon.clipboard').addClass('full');
-
-})(jQuery);
+<% if params[:remove] -%>
+
+$(".element_editor[data-element-id='<%= @item.id %>']").remove();
+
+<% if @item.class.to_s == 'Element' -%>
+
+$('#element_area .sortable_cell').sortable('refresh');
+
+<% end -%>
+
+Alchemy.growl('<%= j _t("item moved to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>');
+
+<% else -%>
+
+Alchemy.growl('<%= j _t("item copied to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
+
+<% end -%>
+
+$('#clipboard_button .icon.clipboard').addClass('full');

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

@@ -1,21 +1,19 @@
-<div class="content_editor missing" id="element_<%= element.id %>_content_missing">
+<div class="content_editor missing" data-element-<%= element.id %>-missing-content="<%= name %>">
   <label><%= Alchemy::Content.translated_label_for(name, element.name) %></label>
   <p>
     <%= render_icon('warning') %>
     <%= _t(:content_not_found) %>
-    <%= link_to(
-      _t(:create),
+    <%= link_to _t(:create),
       alchemy.admin_contents_path(
-        :content => {
-          :element_id => element.id,
-          :name => name
+        content: {
+          element_id: element.id,
+          name: name
         },
-        :was_missing => true,
-        :options => options.to_json
+        was_missing: true,
+        options: options.to_json
       ),
-      :method => 'post',
-      :remote => true,
-      :class => 'small button'
-    ) %>
+      'data-create-missing-content' => true,
+      class: 'small button'
+    %>
   </p>
 </div>

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

@@ -1,60 +1,56 @@
-(function() {
-
 <% if params[:was_missing] %>
 
-  $("#element_<%= @element.id %>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
-      locals: @locals
-    )
-  ) %>');
+$("[data-element-<%= @element.id %>-missing-content=\"<%= @content.name %>\"]").replaceWith('<%= j(
+  render(
+    partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
+    locals: @locals
+  )
+) %>');
 
 <% else %>
 
-  $("<%= @content_dom_id %>").before('<%= escape_javascript(
-    render(
-      partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
-      locals: @locals
-    )
-  ) %>');
-  Alchemy.Buttons.enable();
-  Alchemy.growl('<%= _t("Successfully added content") % {content: @content.name_for_label} %>')
+$("<%= @content_dom_id %>").before('<%= j(
+  render(
+    partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
+    locals: @locals
+  )
+) %>');
+Alchemy.Buttons.enable();
+Alchemy.growl('<%= j _t("Successfully added content") % {content: @content.name_for_label} %>')
 
 <% end %>
 
 <% if @content.essence_type == "Alchemy::EssencePicture" %>
 
-  <% if @content.ingredient %>
-  $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
-  <% end %>
+<% if @content.ingredient %>
+$('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
+<% end %>
 
-  <% if @gallery_pictures %>
+<% if @gallery_pictures %>
 
-  <% if @gallery_pictures.size > 1 %>
-  $('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture');
-  <% end %>
+<% if @gallery_pictures.size > 1 %>
+$('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture');
+<% end %>
 
-  <% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>
-  $("#add_picture_<%= @element.id %>").remove();
-  <% end %>
+<% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>
+$("#add_picture_<%= @element.id %>").remove();
+<% end %>
 
-  Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
+Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
 
-  <% end %>
+<% end %>
 
 <% elsif @content.essence_type == "Alchemy::EssenceDate" %>
 
-  Alchemy.Datepicker('#element_<%= @element.id %>');
+Alchemy.Datepicker('#element_<%= @element.id %>');
 
 <% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
 
-  Alchemy.Tinymce.initEditor(<%= @content.id %>);
+Alchemy.Tinymce.initEditor(<%= @content.id %>);
 
 <% end %>
 
-  Alchemy.reloadPreview();
-  Alchemy.closeCurrentWindow();
-  Alchemy.SelectBox("#element_<%= @element.id %>");
-  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
-
-})()
+Alchemy.reloadPreview();
+Alchemy.closeCurrentDialog();
+Alchemy.SelectBox("#element_<%= @element.id %>");
+Alchemy.watchForDialogs('#<%= @content.dom_id %>');

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

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

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

@@ -1,23 +1,11 @@
-<%= form_for [:admin, @content], :remote => true do |f| %>
-  <%= f.error_messages %>
+<%= alchemy_form_for [:admin, @content] do |f| %>
   <%= f.hidden_field :element_id %>
-  <table>
-    <tr>
-      <td class="label"><%= f.label :name %></td>
-      <td class="select">
-        <%= f.select('name', @contents.map { |content|
-          [
-            _t(content['name'], scope: 'content_names', default: content['name'].humanize),
-            content['name']
-          ]
-        }, {}, {:class => 'alchemy_selectbox'}) %>
-      </td>
-    </tr>
-    <tr>
-      <td class="submit" colspan="2">
-        <%= hidden_field_tag('options', @options) %>
-        <%= f.button _t(:create), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+  <%= hidden_field_tag('options', @options.to_json) %>
+  <%= f.input :name, collection: @contents.map { |content|
+      [
+        _t(content['name'], scope: 'content_names', default: content['name'].humanize),
+        content['name']
+      ]
+    }, include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.submit _t(:create) %>
 <% end %>

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

@@ -1,6 +1,3 @@
-Alchemy.growl('<%= escape_javascript(@notice) %>');
-Alchemy.SortableContents(
-  '#element_area .picture_gallery_images',
-  '<%= form_authenticity_token %>'
-);
+Alchemy.growl('<%= j @notice %>');
+Alchemy.SortableContents('#element_area .picture_gallery_images', '<%= form_authenticity_token %>');
 Alchemy.reloadPreview();

data/app/views/alchemy/admin/dashboard/help.html.erb

@@ -0,0 +1,21 @@
+<h2><%= _t('Global shortcuts') %></h2>
+<ul class="shortcuts">
+  <li><kbd>?</kbd><%= _t('Open help window', scope: 'help.shortcuts') %></li>
+  <li><kbd>esc</kbd><%= _t('Close current dialog', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>q</kbd><%= _t('Open logout dialog', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>f</kbd><%= _t('Focus search field', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Create a new record', scope: 'help.shortcuts') %></li>
+</ul>
+<h2><%= _t('Page edit shortcuts') %></h2>
+<ul class="shortcuts">
+  <li><kbd>alt</kbd><kbd>i</kbd><%= _t('Show page infos', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Create new element', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>e</kbd><%= _t('Edit page properties', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>r</kbd><%= _t('Reload the preview', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>x</kbd><%= _t('Leave the page', scope: 'help.shortcuts') %></li>
+</ul>
+<h2><%= _t('Library shortcuts') %></h2>
+<ul class="shortcuts">
+  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Open upload form', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>a</kbd><%= _t('Select all pictures', scope: 'help.shortcuts') %></li>
+</ul>

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

@@ -5,27 +5,25 @@
       label: _t(:info),
       url: alchemy.dashboard_info_path,
       title: _t(:info),
-      overlay_options: {
+      dialog_options: {
         title: _t(:info),
-        size: "420x360"
+        size: "420x380"
       },
       if_permitted_to: [:info, :alchemy_admin_dashboard],
-     hotkey: 'alt-i'
+      hotkey: 'alt+i'
     }
   ],
   search: false
 ) %>
 
 <div id="dashboard">
-  <% if current_alchemy_user.respond_to?(:name) %>
   <h1>
     <% if @first_time -%>
-    <%= _t(:welcome_note, name: current_alchemy_user.name) %>
+    <%= _t(:welcome_note, name: current_alchemy_user.try(:name)) %>
     <% else -%>
-    <%= _t(:welcome_back_note, name: current_alchemy_user.name) %>
+    <%= _t(:welcome_back_note, name: current_alchemy_user.try(:name)) %>
     <% end -%>
   </h1>
-  <% end %>
   <% if @last_sign_at %>
   <p>
     <small><%= _t('Your last login was on %{time}', time: l(@last_sign_at)) %></small>