alchemy_cms 2.9.1 → 3.0.0.rc5

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

@@ -1,5 +1,3 @@
-(function($) {
-  $('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
-  Alchemy.overlayObserver('#page_<%= @page.id -%>');
-  Alchemy.Spinner.watch('#page_<%= @page.id -%>');
-})(jQuery);
+$('#page_<%= @page.id -%>').replaceWith('<%= j render("page", page: @page) %>');
+Alchemy.watchForDialogs('#page_<%= @page.id %>');
+Alchemy.Spinner.watch('#page_<%= @page.id %>');

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

@@ -21,7 +21,7 @@
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
-  <% permitted_to?(:flush, :alchemy_admin_pages) do %>
+  <% if can?(:flush, Alchemy::Page) %>
   <div class="button_with_label">
     <%= link_to(
       render_icon('flush'),
@@ -34,7 +34,7 @@
     <label><%= _t('Flush page cache') %></label>
   </div>
   <% end %>
-  <% permitted_to?(:sort, :alchemy_admin_pages) do %>
+  <% if can?(:sort, Alchemy::Page) %>
   <div class="button_with_label" id="page_sorting_button">
     <%= link_to(
       render_icon('sort'),
@@ -49,12 +49,12 @@
   </div>
   <% end %>
   <div class="button_with_label" id="clipboard_button">
-    <%= link_to_overlay_window(
+    <%= link_to_dialog(
       render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
       alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
       {
         :title => _t('Clipboard'),
-        :size => '380x270'
+        :size => '380x305'
       },
       :class => 'icon_button',
       :title => _t('Show clipboard')
@@ -96,17 +96,15 @@
 
   <%= render :partial => 'sitemap' %>
 
+<% elsif can?(:create, Alchemy::Page) %>
+
+  <%= render partial: 'create_language_form' %>
+
 <% 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>
+  <%= render_message :warn do %>
+    <h2>No language root page found.</h2>
+    <p>Please ask the admin to create one.</p>
   <% end %>
 
 <% end %>

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

@@ -1,32 +1,29 @@
-<div class="with_padding">
-  <table>
-    <tr>
-      <td class="label"><label><%= _t(:page_type) %></label></td>
-      <td class="value"><p><%= @page.layout_display_name %></p></td>
-    </tr>
-    <tr>
-      <td class="label"><label><%= _t(:page_status) %></label></td>
-      <td class="value">
-        <p><%= combined_page_status(@page) %></p>
-      </td>
-    </tr>
-    <tr>
-      <td class="label"><label><%= _t(:page_was_created) %></label></td>
-      <td class="value">
-        <p><%= _t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
-      </td>
-    </tr>
-    <tr>
-      <td class="label"><label><%= _t(:page_was_updated) %></label></td>
-      <td class="value">
-        <p><%= _t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
-      </td>
-    </tr>
-    <%- if @page.locked? -%>
-      <tr>
-        <td class="label"><label><%= _t(:currently_edited_by) %></label></td>
-        <td class="value"><p><%= @page.locker_name %></p></td>
-      </tr>
-    <% end %>
-  </table>
+<div class="resource_info">
+  <% if @page.has_hint? %>
+  <%= render_message do %>
+    <%= @page.hint %>
+  <% end %>
+  <% end %>
+  <div class="value">
+    <label><%= _t(:page_type) %></label>
+    <p><%= @page.layout_display_name %></p>
+  </div>
+  <div class="value">
+    <label><%= _t(:page_status) %></label>
+    <p><%= combined_page_status(@page) %></p>
+  </div>
+  <div class="value">
+    <label><%= _t(:page_was_created) %></label>
+    <p><%= _t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
+  </div>
+  <div class="value">
+    <label><%= _t(:page_was_updated) %></label>
+    <p><%= _t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
+  </div>
+  <% if @page.locked? %>
+  <div class="value">
+    <label><%= _t(:currently_edited_by) %></label>
+    <p><%= @page.locker_name %></p>
+  </div>
+  <% end %>
 </div>

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

@@ -3,25 +3,14 @@
     <li><a href="#overlay_tab_internal_link"><%= _t('link_overlay_tab_label.internal') %></a></li>
     <li><a href="#overlay_tab_external_link"><%= _t('link_overlay_tab_label.external') %></a></li>
     <li><a href="#overlay_tab_file_link"><%= _t('link_overlay_tab_label.file') %></a></li>
-    <%- if configuration(:mailer)[:contactform_linking] -%>
-    <li><a href="#overlay_tab_contactform_link"><%= _t('link_overlay_tab_label.contactform') %></a></li>
-    <%- end -%>
   </ul>
-  <div class="with_padding">
-    <%= render :partial => 'internal_link' %>
-    <%= render :partial => 'external_link' %>
-    <%= render :partial => 'file_link' %>
-    <%- if configuration(:mailer)[:contactform_linking] -%>
-    <%= render :partial => 'contactform_links' %>
-    <%- end -%>
+  <div id="overlay_tab_internal_link">
+    <%= render partial: 'internal_link' %>
+  </div>
+  <div id="overlay_tab_external_link">
+    <%= render partial: 'external_link' %>
+  </div>
+  <div id="overlay_tab_file_link">
+    <%= render partial: 'file_link' %>
   </div>
 </div>
-
-<script type="text/javascript" charset="utf-8">
-  jQuery(function($) {
-    $( "#overlay_tabs" ).tabs();
-  });
-  if (Alchemy.LinkOverlay.current.linked_element) {
-    Alchemy.LinkOverlay.selectTab();
-  }
-</script>

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

@@ -1,50 +1,26 @@
 <%- if @clipboard_items.blank? -%>
-<%= render :partial => 'new_page_form' %>
+  <%= render 'new_page_form' %>
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
     <li><a href="#create_page_tab"><%= _t('New page') %></a></li>
     <li><a href="#paste_page_tab"><%= _t('Paste from clipboard') %></a></li>
   </ul>
-  <div id="errors"></div>
   <div id="create_page_tab">
-    <%= render :partial => 'new_page_form' %>
+    <%= render 'new_page_form' %>
   </div>
   <div id="paste_page_tab">
-    <%= form_for([:admin, @page], :remote => true, :html => {:id => 'paste_page_form'}) do |f| %>
+    <%= alchemy_form_for [:admin, @page] do |f| %>
       <%= f.hidden_field(:parent_id) %>
-      <table id="paste_page_form">
-        <tr>
-          <td class="label">
-            <label for="paste_from_clipboard"><%= _t("Page") %></label>
-          </td>
-          <td class="select">
-            <%= clipboard_select_tag(@clipboard_items) %>
-          </td>
-        </tr>
-        <tr>
-          <td class="label">
-            <%= f.label :name %>
-          </td>
-          <td class="input">
-            <%= f.text_field(:name, :size => 15, :class => "thin_border") %>
-          </td>
-        </tr>
-        <tr>
-          <td class="label">&nbsp;</td>
-          <td class="submit">
-            <%= f.button _t(:paste), :class => 'button', :name => nil %>
-          </td>
-        </tr>
-      </table>
+      <div class="input select">
+        <label for="paste_from_clipboard" class="control-label"><%= _t("Page") %></label>
+        <%= select_tag 'paste_from_clipboard',
+          clipboard_select_tag_options(@clipboard_items),
+          class: 'alchemy_selectbox' %>
+      </div>
+      <%= f.input :name %>
+      <%= f.submit _t(:paste) %>
     <% end %>
   </div>
 </div>
-<script type="text/javascript" charset="utf-8">
-
-  jQuery(function() {
-    jQuery("#overlay_tabs").tabs();
-  });
-
-</script>
 <%- end -%>

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

@@ -1 +1 @@
-<%= render_page_layout %>
+<%= render_page_layout %>

data/app/views/alchemy/admin/pages/sort.js.erb

@@ -1,7 +1,5 @@
-(function($) {
-  $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
-  $('#sort_panel').show();
-  $('#sitemap_heading').css({'padding-top': 102});
-  Alchemy.PageSorter.init();
-  Alchemy.pleaseWaitOverlay(false);
-})(jQuery);
+$('#sitemap').replaceWith('<%= j render("sitemap") %>');
+$('#sort_panel').show();
+$('#sitemap_heading').css({'padding-top': 102});
+Alchemy.PageSorter.init();
+Alchemy.pleaseWaitOverlay(false);

data/app/views/alchemy/admin/pages/update.js.erb

@@ -1,38 +1,37 @@
 (function() {
+  var $page;
 
-Alchemy.growl("<%= @notice -%>");
+  Alchemy.growl("<%= j @notice %>");
 
-<% if @old_page_layout != @page.page_layout %>
+<% if @old_page_layout != @page.page_layout -%>
   Alchemy.ElementsWindow.reload();
-  Alchemy.growl('<%= _t(:page_layout_changed_notice) %>');
-<% end %>
+  Alchemy.growl('<%= j _t(:page_layout_changed_notice) %>');
+<% end -%>
 
-<% if @while_page_edit %>
+<% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
-  $('#page_<%= @page.id %>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
+  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("page_status") %>');
 
-<% else %>
+<% else -%>
 
-  var $page;
-  $('#page_<%= @page.id %>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
+  $('#page_<%= @page.id %>').replaceWith('<%= j render("page", page: @page) %>');
   $page = $('#page_<%= @page.id %>');
-  Alchemy.overlayObserver($page);
+  Alchemy.watchForDialogs($page);
 
-  <% if @page.locked? && @page.locker == current_alchemy_user %>
-    $('#locked_page_<%= @page.id %> > a').html('<%= @page.name -%>');
-  <% end %>
+  <% if @page.locked? && @page.locker == current_alchemy_user -%>
+    $('#locked_page_<%= @page.id %> > a').html('<%= @page.name %>');
+  <% end -%>
 
-  <% if @page.restricted? %>
+  <% if @page.restricted? -%>
     $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
-  <% elsif @page.redirects_to_external? %>
+  <% elsif @page.redirects_to_external? -%>
     $('span.redirect_url', $page).html('&raquo; <%= _t("Redirects to") %>: <%= h @page.urlname %>');
-  <% else %>
+  <% else -%>
     $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
-  <% end %>
-
-<% end %>
+  <% end -%>
 
-Alchemy.closeCurrentWindow();
+<% end -%>
 
+  Alchemy.closeCurrentDialog();
 })()

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

@@ -1,9 +1 @@
-<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>
+<%= f.text_field :tag_list, data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>

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

@@ -1,22 +1,11 @@
 <div class="button_with_label">
-  <%= select_tag(
-    'language',
-    options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
-    :id => 'language_tree_select',
-    :class => 'alchemy_selectbox short'
-  ) %>
+  <%= form_tag switch_language_admin_pages_path, method: 'get' do %>
+    <%= select_tag(
+      'language_id',
+      options_for_select(@languages.map { |l| [l.name, l.id] }, Alchemy::Language.current.id),
+      class: 'alchemy_selectbox short',
+      data: {'auto-submit' => true}
+    ) %>
+  <% end %>
   <label><%= _t("Language tree") %></label>
 </div>
-
-<% content_for :javascripts do %>
-<script type="text/javascript" charset="utf-8">
-  (function($) {
-    $('#language_tree_select').on('change', function() {
-      Alchemy.pleaseWaitOverlay();
-      $.get('<%= switch_language_admin_pages_path %>', {
-        language_id: this.value
-      });
-    });
-  })(jQuery);
-</script>
-<% end %>

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

@@ -1,4 +1,4 @@
-<% if permitted_to? *navigate_module(navigation) %>
+<% if can? *navigate_module(navigation) %>
   <%= link_to url_for_module(alchemy_module), class: main_navigation_css_classes(navigation) do %>
     <% if navigation["image"] %>
     <%= image_tag(navigation["image"]) %>

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

@@ -1,6 +1,6 @@
 <% entries.each do |entry| %>
   <% entry.stringify_keys! %>
-  <% if permitted_to? *navigate_module(entry) %>
+  <% if can? *navigate_module(entry) %>
   <div class="subnavi_tab<%= entry_active?(entry) ? ' active' : nil %>">
     <%= link_to _t(entry['name']), url_for_module_sub_navigation(entry) %>
   </div>

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

@@ -1,9 +1,9 @@
 <div class="button_with_label<%= options[:active] ? ' active' : '' %>">
-<% if options[:overlay] %>
-  <%= link_to_overlay_window(
+<% if options[:dialog] %>
+  <%= link_to_dialog(
     render_icon(options[:icon]),
     options[:url],
-    options[:overlay_options],
+    options[:dialog_options],
     {
       class: 'icon_button',
       title: options[:title],

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

@@ -7,79 +7,61 @@
     <li id="explain_step3"><%= _t('explain_upload.step3') %></li>
     <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>
-  <%- end -%>
+  <% 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>
+  <% end %>
   <small>*<%= _t('explain_upload.footnote', name: item_type) %></small>
 </div>
 
-<%= render 'alchemy/admin/partials/flash_upload' %>
-
-<div class="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>
+<div class="upload-container">
+  <%= label_tag :fileupload, _t(:browse) %>
+  <input name="<%= model_name %>[<%= file_attribute %>]" id="fileupload" type="file" multiple value="<%= _t(:browse) %>">
+  <div id="dropbox"><%= _t('Or drag files over here') %></div>
 </div>
 
-<div id="dropbox"><%= _t('Or drag files over here') %></div>
-
-<div class="flash notice" style="display: none; margin: 8px 0" id="upload_info_container">
-  <%= render_icon('tick') %>
-  <span id="upload_info"></span>
+<div class="overall-upload">
+  <div class="progress">
+    <span class="progress-status">0%</span>
+    (<span class="uploaded-files-count">0</span>/<span class="total-files-count">0</span>)
+  </div>
 </div>
 
 <div id="uploadProgressContainer"></div>
 
-<%- post_params = {
-  while_assigning: @while_assigning ? "true" : "false",
-  content_id: @content.blank? ? nil : @content.id,
-  element_id: @element.blank? ? nil : @element.id,
-  size: @size,
-  upload_hash: Time.now.hash,
-  options: @options.to_json
-}.delete_if { |k, v| v.nil? }.to_json -%>
+<%- post_params = [
+  {name: 'while_assigning', value: !!@while_assigning},
+  {name: 'content_id', value: @content.blank? ? nil : @content.id},
+  {name: 'element_id', value: @element.blank? ? nil : @element.id},
+  {name: 'size', value: @size},
+  {name: "#{model_name}[upload_hash]", value: model_name == 'picture' ? Time.now.hash : nil},
+  {name: 'options', value: @options ? @options.to_json : nil}
+].delete_if { |h| !h.detect { |k, v| v.blank? }.nil? }.to_json -%>
 
 <script type='text/javascript'>
-
-  (function() {
+  $(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: '<%= file_types.join("|") %>',
       file_types_description: "<%= file_types_description %>",
       file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
       locale: "<%= ::I18n.locale || 'en' %>",
-      onQueueComplete: function() {
-        // While assigning picture in page edit mode
-        <% 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.to_json).html_safe %>';
-        $.get(url, null, null, 'script');
-        // While uploading picture in library
-        <% elsif controller.class.name == 'Alchemy::Admin::PicturesController' %>
-        var url = '<%= alchemy.admin_pictures_path(size: params[:size], filter: "last_upload").html_safe %>';
+      complete: function() {
+        var url = '<%= redirect_url.html_safe %>';
+      <% if @while_assigning %>
+        Alchemy.closeCurrentDialog(function() {
+          $.get(url, null, null, 'script');
+        });
+      <% else %>
         Alchemy.pleaseWaitOverlay();
-        window.location = url;
-        <% end %>
+        window.location.href = url;
+      <% end %>
       }
     };
-
-    Alchemy.Uploader.init(options);
-  })();
-
-  (function($) {
-    $('#uploadswitcher').click(function() {
-      $('#choose_alternative_uploader').hide();
-      $('#alternativeUpload').show();
-      $('#swf_upload_container').hide();
-    });
-    $('#switch_to_flash_uploader').click(function() {
-      $('#choose_alternative_uploader').show();
-      $('#alternativeUpload').hide();
-      $('#swf_upload_container').show();
-    });
-  })(jQuery);
-
+    Alchemy.Uploader(options);
+  });
 </script>