RubyGems - alchemy_cms - Versions diffs - 2.9.1 → 3.0.0.rc5 - Mend

alchemy_cms 2.9.1 → 3.0.0.rc5

Files changed (695) hide show

data/app/views/alchemy/admin/layoutpages/index.html.erb CHANGED

@@ -24,20 +24,20 @@
   <%= toolbar_button(
     icon: 'add_page',
     url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
-    hotkey: 'alt-n',
-    overlay_options: {
+    hotkey: 'alt+n',
+    dialog_options: {
       title: _t('Add global page'),
-      size: '340x150',
+      size: '340x170',
       overflow: true
     },
     title: _t('Add global page'),
     label: _t('Add global page'),
-    if_permitted_to: [:new, :alchemy_admin_pages]
+    if_permitted_to: [:create, Alchemy::Page]
   ) %>
   <%= toolbar_button(
     icon: "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
     url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
-    overlay_options: {
+    dialog_options: {
       title: _t('Clipboard'),
       size: '380x270'
     },

data/app/views/alchemy/admin/pages/_create_language_form.html.erb CHANGED

@@ -1,46 +1,40 @@
 <% if root = Alchemy::Page.rootpage %>
-<div id="create_language_tree_form" style="display: none">
-  <div class="info">
-    <%= render_icon('info') %>
-    <%= _t(:language_does_not_exist) %>
-  </div>
+<div id="create_language_tree_form">
+  <%= render_message do %>
+    <h2><%= _t(:language_does_not_exist) %></h2>
+  <% end %>
 <%- if @language -%>
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
-      <h2><%= _t(:copy_language_tree_heading) %></h2>
+      <h3><%= _t(:copy_language_tree_heading) %></h3>
       <p><%= _t(:want_to_make_copy_of_existing_language) %></p>
-      <table>
-        <tr>
-          <td class="label"><%= label_tag('languages[old_lang_id]', _t('Language tree')) %></td>
-          <td class="select">
-            <%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "alchemy_selectbox medium_long") %>
-            <%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
-          </td>
-        </tr>
-        <tr>
-          <td class="submit" colspan="2">
-            <%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
-            <%= submit_tag _t(:copy), :class => 'button' %>
-          </td>
-        </tr>
-      </table>
+      <div class="input select">
+        <%= label_tag('languages[old_lang_id]', _t('Language tree'), class: 'control-label') %>
+        <%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), class: "alchemy_selectbox") %>
+        <%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
+      </div>
+      <div class="submit">
+        <%= button_tag _t(:copy) %>
+      </div>
     <% end %>
   <%- end -%>
   <%- if params[:action] == "index" -%>
-  <%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
-    <h2><%= _t(:create_language_tree_heading) %></h2>
+  <%= form_for([:admin, Alchemy::Page.new]) do |form| %>
+    <h3><%= _t(:create_language_tree_heading) %></h3>
     <p><%= _t(:want_to_create_new_language) %></p>
-    <%= form.hidden_field :name, :value => @language.frontpage_name %>
-    <%= form.hidden_field :language_id, :value => @language.id %>
-    <%= form.hidden_field :language_code, :value => @language.code %>
-    <%= form.hidden_field :page_layout, :value => @language.page_layout %>
-    <%= form.hidden_field :language_root, :value => true %>
-    <%= form.hidden_field :parent_id, :value => root.id %>
-    <%= hidden_field_tag :redirect_to, admin_pages_path %>
-    <%= form.button _t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
+    <%= form.hidden_field :name, value: @language.frontpage_name %>
+    <%= form.hidden_field :language_id, value: @language.id %>
+    <%= form.hidden_field :language_code, value: @language.code %>
+    <%= form.hidden_field :page_layout, value: @language.page_layout %>
+    <%= form.hidden_field :language_root, value: true %>
+    <%= form.hidden_field :parent_id, value: root.id %>
+    <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
+    <div class="submit">
+      <%= form.button _t("create_tree_as_new_language", language: @language.name) %>
+    </div>
   <% end %>
   <%- end -%>

data/app/views/alchemy/admin/pages/_external_link.html.erb CHANGED

@@ -1,42 +1,31 @@
-<div id="overlay_tab_external_link">
-  <h2><%= _t(:enter_external_link) %></h2>
+<%= form_tag do %>
   <%= render_message do %>
+    <h2><%= _t(:enter_external_link) %></h2>
     <p><%= _t(:external_link_notice_1) %></p>
     <p><%= _t(:external_link_notice_2) %></p>
   <% end %>
   <div id="errors" class="errors">
     <ul></ul>
   </div>
