alchemy_cms 3.4.2 → 3.5.0.rc1

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

@@ -1,7 +1,7 @@
 <% if @page == locked_page %>
   <%= render 'alchemy/admin/pages/current_page', current_page: @page %>
 <% else %>
-  <div class="subnavi_tab wide" id="locked_page_<%= locked_page.id %>">
+  <div class="locked_page wide" id="locked_page_<%= locked_page.id %>">
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
       <%= render 'alchemy/admin/pages/page_status', page: locked_page, truncate: true %>
     <% end %>

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

@@ -1,6 +1,6 @@
 <li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-visible="{{visible}}" data-external="{{redirects_to_external}}">
   <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
-    <div class="sitemap_left_images">
+    <div class="sitemap_left_images<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>">
       <% unless @sorting %>
         {{#unless root_or_leaf}}
         <%= link_to(
@@ -16,104 +16,162 @@
         {{/unless}}
       <% end %>
       {{#if definition_missing}}
-        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+        <%= page_layout_missing_warning %>
       {{else}}
-        <div class="page icon<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>"></div>
+        {{#if permissions.edit_content}}
+          <div class="page icon{{#if locked}} with-hint{{/if}}">
+            {{#if locked}}
+              <span class="hint-bubble">
+                {{locked_notice}}
+              </span>
+            {{/if}}
+          </div>
+        {{else}}
+          <div class="page icon with-hint not-allowed">
+            <span class="hint-bubble">
+              <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+            </span>
+          </div>
+        {{/if}}
       {{/if}}
     </div>
     <div class="sitemap_right_tools">
       <%- unless @sorting -%>
         {{#if permissions.info}}
-        <%= link_to_dialog(
-          render_icon('info'),
-          alchemy.info_admin_page_path(page),
-          {
-            title: Alchemy.t(:page_infos),
-            size: '520x290'
-          },
-          {
-            title: Alchemy.t(:page_infos),
-            class: 'sitemap_tool'
-          }
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_dialog(
+            render_icon(:info),
+            alchemy.info_admin_page_path(page),
+            {
+              title: Alchemy.t(:page_infos),
+              size: '520x290'
+            }
           ) %>
+          <label class="center"><%= Alchemy.t(:page_infos) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:info) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
         {{/if}}
+        </div>
         {{#if permissions.configure}}
-        <%= link_to_dialog(
-          render_icon('configure_page'),
-          alchemy.configure_admin_page_path(page),
-          {
-            title: Alchemy.t(:edit_page_properties),
-            size: page.redirects_to_external? ? '450x330' : '450x680'
-          },
-          title: Alchemy.t(:edit_page_properties),
-          class: 'sitemap_tool'
-        ) -%>
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_dialog(
+            render_icon(:configure_page),
+            alchemy.configure_admin_page_path(page),
+            {
+              title: Alchemy.t(:edit_page_properties),
+              size: page.redirects_to_external? ? '450x330' : '450x680'
+            }
+          ) -%>
+          <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:configure_page) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
         {{/if}}
-        <span class="sitemap_sitetools">
-          {{#if permissions.copy}}
+        </div>
+        {{#if permissions.copy}}
+        <div class="button_with_label sitemap_tool">
           <%= link_to(
-            render_icon("copy_page"),
+            render_icon(:copy_page),
             alchemy.insert_admin_clipboard_path(
               remarkable_type: page.class.name.demodulize.underscore.pluralize,
               remarkable_id: '__ID__',
             ).gsub('__ID__', '{{id}}'),
             remote: true,
-            method: 'post',
-            title: Alchemy.t(:copy_page),
-            class: 'sitemap_tool'
+            method: 'post'
           ) %>
-          {{/if}}
-          {{#if permissions.destroy}}
+          <label class="center"><%= Alchemy.t(:copy_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:copy_page) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.destroy}}
+        <div class="button_with_label sitemap_tool">
           <%= link_to_confirm_dialog(
-            render_icon('delete_page'),
+            render_icon(:delete_page),
             Alchemy.t(:confirm_to_delete_page),
             url_for(
               controller: 'pages',
               action: 'destroy',
               id: '__ID__'
-            ).gsub('__ID__', '{{id}}'),
-            {
-              title: Alchemy.t(:delete_page),
-              class: 'sitemap_tool'
-            }
+            ).gsub('__ID__', '{{id}}')
           ) -%>
-          {{/if}}
-          {{#if permissions.create}}
+          <label class="center"><%= Alchemy.t(:delete_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:delete_page) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.create}}
+        <div class="button_with_label sitemap_tool">
           <%= link_to_dialog(
-            render_icon('add_page'),
+            render_icon(:add_page),
             alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
             {
               title: Alchemy.t(:create_page),
               size: '340x165',
               overflow: true
-            },
-            title: Alchemy.t(:create_page),
-            class: 'sitemap_tool'
+            }
           ) -%>
-          {{/if}}
-        </span>
+          <label class="left"><%= Alchemy.t(:create_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:add_page) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
       <%- end -%>
     </div>
     <div class="page_infos" id="page_<%= page.id %>_infos">
-      <span class="page_status {{#unless public}}not_{{/unless}}public" title="{{status_titles.public}}"></span>
-      <span class="page_status {{#unless visible}}not_{{/unless}}visible" title="{{status_titles.visible}}"></span>
-      <span class="page_status {{#unless restricted}}not_{{/unless}}restricted" title="{{status_titles.restricted}}"></span>
+      <span class="page_status with-hint">
+        <span class="icon {{#unless public}}not_{{/unless}}public"></span>
+        <span class="hint-bubble">{{status_titles.public}}</span>
+      </span>
+      <span class="page_status with-hint">
+        <span class="icon {{#unless visible}}not_{{/unless}}visible"></span>
+        <span class="hint-bubble">{{status_titles.visible}}</span>
+      </span>
+      <span class="page_status with-hint">
+        <span class="icon {{#unless restricted}}not_{{/unless}}restricted"></span>
+        <span class="hint-bubble">{{status_titles.restricted}}</span>
+      </span>
     </div>
-    <div class="sitemap_sitename">
-      {{#if redirects_to_external}}
-      <span class="sitemap_pagename_link inactive">{{ name }}</span>
-      <span class="redirect_url" title="{{urlname}}">
+    {{#if redirects_to_external}}
+      <div class="redirect_url" title="{{urlname}}">
         &raquo; <%= Alchemy.t('Redirects to') %>:
         {{ external_urlname }}
-      </span>
+      </div>
+    {{/if}}
+    <div class="sitemap_sitename">
+      {{#if redirects_to_external}}
+        <span class="sitemap_pagename_link inactive">{{ name }}</span>
       {{else}}
-        <%= link_to_unless(
-          @sorting,
-          '{{name}}',
-          alchemy.edit_admin_page_path(page),
-          title: Alchemy.t(:edit_page),
-          class: "sitemap_pagename_link"
-        ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
+        {{#if permissions.edit_content}}
+          <%= link_to_unless(
+            @sorting,
+            '{{name}}',
+            alchemy.edit_admin_page_path(page),
+            title: Alchemy.t(:edit_page),
+            class: "sitemap_pagename_link"
+          ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
+        {{else}}
+          <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
+        {{/if}}
       {{/if}}
     </div>
   </div>

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

@@ -5,6 +5,7 @@
     </div>
     <div class="sitemap_right_tools">
       {{#unless redirects_to_external}}
+      <div class="button_with_label sitemap_tool">
         <%= link_to render_icon(:element_window),
           alchemy.list_admin_elements_path(page_id: '__ID__').gsub('__ID__', '{{id}}'),
           remote: true,
@@ -12,9 +13,10 @@
             'page-id' => '{{id}}',
             url: @url_prefix + '{{urlname}}'
           },
-          class: "show_elements_to_link sitemap_tool",
-          title: Alchemy.t(:show_elements_from_page)
+          class: "show_elements_to_link"
         %>
+        <label class="left"><%= Alchemy.t(:show_elements_from_page) %></label>
+      </div>
       {{/unless}}
     </div>
     <div class="page_infos">

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

@@ -1,12 +1,12 @@
-<%= content_tag 'span', '', class: [
-  'page_status',
-  page.public? ? 'public' : 'not_public'
-], title: page.status_title(:public) %>
-<%= content_tag 'span', '', class: [
-  'page_status',
-  page.visible? ? 'visible' : 'not_visible'
-], title: page.status_title(:visible) %>
-<%= content_tag 'span', '', class: [
-  'page_status',
-  page.restricted? ? 'restricted' : 'not_restricted'
-], title: page.status_title(:restricted) %>
+<span class="page_status with-hint">
+  <%= render_icon page.public? ? :public : :not_public %>
+  <span class="hint-bubble"><%= page.status_title(:public) %></span>
+</span>
+<span class="page_status with-hint">
+  <%= render_icon page.visible? ? :visible : :not_visible %>
+  <span class="hint-bubble"><%= page.status_title(:visible) %></span>
+</span>
+<span class="page_status with-hint">
+  <%= render_icon page.restricted? ? :restricted : :not_restricted %>
+  <span class="hint-bubble"><%= page.status_title(:restricted) %></span>
+</span>

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

@@ -1,5 +1,5 @@
 <% if page.definition.blank? %>
-  <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+  <%= page_layout_missing_warning %>
 <% end %>
 <span class="page_name" title="<%= page.name %>">
   <% if local_assigns[:truncate] %>

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

@@ -0,0 +1,35 @@
+<% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil,
+  data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats')},
+  disabled: @page.attribute_fixed?(:public_on) %>
+
+<label class="checkbox">
+<% if @page.attribute_fixed?(:public_on) || @page.attribute_fixed?(:public_until) %>
+  <span class="with-hint">
+    <%= checkbox %>
+    <%= Alchemy::Page.human_attribute_name :public %>
+    <span class="hint-bubble">
+      <%= Alchemy.t(:attribute_fixed) %>
+    </span>
+  </span>
+<% else %>
+  <%= checkbox %>
+  <%= Alchemy::Page.human_attribute_name :public %>
+<% end %>
+</label>
+
+<%= content_tag :div, class: [
+  @page.public_on.present? || @page.public_until.present? ? nil : 'hidden',
+  'page-publication-date-fields',
+  'input-row'
+] do %>
+  <div class="input-column">
+    <label><%= Alchemy.t(:from) %></label>
+    <%= alchemy_datepicker @page, :public_on, type: :datetime,
+      disabled: @page.attribute_fixed?(:public_on) %>
+  </div>
+  <div class="input-column">
+    <label><%= Alchemy.t(:until) %></label>
+    <%= alchemy_datepicker @page, :public_until, type: :datetime,
+      disabled: @page.attribute_fixed?(:public_until) %>
+  </div>
+<% end %>

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

@@ -1,5 +1,7 @@
 <% content_for(:title) { @page.name } %>
 
+<% content_for(:main_menu_style) { 'collapsed-menu' } %>
+
 <% content_for(:toolbar) do %>
 <div class="toolbar_buttons">
   <div class="button_with_label">
@@ -31,7 +33,6 @@
       },
       {
         class: 'icon_button',
-        title: Alchemy.t(:page_infos),
         'data-alchemy-hotkey' => 'alt+i'
       }
     ) %>
@@ -75,6 +76,10 @@
       <% end %>
     </div>
   <% end %>
+  <% if @page.has_hint? %>
+    <div class="toolbar_spacer"></div>
+    <%= render_hint_for(@page) %>
+  <% end %>
   <div class="toolbar_spacer"></div>
   <div class="select_with_label">
     <label><%= Alchemy.t(:preview_size) %></label>
@@ -107,6 +112,11 @@
 <% if Alchemy::Tinymce.custom_config_contents(@page).present? %>
   <%= render 'tinymce_custom_config' %>
 <% end %>
+
+<% content_for :javascript_includes do %>
+  <meta name="turbolinks-cache-control" content="no-cache">
+<% end %>
+
 <script type="text/javascript" charset="utf-8">
 
   $(function() {
@@ -117,7 +127,6 @@
     });
     Alchemy.Sitemap.watchPagePublicationState();
     Alchemy.PageLeaveObserver();
-    Alchemy.PreviewWindow.init('<%= admin_page_path(@page) %>');
     Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_id: @page.id) %>', {
       texts: {
         title: '<%= Alchemy.t("Elements") %>',
@@ -176,6 +185,8 @@
       }
     });
 
+    Alchemy.PreviewWindow.init('<%= admin_page_path(@page) %>');
+
     $('#preview_size').bind('open.selectBoxIt', function (e) {
       $('#top_menu').css('z-index', 5000);
     });

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

@@ -45,9 +45,9 @@
 </div>
 <div class="js_filter_field_box">
   <%= text_field_tag 'filter', '',
-    class: 'thin_border js_filter_field',
-    id: 'search_field',
-    placeholder: Alchemy.t(:search) %>
+    class: 'thin_border js_filter_field search_input_field',
+    placeholder: Alchemy.t(:search),
+    id: nil %>
   <%= render_icon :search %>
   <%= link_to('', '#', {
     class: "js_filter_field_clear",
@@ -72,11 +72,6 @@
 
   <h1 id="page_filter_result"></h1>
 
-  <h2 id="sitemap_heading">
-    <span class="page_name"><%= Alchemy.t('Name') %></span>
-    <span class="page_infos"><%= Alchemy.t('Status') %></span>
-  </h2>
-
   <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>
 
 <% elsif can?(:create, Alchemy::Page) %>

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

@@ -7,7 +7,7 @@
   <div class="value">
     <label>
       <% if @page.definition.blank? %>
-        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+        <%= page_layout_missing_warning %>
       <% end %>
       <%= Alchemy::Page.human_attribute_name(:page_layout) %>
     </label>
@@ -24,7 +24,20 @@
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_status) %></label>
-    <p><%= combined_page_status(@page) %></p>
+    <p>
+      <span class="page_status">
+        <%= render_icon @page.public? ? :public : :not_public %>
+        <%= @page.status_title(:public) %>
+      </span>
+      <span class="page_status">
+        <%= render_icon @page.visible? ? :visible : :not_visible %>
+        <%= @page.status_title(:visible) %>
+      </span>
+      <span class="page_status">
+        <%= render_icon @page.restricted? ? :restricted : :not_restricted %>
+        <%= @page.status_title(:restricted) %>
+      </span>
+    </p>
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_was_created) %></label>

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

@@ -1,4 +1,4 @@
-$('#sitemap').replaceWith('<%= j render('sitemap', page_partial: 'page', full: true) %>');
+$('#sitemap-wrapper').replaceWith('<%= j render('sitemap', page_partial: 'page', full: true) %>');
 $('#sort_panel').show();
 $('#sitemap_heading').css({'padding-top': 102});
 Alchemy.pleaseWaitOverlay(false);

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

@@ -9,7 +9,7 @@
 <% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
-  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("page_status", page: @page) %>');
+  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("current_page", current_page: @page) %>');
 
 <% else -%>
 
@@ -18,19 +18,6 @@
   var tree = JSON.parse('<%== @tree.to_json %>');
   var html = compiler(tree.pages[0]);
   $('#page_<%= @page.id %>').replaceWith(html);
-  $page = $('#page_<%= @page.id %>');
-
-  <% if @page.locked? && @page.locker == current_alchemy_user -%>
-    $('#locked_page_<%= @page.id %> > a').html('<%= @page.name %>');
-  <% end -%>
-
-  <% if @page.restricted? -%>
-    $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
-  <% elsif @page.redirects_to_external? -%>
-    $('span.redirect_url', $page).html('&raquo; <%= Alchemy.t("Redirects to") %>: <%= h @page.external_urlname %>');
-  <% else -%>
-    $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
-  <% end -%>
 
 <% end -%>