alchemy_cms 3.3.3 → 3.4.0.rc1

data/app/models/alchemy/site.rb

@@ -44,6 +44,14 @@ module Alchemy
       "alchemy/site_layouts/#{partial_name}"
     end
 
+    # The default language for this site
+    #
+    # There can only be one default language per site.
+    #
+    def default_language
+      languages.find_by(default: true)
+    end
+
     class << self
       def current=(v)
         RequestStore.store[:alchemy_current_site] = v

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -57,7 +57,7 @@ module Alchemy
         page_layout: page.page_layout,
         slug: page.slug,
         redirects_to_external: page.redirects_to_external?,
-        locked: page.locked,
+        locked: page.locked?,
         definition_missing: page.definition.blank?,
         urlname: page.urlname,
         external_urlname: page.external_urlname,

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

@@ -13,15 +13,18 @@
   <% end %>
   <%= render 'alchemy/admin/partials/remote_search_form' %>
 </div>
+
 <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
-  <% if any_tags = Alchemy::Attachment.tag_counts.any? %>
   <div id="library_sidebar">
-    <div class="tag-list">
-      <%= render 'tag_list' %>
-    </div>
+    <%= render 'filter_bar' %>
+
+    <% if Alchemy::Attachment.tag_counts.any? %>
+      <div class="tag-list">
+        <%= render 'tag_list' %>
+      </div>
+    <% end %>
   </div>
-  <% end %>
-  <div id="overlay_file_list" class="<%= any_tags ? 'with_tag_list' : nil %>">
+  <div id="overlay_file_list" class="with_tag_list">
     <%= render 'overlay_file_list' %>
   </div>
 </div>

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

@@ -1,15 +1,17 @@
 <li class="assign_file_file <%= cycle('even', 'odd') %>">
-  <%= link_to(
-    render_icon(file_to_assign.icon_css_class) + file_to_assign.name,
-    {
-      controller: 'essence_files',
-      action: 'assign',
+  <%= link_to alchemy.assign_admin_essence_files_path(
       attachment_id: file_to_assign.id,
       content_id: @content.id,
       options: @options.to_json
-    },
+    ),
     remote: true,
-    method: 'put',
-    title: file_to_assign.name
-  ) %>
+    method: 'put' do %>
+    <span class="list-primary">
+      <%= render_icon(file_to_assign.icon_css_class) %>
+      <%= file_to_assign.name %>
+    </span>
+    <span class="list-secondary">
+      <%= mime_to_human(file_to_assign.file_mime_type) %>
+    </span>
+  <% end %>
 </li>

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

@@ -0,0 +1,32 @@
+<% params_to_keep = [:tagged_with, :q, :content_id, :options] %>
+
+<div id="filter_bar">
+  <h2><%= Alchemy.t('Filter') %></h2>
+  <%= select_tag(
+    'file_type_filter',
+    options_for_select(
+      Alchemy::Attachment.file_types_for_select,
+      params[:file_type]
+    ),
+    include_blank: Alchemy.t('Show all files'),
+    data: { remote: !!request.xhr? },
+    class: 'alchemy_selectbox'
+  ) %>
+</div>
+
+<script type="text/javascript">
+  $(function() {
+    $('#file_type_filter').on('change', function(e) {
+      var $this = $(this);
+      var url = '<%= alchemy.admin_attachments_path(merge_params_only(params_to_keep)).html_safe %>';
+      if ($this.data('remote') === true) {
+        $.get(url, {file_type: $this.val()}, null, 'script');
+      } else {
+        Alchemy.pleaseWaitOverlay();
+        delimiter = url.match(/\?/) ? '&' : '?';
+        window.location = url + delimiter + 'file_type=' + encodeURIComponent($this.val());
+      }
+      return false;
+    });
+  });
+</script>

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

@@ -1,10 +1,22 @@
 <% if @attachments.empty? %>
   <div class="info">
     <%= render_icon('info') %>
-    <%= Alchemy.t(:no_files_in_archive) %>
+    <% if params[:q].present? %>
+      <%= Alchemy.t(:no_search_results) %>
+    <% else %>
+      <%= Alchemy.t(:no_files_in_archive) %>
+    <% end %>
   </div>
 <% else %>
-  <ul>
+  <ul class="list">
+    <li class="list-header">
+      <span class="list-primary">
+        <%= Alchemy::Attachment.human_attribute_name('name') %>
+      </span>
+      <span class="list-secondary">
+        <%= Alchemy::Attachment.human_attribute_name('file_mime_type') %>
+      </span>
+    </li>
     <%= render partial: 'file_to_assign', collection: @attachments %>
   </ul>
   <%= paginate @attachments, theme: 'alchemy', remote: true %>

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

@@ -1,5 +1,3 @@
-<% any_tags = Alchemy::Attachment.tag_counts.any? %>
-
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
     <% if can? :create, Alchemy::Attachment %>
