alchemy_cms 2.9.1 → 3.0.0.rc5

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

@@ -1,21 +1,20 @@
 <li>
   <div class="sitemap_page ">
     <div class="sitemap_left_images">
-      <span class="site_status <%= page_for_links.locked ? ' locked' : '' %>" ></span>
+      <%= render_icon(:page) %>
     </div>
     <div class="sitemap_right_tools">
       <% unless page_for_links.redirects_to_external? %>
-        <%= link_to("",
-          alchemy.list_admin_elements_path(:page_id => page_for_links.id),
-          :remote => true,
-          :data => {
+        <%= link_to '',
+          alchemy.list_admin_elements_path(page_id: page_for_links.id),
+          remote: true,
+          data: {
             'page-id' => page_for_links.id,
-            :url => @url_prefix + page_for_links.urlname
+            url: @url_prefix + page_for_links.urlname
           },
-          :class => "show_elements_to_link",
-          :title => _t(:show_elements_from_page)
-        ) %>
-        <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page"></div>
+          class: "show_elements_to_link",
+          title: _t(:show_elements_from_page)
+        %>
       <% end %>
     </div>
     <div class="page_infos">
@@ -28,19 +27,19 @@
         <span class="sitemap_pagename_link inactive"><%= page_for_links.name %></span>
       <% else %>
         <%= link_to(page_for_links.name, '', {
-          :data => {
+          data: {
             'page-id' => page_for_links.id,
-            :url => @url_prefix + page_for_links.urlname
+            url: @url_prefix + page_for_links.urlname
           },
-          :title => _t('page_for_links.choose_page', :name => page_for_links.name),
-          :class => "sitemap_pagename_link"
+          title: _t('page_for_links.choose_page', name: page_for_links.name),
+          class: "sitemap_pagename_link"
         }) %>
       <% end %>
     </div>
   </div>
-  <% if !page_for_links.children.empty? %>
+  <% if page_for_links.children.present? %>
     <ul id="page_<%= page_for_links.id %>_children">
-      <%= render :partial => 'page_for_links', :collection => page_for_links.children, :locals => {:area_name => @area_name} %>
+      <%= render partial: 'page_for_links', collection: page_for_links.children, locals: {area_name: @area_name} %>
     </ul>
   <% end %>
 </li>

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

@@ -1,87 +1,57 @@
-<%= form_for([:admin, @page], :remote => true) do |f| %>
-  <div id="errors"></div>
-  <table id="page_names">
-    <tr>
-      <td class="label"><%= _t(:page_type) %>: </td>
-      <td class="select">
-        <%= f.select('page_layout', @page_layouts, {}, {:class => 'alchemy_selectbox long'}) %>
-      </td>
-    </tr>
-    <% unless @page.layoutpage %>
-    <tr>
-      <td class="label"><%= _t(:page_status) %>: </td>
-      <td class="checkbox long">
-        <%= f.check_box :public %>
-        <%= f.label :public %><br/>
-        <%= f.check_box :visible %>
-        <%= f.label :visible %><br/>
-        <%= f.check_box :restricted %>
-        <%= f.label :restricted %>
-        <% if configuration(:sitemap)['show_flag'] %><br/>
-        <%= f.check_box :sitemap %>
-        <%= f.label :sitemap %>
-        <% end %>
-      </td>
-    </tr>
-    <% end %>
-    <% unless @page.layoutpage %>
-    <tr>
-      <td colspan="2" class="heading"><%= _t(:names) %></td>
-    </tr>
-    <% 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 %>
-    <tr>
-      <td class="label"><%= f.label "urlname" %>: </td>
-      <td class="input"><%= f.text_field "urlname", :value => @page.slug, :size => 31, :class => "thin_border long" %></td>
-    </tr>
-    <tr>
-      <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" class="heading"><%= _t(:meta_data) %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= _t(:search_engines) %>: </td>
-      <td class="checkbox long">
-        <%= f.check_box "robot_index" %>
-        <%= f.label "robot_index" %><br/>
-        <%= f.check_box "robot_follow" %>
-        <%= f.label "robot_follow" %><br/>
-      </td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "meta_description" %>:&nbsp;</td>
-      <td class="input"><%= f.text_area "meta_description", :class => "thin_border long" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "meta_keywords" %>*:&nbsp;</td>
-      <td class="input">
-        <%= f.text_area "meta_keywords", :class => "thin_border long" %><br/>
-        <% if !@page.layoutpage %>
-        <p class="foot_note">
-          * <%= _t('pages.update.comma_seperated') %>
-        </p>
-        <% end %>
-      </td>
-    </tr>
-    <% 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">
-        <%= f.button _t(:save), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <% unless @page.layoutpage %>
+    <div class="input check_boxes">
+      <label class="control-label"><%= _t(:page_status) %></label>
+      <div class="control_group">
+        <label class="checkbox">
+          <%= f.check_box :public %>
+          <%= f.object.class.human_attribute_name :public %>
+        </label>
+        <label class="checkbox">
+          <%= f.check_box :visible %>
+          <%= f.object.class.human_attribute_name :visible %>
+        </label>
+        <label class="checkbox">
+          <%= f.check_box :restricted %>
+          <%= f.object.class.human_attribute_name :restricted %>
+        </label>
+      <% if configuration(:sitemap)['show_flag'] %>
+        <label class="checkbox">
+          <%= f.check_box :sitemap %>
+          <%= f.object.class.human_attribute_name :sitemap %>
+        </label>
+      <% end %>
+      </div>
+    </div>
+    <h2><%= _t(:names) %></h2>
+  <% end %>
+  <%= f.input :name, autofocus: true %>
+  <% unless @page.layoutpage %>
+    <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
+    <%= f.input :title %>
+    <h2><%= _t(:meta_data) %></h2>
+    <div class="input check_boxes">
+      <label class="control-label"><%= _t(:search_engines) %></label>
+      <div class="control_group">
+        <label class="checkbox">
+          <%= f.check_box :robot_index %>
+          <%= f.object.class.human_attribute_name :robot_index %>
+        </label>
+        <label class="checkbox">
+          <%= f.check_box :robot_follow %>
+          <%= f.object.class.human_attribute_name :robot_follow %>
+        </label>
+      </div>
+    </div>
+    <%= f.input :meta_description, as: 'text' %>
+    <%= f.input :meta_keywords, as: 'text', hint: _t('pages.update.comma_seperated') %>
+  <% end %>
+  <% if @page.taggable? %>
+    <div class="input string">
+      <%= f.label :tag_list %>
+      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+    </div>
+  <% end %>
+  <%= f.submit _t(:save) %>
 <% end %>

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

@@ -1,40 +1,33 @@
-<%= form_for([:admin, @page], :remote => true) do |f| %>
-  <div id="errors"></div>
-  <table id="page_names">
-    <tr>
-      <td class="label"><%= _t(:page_type) %>: </td>
-      <td class="value long">
-        <p><%= @page.layout_display_name %></p>
-      </td>
-    </tr>
-    <tr>
-      <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/>
-          <%= f.check_box :sitemap -%>
-          <%= f.label :sitemap %>
-        <%- end -%>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" class="heading"><%= _t(:names) %></td>
-    </tr>
-    <tr>
-      <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 class="label"><%= f.label "urlname" %>: </td>
-      <td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
-    </tr>
-    <tr>
-      <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" class="submit"><%= f.button _t(:save), :class => 'button' %></td>
-    </tr>
-  </table>
+<%= alchemy_form_for [:admin, @page] do |f| %>
+  <%= f.input :page_layout,
+    collection: @page_layouts,
+    label: _t(:page_type),
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
+  <div class="input check_boxes">
+    <label class="control-label"><%= _t(:page_status) %></label>
+    <div class="control_group">
+      <label class="checkbox">
+        <%= f.check_box :visible %>
+        <%= f.object.class.human_attribute_name :visible %>
+      </label>
+    <% if configuration(:sitemap)['show_flag'] %>
+      <label class="checkbox">
+        <%= f.check_box :sitemap %>
+        <%= f.object.class.human_attribute_name :sitemap %>
+      </label>
+    <% end %>
+    </div>
+  </div>
+  <h2><%= _t(:names) %></h2>
+  <%= f.input :name, autofocus: true %>
+  <%= f.input :urlname, as: 'string' %>
+  <%= f.input :title %>
+  <% if @page.taggable? %>
+    <div class="input string">
+      <%= f.label :tag_list %>
+      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+    </div>
+  <% end %>
+  <%= f.submit _t(:save) %>
 <% end %>

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

@@ -1,19 +1,19 @@
-$('#locked_page_<%= @page_id -%>').remove();
+$('#locked_page_<%= @page_id %>').remove();
 
-<% if @layoutpage %>
+<% if @layoutpage -%>
 
-window.location.href = '<%= alchemy.admin_layoutpages_path -%>';
+window.location.href = '<%= alchemy.admin_layoutpages_path %>';
 
-<% elsif @page_root %>
+<% elsif @page_root -%>
 
-$('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
-Alchemy.growl('<%= @message -%>');
-Alchemy.overlayObserver('#sitemap');
+$('#sitemap').replaceWith('<%= j render("sitemap") %>');
+Alchemy.growl('<%= j @message %>');
+Alchemy.watchForDialogs('#sitemap');
 
-<% else %>
+<% else -%>
 
-window.location.href = '<%= alchemy.admin_pages_path -%>';
+window.location.href = '<%= alchemy.admin_pages_path %>';
 
-<% end %>
+<% end -%>
 
 Alchemy.pleaseWaitOverlay(false);

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

@@ -4,15 +4,15 @@
   <label><%= _t('Active Pages') %> &raquo;</label>
   <% @locked_pages.each do |page| %>
   <% if @page == page %>
-  <%= render :partial => 'page_status' %>
+  <%= render partial: 'page_status' %>
   <% 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 %>">
-      <%= truncate page.name, :length => 15 %>
+      <%= truncate page.name, length: 15 %>
     </span>
     <% end %>
-    <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
+    <%= form_tag(alchemy.unlock_admin_page_path(page), remote: true) do %>
       <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
         <%= render_icon('close small') %>
       </button>
@@ -25,8 +25,8 @@
 <% content_for(:toolbar) do %>
 <div class="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 %>
-      <button class="icon_button" title="<%= _t(:explain_unlocking) %>" data-alchemy-hotkey="alt-x">
+    <%= form_tag alchemy.unlock_admin_page_path(@page, redirect_to: @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), id: 'unlock_page_form' do %>
+      <button class="icon_button" title="<%= _t(:explain_unlocking) %>" data-alchemy-hotkey="alt+x">
         <%= render_icon('close') %>
       </button>
       <label><%= _t(:unlock_page) %></label>
@@ -34,7 +34,7 @@
   </div>
   <% unless @page.layoutpage? %>
   <div class="button_with_label">
-    <%= form_tag alchemy.visit_admin_page_path(@page), :id => 'visit_page_form' do %>
+    <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
       <button class="icon_button" title="<%= _t('Visit page') %>">
         <%= render_icon('visit_page') %>
       </button>
@@ -43,38 +43,38 @@
   </div>
   <% end %>
   <div class="button_with_label">
-    <%= link_to_overlay_window(
+    <%= link_to_dialog(
       render_icon('info'),
       alchemy.info_admin_page_path(@page),
       {
         title: _t(:page_infos),
-        size: '460x320'
+        size: '480x320'
       },
       {
         class: 'icon_button',
         title: _t(:page_infos),
-        'data-alchemy-hotkey' => 'alt-i'
+        'data-alchemy-hotkey' => 'alt+i'
       }
     ) %>
     <label><%= _t(:page_infos) %></label>
   </div>
   <div class="button_with_label">
-    <%= link_to_overlay_window(
+    <%= link_to_dialog(
       render_icon('settings'),
       alchemy.configure_admin_page_path(@page),
       {
-        :title => _t(:edit_page_properties),
-        :size => @page.layoutpage? ? '410x150' : '410x650'
+        title: _t(:edit_page_properties),
+        size: @page.layoutpage? ? '410x150' : '410x660'
       },
-      :class => :icon_button,
-      :title => _t(:edit_page_properties),
-      'data-alchemy-hotkey' => 'alt-e'
+      class: :icon_button,
+      title: _t(:edit_page_properties),
+      'data-alchemy-hotkey' => 'alt+e'
     ) %>
     <label><%= _t(:page_properties) %></label>
   </div>
   <% 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>
@@ -82,27 +82,27 @@
     <% end %>
   </div>
   <% end %>
+  <div class="toolbar_spacer"></div>
   <div class="button_with_label">
-    <%= select_tag('preview_size', preview_sizes_for_select, :class => 'alchemy_selectbox short') %>
+    <%= select_tag('preview_size', preview_sizes_for_select, class: 'alchemy_selectbox medium') %>
     <label><%= _t(:preview_size) %></label>
   </div>
+  <div class="button_with_label">
+    <%= link_to render_icon(:reload), '#', {
+      title: _t('Reload Preview'),
+      class: 'icon_button',
+      id: 'reload_preview_button'
+    } %>
+    <label><%= _t('Reload Preview') %></label>
+  </div>
 </div>
 <div class="toolbar_buttons right">
-  <div class="button_with_label" id="show_preview_window">
-    <%= link_to(render_icon(:preview_window), '#', {
-      :onclick => "Alchemy.openPreviewWindow()",
-      :title => _t('Show Preview Window'),
-      :class => :icon_button
-    }) %>
-    <label><%= _t('Show Preview Window') %></label>
-  </div>
-  <div class="button_with_label" id="show_element_window">
-    <%= link_to(render_icon(:element_window), '#', {
-      :onclick => "Alchemy.openElementsWindow()",
-      :title => _t('Show Elements Window'),
-      :class => :icon_button
-    }) %>
-    <label><%= _t('Show Elements Window') %></label>
+  <div class="button_with_label" id="element_window_button">
+    <%= link_to render_icon(:element_window), '', {
+      title: _t('Hide Elements'),
+      class: 'icon_button'
+    } %>
+    <label><%= _t('Hide Elements') %></label>
   </div>
 </div>
 <% end %>
@@ -110,30 +110,34 @@
 <% content_for :javascripts do %>
 <script type="text/javascript" charset="utf-8">
 
-  Alchemy.openPreviewWindow = function() {
-    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= _t("Page Preview") %>');
-  }
-
-  Alchemy.openElementsWindow = function() {
-    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) %>', {
+  $(function() {
+    $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
+      var not_dirty = Alchemy.checkPageDirtyness(this);
+      if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
+      return not_dirty;
+    });
+    Alchemy.PageLeaveObserver();
+    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>');
+    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") %>'
+        ok_label: '<%= _t("Yes") %>',
+        cancel_label: '<%= _t("No") %>',
+        hideElements: '<%= _t("Hide Elements") %>',
+        showElements: '<%= _t("Show Elements") %>'
       },
       toolbarButtons: [
         {
           title: '<%= _t("New Element") %>',
           label: '<%= _t("New Element") %>',
-          hotkey: 'alt-n',
+          hotkey: 'alt+n',
           iconClass: 'new_element',
           onClick: function() {
-            Alchemy.openWindow('<%= alchemy.new_admin_element_path(:page_id => @page.id) %>', {
+            Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_id: @page.id) %>', {
               title: '<%= _t("New Element") %>',
-              width: 320,
-              height: 120
+              size: '320x125'
             });
           }
         },
@@ -143,10 +147,9 @@
           iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
-            Alchemy.openWindow('<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") %>', {
+            Alchemy.openDialog('<%= alchemy.admin_clipboard_path(remarkable_type: "elements") %>', {
               title :'<%= _t("Clipboard") %>',
-              width: 380,
-              height: 270
+              size: '380x305'
             });
           }
         },
@@ -166,23 +169,12 @@
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element_editor');
       Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
-      jQuery('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
+      $('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
       Alchemy.ElementDirtyObserver('#element_area');
       if (window.location.hash) {
         $(window.location.hash).trigger('Alchemy.SelectElementEditor');
       }
     });
-  }
-
-  jQuery(function($) {
-    $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
-      var not_dirty = Alchemy.checkPageDirtyness(this);
-      if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
-      return not_dirty;
-    });
-    Alchemy.PageLeaveObserver();
-    Alchemy.openElementsWindow();
-    Alchemy.openPreviewWindow();
 
     $('#preview_size').bind('open.selectBoxIt', function (e) {
       $('#top_menu').css('z-index', 5000);
@@ -192,15 +184,17 @@
       $('#top_menu').css('z-index', 30);
     });
 
-    Alchemy.PreviewWindow.currentWidth = Alchemy.PreviewWindow.currentWindow.dialog('widget').width();
-
     $('select#preview_size').on('change', function(e) {
       var width = this.value;
       if (this.value === 'auto') {
         width = Alchemy.PreviewWindow.currentWidth;
       }
-      Alchemy.PreviewWindow.currentWindow.dialog('widget').css('width', width);
-      Alchemy.PreviewWindow.currentWindow.dialog('moveToTop');
+      Alchemy.PreviewWindow.currentWindow.css('width', width);
+    });
+
+    $(window).resize(function() {
+      Alchemy.PreviewWindow.resize();
+      Alchemy.ElementsWindow.resize();
     });
   });