-  <table class="window_form">
-    <tr>
-      <td class="label long">
-        <%= label_tag 'external_url', 'URL', :for => 'external_url' %>
-      </td>
-      <td class="input">
-        <%= text_field_tag 'external_url', '', :class => "thin_border auto_resize" %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="extern_link_title"><%= _t(:link_title) %></label>
-      </td>
-      <td class="input"><%= text_field_tag "extern_link_title", '', :class => 'thin_border auto_resize link_title' %></td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="external_link_target"><%= _t("Open Link in") %>:</label>
-      </td>
-      <td class="select left">
-        <%= select_tag 'external_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target' %>
-      </td>
-    </tr>
-    <tr>
-      <td class="submit" colspan="2">
-        <%= link_to(_t(:apply), '#', {
-          :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#external_link_target').val());",
-          :class => 'button'
-        }) %>
-      </td>
-    </tr>
-  </table>
-</div>
+  <div class="input text">
+    <label for="external_url" class="control-label">URL</label>
+    <%= text_field_tag "external_url" %>
+  </div>
+  <div class="input text">
+    <label for="external_link_title" class="control-label">
+      <%= _t(:link_title) %>
+    </label>
+    <%= text_field_tag "external_link_title", '', class: 'link_title' %>
+  </div>
+  <div class="input select">
+    <label for="external_link_target" class="control-label">
+      <%= _t("Open Link in") %>
+    </label>
+    <%= select_tag 'external_link_target',
+      options_for_select(Alchemy::Page.link_target_options),
+      class: 'alchemy_selectbox link_target' %>
+  </div>
+  <div class="submit">
+    <%= link_to _t(:apply), '#', class: 'create-link button', 'data-link-type' => 'external' %>
+  </div>
+<% end %>

data/app/views/alchemy/admin/pages/_file_link.html.erb CHANGED

@@ -1,45 +1,31 @@
-<div id="overlay_tab_file_link">
-  <h2>
-    <%= _t(:choose_file_to_link) %>
-  </h2>
-  <table class="window_form">
-    <tr>
-      <td class="label long">
-        <label for="public_filename"><%= _t(:file) %></label>
-      </td>
-      <td class="select">
-        <%= select_tag(
-          "public_filename",
-          options_for_select(@attachments),
-          :class => "alchemy_selectbox"
-        ) %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="file_link_title">
-          <%= _t(:link_title) %>
-        </label>
-      </td>
-      <td class="input">
-        <%= text_field_tag "file_link_title", '', :class => 'thin_border auto_resize link_title' %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="file_link_target"><%= _t("Open Link in") %>:</label>
-      </td>
-      <td class="select left">
-        <%= select_tag 'file_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
-      </td>
-    </tr>
-    <tr>
-      <td class="submit" colspan="2">
-        <%= link_to(_t(:apply), '#', {
-          :onclick => "Alchemy.LinkOverlay.createLink('file', jQuery('#public_filename').val(), jQuery('#file_link_title').val(), jQuery('#file_link_target').val()); Alchemy.LinkOverlay.close()",
-          :class => 'button'
-        }) %>
-      </td>
-    </tr>
-  </table>
-</div>
+<%= form_tag do %>
+  <%= render_message do %>
+    <h2><%= _t(:choose_file_to_link) %></h2>
+  <% end %>
+  <div class="input select">
+    <label for="public_filename" class="control-label">
+      <%= _t(:file) %>
+    </label>
+    <%= select_tag "public_filename",
+      options_for_select(@attachments),
+      prompt: _t('Please choose'),
+      class: "alchemy_selectbox" %>
+  </div>
+  <div class="input text">
+    <label for="file_link_title" class="control-label">
+      <%= _t(:link_title) %>
+    </label>
+    <%= text_field_tag "file_link_title", '', class: 'link_title' %>
+  </div>
+  <div class="input select">
+    <label for="file_link_target" class="control-label">
+      <%= _t("Open Link in") %>
+    </label>
+    <%= select_tag 'file_link_target',
+      options_for_select(Alchemy::Page.link_target_options),
+      class: 'alchemy_selectbox link_target' %>
+  </div>
+  <div class="submit">
+    <%= link_to _t(:apply), '#', class: 'create-link button', 'data-link-type' => 'file' %>
+  </div>
+<% end %>

data/app/views/alchemy/admin/pages/_internal_link.html.erb CHANGED