@@ -12,14 +10,17 @@
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
-<div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
+<div id="archive_all" class="with_tag_filter resources-table-wrapper">
   <%= resources_header %>
-  <%= render partial: 'files_list' %>
-  <% if any_tags %>
+  <%= render 'files_list' %>
+
   <div id="library_sidebar">
-    <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
-      <%= render partial: 'tag_list' %>
-    </div>
+    <%= render 'filter_bar' %>
+
+    <% if Alchemy::Attachment.tag_counts.any? %>
+      <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
+        <%= render 'tag_list' %>
+      </div>
+    <% end %>
   </div>
-  <% end %>
 </div>

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

@@ -8,28 +8,39 @@
   <% else %>
     <% @all_locked_pages.each do |page| %>
     <tr class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
-      <% if current_alchemy_user.id == page.locked_by %>
       <td>
+        <% if current_alchemy_user.id == page.locked_by %>
         <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %>
+        <% else %>
+        <%= page.name %>
+        <% end %>
+      </td>
+      <% if multi_site? %>
+      <td>
+        <small><%= page.site_name %></small>
       </td>
+      <% end %>
       <td>
+        <% if page.site_languages.many? %>
+        <small><%= page.language.code.upcase %></small>
+        <% end %>
+      </td>
+      <td>
+        <% if current_alchemy_user.id == page.locked_by %>
         <small><%= Alchemy.t(:me) %></small>
+        <% else %>
+        <small><%= page.locker_name %></small>
+        <% end %>
       </td>
       <td>
+        <% if current_alchemy_user.id == page.locked_by %>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
           <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
             <%= render_icon('close small') %>
           </button>
         <% end %>
+        <% end %>
       </td>
-      <% else %>
-      <td>
-        <%= page.name %>
-      </td>
-      <td colspan="2">
-        <small><%= page.locker_name %></small>
-      </td>
-    <% end %>
     </tr>
     <% end %>
   <% end %>

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

@@ -11,8 +11,18 @@
       <td>
         <%= link_to_if((page.locked_by.blank? || page.locked_by == current_alchemy_user.id), page.name, edit_admin_page_path(page)) %>
       </td>
+      <% if multi_site? %>
       <td>
-        <small><%= l(page.updated_at) %></small>
+        <small><%= page.site_name %></small>
+      </td>
+      <% end %>
+      <td>
+        <% if page.site_languages.many? %>
+        <small><%= page.language.code.upcase %></small>
+        <% end %>
+      </td>
+      <td>
+        <small><%= l(page.updated_at, format: :short) %></small>
       </td>
     </tr>
     <% end %>

data/app/views/alchemy/admin/languages/_form.html.erb

@@ -19,5 +19,6 @@
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :public %>
   <%= f.input :default %>
+  <%= f.hidden_field :site_id, value: Alchemy::Site.current.id %>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1,9 +1,9 @@
 <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
-<% toolbar(
-  buttons: [
-    {
-      icon: 'create',
+<% content_for :toolbar do %>
+  <div class="toolbar_buttons">
+    <%= render 'alchemy/admin/partials/site_select' %>
+    <%= toolbar_button icon: 'create',
       label: label_title,
       url: new_resource_path,
       title: label_title,
@@ -12,10 +12,9 @@
         title: label_title,
         size: "430x415"
       },
-      if_permitted_to: [:create, resource_model]
-    }
-  ]
-) %>
+      if_permitted_to: [:create, Alchemy::Language] %>
+  </div>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
   <%= resources_header %>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -1,5 +1,5 @@
 <li class="page_level_<%= layoutpage.level %>" id="page_<%= layoutpage.id %>">
-  <div class="sitemap_page<%= layoutpage.locked ? ' locked' : '' %>">
+  <div class="sitemap_page<%= layoutpage.locked? ? ' locked' : '' %>">
     <div class="sitemap_left_images">
     <% if layoutpage.definition.blank? %>
       <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>

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

@@ -1,7 +1,7 @@
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
-  <%= render partial: 'alchemy/admin/partials/language_tree_select' %>
-  <div class="toolbar_spacer"></div>
+  <%= render 'alchemy/admin/partials/site_select' %>
+  <%= render 'alchemy/admin/partials/language_tree_select' %>
   <%= toolbar_button(
     icon: 'add_page',
     url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),

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

@@ -0,0 +1,4 @@
+<div class="page_status_and_name" id="page_<%= current_page.id %>_status">
+  <%= render 'alchemy/admin/pages/page_status', page: current_page %>
+  <%= render 'alchemy/admin/pages/page_infos', page: current_page %>
+</div>

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

@@ -8,9 +8,24 @@
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
       <label class="checkbox">
-        <%= f.check_box :public %>
+        <%= check_box_tag :page_public, nil, @page.public?, name: nil,
+          data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats')} %>
         <%= f.object.class.human_attribute_name :public %>
       </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 %>
+        </div>
+        <div class="input-column">
+          <label><%= Alchemy.t(:until) %></label>
+          <%= alchemy_datepicker @page, :public_until, type: :datetime %>
+        </div>
+      <% end %>
       <label class="checkbox">
         <%= f.check_box :visible %>
         <%= f.object.class.human_attribute_name :visible %>

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

@@ -1,19 +1,9 @@
 <% if @page == locked_page %>
-  <%= render 'page_status', page: @page %>
+  <%= render 'alchemy/admin/pages/current_page', current_page: @page %>
 <% else %>
   <div class="subnavi_tab wide" id="locked_page_<%= locked_page.id %>">
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
-      <% if locked_page.definition.blank? %>
-        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
-      <% end %>
-      <span class="page_name" title="<%= locked_page.name %>">
-        <%= truncate locked_page.name, length: 15 %>
-      </span>
-      <%- if multi_language? -%>
-        <span class="page_language" title="<%= locked_page.language.name %>">
-          <%= locked_page.language_code %>
-        </span>
-      <%- end -%>
+      <%= render 'alchemy/admin/pages/page_status', page: locked_page, truncate: true %>
     <% end %>
     <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
       <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">

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

@@ -43,7 +43,7 @@
           alchemy.configure_admin_page_path(page),
           {
             title: Alchemy.t(:edit_page_properties),
-            size: page.redirects_to_external? ? '450x330' : '450x720'
+            size: page.redirects_to_external? ? '450x330' : '450x680'
           },
           title: Alchemy.t(:edit_page_properties),
           class: 'sitemap_tool'

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

@@ -5,14 +5,14 @@
     </div>
     <div class="sitemap_right_tools">
       {{#unless redirects_to_external}}
-        <%= link_to '',
+        <%= link_to render_icon(:element_window),
           alchemy.list_admin_elements_path(page_id: '__ID__').gsub('__ID__', '{{id}}'),
           remote: true,
           data: {
             'page-id' => '{{id}}',
             url: @url_prefix + '{{urlname}}'
           },
-          class: "show_elements_to_link",
+          class: "show_elements_to_link sitemap_tool",
           title: Alchemy.t(:show_elements_from_page)
         %>
       {{/unless}}

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

@@ -1,12 +1,24 @@
-<div class="page_status_and_name" id="page_<%= page.id %>_status">
-  <% if page.definition.blank? %>
-    <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+<% if page.definition.blank? %>
+  <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+<% end %>
+<span class="page_name" title="<%= page.name %>">
+  <% if local_assigns[:truncate] %>
+    <%= truncate page.name, length: 15 %>
+  <% else %>
+    <%= page.name %>
   <% end %>
-  <span class="page_name"><%= page.name %></span>
-  <%- if multi_language? -%>
-    <span class="page_language" title="<%= page.language.name %>">
-      <%= page.language_code %>
-    </span>
-  <%- end -%>
-  <%= render 'alchemy/admin/pages/page_infos', page: page %>
-</div>
+</span>
+<%- if multi_site? -%>
+  <span class="page_site" title="<%= page.site_name %>">
+    <% if local_assigns[:truncate] %>
+      <%= truncate page.site_name, length: 15 %>
+    <% else %>
+      <%= page.site_name %>
+    <% end %>
+  </span>
+<%- end -%>
+<%- if page.site_languages.many? -%>
+  <span class="page_language" title="<%= page.language.name %>">
+    <%= page.language_code %>
+  </span>
+<%- end -%>

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

@@ -56,7 +56,7 @@
         alchemy.configure_admin_page_path(@page),
         {
           title: Alchemy.t(:edit_page_properties),
-          size: '450x720'
+          size: '450x680'
         },
         class: :icon_button,
         title: Alchemy.t(:edit_page_properties),
@@ -115,6 +115,7 @@
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
       return not_dirty;
     });
+    Alchemy.Sitemap.watchPagePublicationState();
     Alchemy.PageLeaveObserver();
     Alchemy.PreviewWindow.init('<%= admin_page_path(@page) %>');
     Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_id: @page.id) %>', {

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

@@ -1,7 +1,7 @@
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
-  <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
-  <div class="toolbar_spacer"></div>
+  <%= render 'alchemy/admin/partials/site_select' %>
+  <%= render 'alchemy/admin/partials/language_tree_select' %>
   <% if can?(:flush, Alchemy::Page) %>
   <div class="button_with_label">
     <%= link_to(

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

@@ -1,3 +1,4 @@
+<%- if multi_language? -%>
 <div class="button_with_label">
   <%= form_tag switch_language_admin_pages_path, method: 'get' do %>
     <%= select_tag(
@@ -9,3 +10,5 @@
   <% end %>
   <label><%= Alchemy.t("Language tree") %></label>
 </div>
+<div class="toolbar_spacer"></div>
+<% end %>