@@ -1,42 +1,36 @@
-<div id="overlay_tab_internal_link">
-  <h2><%= _t(:internal_link_headline) %></h2>
-  <table class="window_form">
-    <tr>
-      <td colspan="2">
-        <div id="page_selector_container">
-          <% if @page_root %>
-          <ul id="sitemap">
-            <%= render :partial => 'page_for_links', :object => @page_root, :locals => {:area_name => @area_name} %>
-          </ul>
-          <% end %>
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="internal_link_title"><%= _t('Title') %>:</label>
-      </td>
-      <td class="input">
-        <%= text_field_tag "internal_link_title", '', :class => 'thin_border auto_resize link_title' %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label long">
-        <label for="internal_link_target"><%= _t("Open Link in") %>:</label>
-      </td>
-      <td class="select left">
-        <%= select_tag 'internal_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target' %>
-      </td>
-    </tr>
-    <tr>
-      <td class="submit" colspan="2">
-        <%= hidden_field_tag(:internal_urlname) %>
-        <%= hidden_field_tag(:page_anchor) %>
-        <%= link_to(_t(:apply), '#', {
-          :onclick => "Alchemy.LinkOverlay.createLink('internal', jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(), jQuery('#internal_link_title').val(), jQuery('#internal_link_target').val()); Alchemy.LinkOverlay.close()",
-          :class => 'button'
-        }) %>
-      </td>
-    </tr>
-  </table>
-</div>
+<%= form_tag do %>
+  <%= render_message do %>
+    <h2><%= _t(:internal_link_headline) %></h2>
+  <% end %>
+  <div id="page_selector_container">
+    <% if @page_root %>
+    <ul id="sitemap">
+      <%= render partial: 'page_for_links', object: @page_root, locals: {area_name: @area_name} %>
+    </ul>
+    <% end %>
+  </div>
+  <div class="input text">
+    <label for="internal_urlname" class="control-label">
+      <%= _t(:url) %>
+    </label>
+    <%= text_field_tag(:internal_urlname) %>
+  </div>
+  <div class="input text">
+    <label for="internal_link_title" class="control-label">
+      <%= _t(:link_title) %>
+    </label>
+    <%= text_field_tag "internal_link_title", '', class: 'link_title' %>
+  </div>
+  <div class="input select">
+    <label for="internal_link_target" class="control-label">
+      <%= _t("Open Link in") %>
+    </label>
+    <%= select_tag 'internal_link_target',
+      options_for_select(Alchemy::Page.link_target_options),
+      class: 'alchemy_selectbox link_target' %>
+  </div>
+  <div class="submit">
+    <%= hidden_field_tag(:page_anchor) %>
+    <%= link_to _t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
+  </div>
+<% end %>

data/app/views/alchemy/admin/pages/_new_page_form.html.erb CHANGED

@@ -1,29 +1,11 @@
-<%= form_for([:admin, @page], :remote => true, :html => {:id => 'new_page_form'}) do |f| %>
+<%= alchemy_form_for([:admin, @page]) do |f| %>
   <%= f.hidden_field(:parent_id) %>
   <%= f.hidden_field(:layoutpage) %>
-  <div id="errors"></div>
-  <table id="new_page_form">
-    <tr>
-      <td class="label">
-        <%= f.label :page_layout %>
-      </td>
-      <td class="select">
-        <%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox', :autofocus => true }) %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <%= f.label :name %>
-      </td>
-      <td class="input">
-        <%= f.text_field(:name, :class => "thin_border") %>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">&nbsp;</td>
-      <td class="submit">
-        <%= f.button _t(:create), :class => 'button', :name => nil %>
-      </td>
-    </tr>
-  </table>
+  <%= f.input :page_layout,
+    collection: @page_layouts,
+    label: _t(:page_type),
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.input :name %>
+  <%= f.submit _t(:create) %>
 <% end %>

data/app/views/alchemy/admin/pages/_page.html.erb CHANGED

@@ -1,80 +1,81 @@
-<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>" data-slug="<%= page.slug %>" data-restricted="<%= page.restricted? %>" data-visible="<%= page.visible? %>" data-external="<%= page.redirects_to_external? %>">
+<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>">
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
       <%= sitemap_folder_link(page) unless page.level == 1 || page.children.blank? || @sorting %>
-      <div class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
+      <div class="page icon <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
     </div>
     <div class="sitemap_right_tools">
-      <%- unless @sorting -%>
-        <%- permitted_to?(:info, :alchemy_admin_pages) do -%>
-          <%= link_to_overlay_window(
-            render_icon('info'),
-            alchemy.info_admin_page_path(page),
-            {
-              title: _t(:page_infos),
-              size: '460x320'
-            },
-            {
-              title: _t(:page_infos)
-            }
-          ) %>
-        <%- end -%>
-        <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
-          <%= link_to_overlay_window(
-            render_icon('configure_page'),
-            alchemy.configure_admin_page_path(page),
-            {
-              :title => _t(:edit_page_properties),
-              :size => page.redirects_to_external? ? '410x270' : '410x655'
-            },
-            :title => _t(:edit_page_properties)
-          ) -%>
-        <%- end -%>
-        <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
-          <span class="sitemap_sitetools">
-            <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
-              <%= link_to(
-                render_icon("copy_page"),
-                alchemy.insert_admin_clipboard_path(
-                  :remarkable_type => page.class.name.demodulize.underscore.pluralize,
-                  :remarkable_id => page.id
-                ),
-                :remote => true,
-                :method => :post,
-                :title => _t(:copy_page)
-              ) %>
-            <%- end -%>
-            <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
-              <%= link_to_confirmation_window(
-                render_icon('delete_page'),
-                _t(:confirm_to_delete_page),
-                url_for(
-                  :controller => 'pages',
-                  :action => 'destroy',
-                  :id => page.id
-                ),
-                {
-                  :title => _t(:delete_page)
-                }
-              ) -%>
-            <%- end -%>
-            <%- permitted_to?(:new, :alchemy_admin_pages) do -%>
-              <%= link_to_overlay_window(
-                render_icon('add_page'),
-                alchemy.new_admin_page_path(:parent_id => page.id),
-                {
-                  :title => _t(:create_page),
-                  :size => '340x150',
-                  :overflow => true
-                },
-                {
-                  :title => _t(:create_page)
-                }
-              ) -%>
-            <%- end -%>
-          </span>
-        <%- end -%>
+    <%- unless @sorting -%>
+      <%- if can?(:info, page) -%>
+        <%= link_to_dialog(
+          render_icon('info'),
+          alchemy.info_admin_page_path(page),
+          {
+            title: _t(:page_infos),
+            size: '480x290'
+          },
+          {
+            title: _t(:page_infos),
+            class: 'sitemap_tool'
+          }
+        ) %>
       <%- end -%>
+      <%- if can?(:configure, page) -%>
+        <%= link_to_dialog(
+          render_icon('configure_page'),
+          alchemy.configure_admin_page_path(page),
+          {
+            title: _t(:edit_page_properties),
+            size: page.redirects_to_external? ? '410x330' : '410x660'
+          },
+          title: _t(:edit_page_properties),
+          class: 'sitemap_tool'
+        ) -%>
+      <%- end -%>
+      <span class="sitemap_sitetools">
+      <%- if can?(:copy, page) -%>
+        <%= link_to(
+          render_icon("copy_page"),
+          alchemy.insert_admin_clipboard_path(
+            remarkable_type: page.class.name.demodulize.underscore.pluralize,
+            remarkable_id: page.id
+          ),
+          remote: true,
+          method: 'post',
+          title: _t(:copy_page),
+          class: 'sitemap_tool'
+        ) %>
+      <%- end -%>
+      <%- if can?(:destroy, page) -%>
+        <%= link_to_confirm_dialog(
+          render_icon('delete_page'),
+          _t(:confirm_to_delete_page),
+          url_for(
+            controller: 'pages',
+            action: 'destroy',
+            id: page.id
+          ),
+          {
+            title: _t(:delete_page),
+            class: 'sitemap_tool'
+          }
+        ) -%>
+      <%- end -%>
+      <%- if can?(:create, Alchemy::Page) -%>
+        <%= link_to_dialog(
+          render_icon('add_page'),
+          alchemy.new_admin_page_path(parent_id: page.id),
+          {
+            title: _t(:create_page),
+            size: '340x165',
+            overflow: true
+          },
+          title: _t(:create_page),
+          class: 'sitemap_tool'
+        ) -%>
+      <%- end -%>
+      </span>
+    <%- end -%>
     </div>
     <div class="page_infos" id="page_<%= page.id %>_infos">
       <span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.status_title(:public) %>"></span>
@@ -93,15 +94,15 @@
         @sorting,
         page.name,
         alchemy.edit_admin_page_path(page),
-        :title => _t(:edit_page),
-        :class => "sitemap_pagename_link"
-      ) { content_tag('span', page.name, :class => "sitemap_pagename_link") } -%>
+        title: _t(:edit_page),
+        class: "sitemap_pagename_link"
+      ) { content_tag('span', page.name, class: "sitemap_pagename_link") } -%>
     <%- end -%>
     </div>
   </div>
   <%- if @sorting || (!page.folded?(current_alchemy_user) && !page.children.empty?) -%>
   <ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
-    <%= render :partial => 'page', :collection => page.children %>
+    <%= render partial: 'page', collection: page.children %>
   </ul>
   <%- end -%>
 </li>