alchemy_cms 5.1.0.beta2 → 5.1.3

data/app/models/alchemy/site/layout.rb

@@ -25,10 +25,38 @@ module Alchemy
       end
     end
 
-    # Returns site's layout definition
+    # Returns sites layout definition
     #
     def definition
-      self.class.definitions.detect { |l| l["name"] == partial_name }
+      self.class.definitions.detect { |l| l["name"] == partial_name } || {}
+    end
+
+    # Returns sites page layout names
+    #
+    # If no site layout file is defined all page layouts are returned
+    #
+    # @param [Boolean] layoutpages Return layout pages only (default false)
+    #
+    # @return [Array<String>] Array of page layout names
+    #
+    def page_layout_names(layoutpages: false)
+      page_layout_definitions.select do |layout|
+        !!layout["layoutpage"] && layoutpages || !layout["layoutpage"] && !layoutpages
+      end.collect { |layout| layout["name"] }
+    end
+
+    # Returns sites page layout definitions
+    #
+    # If no site layout file is defined all page layouts are returned
+    #
+    def page_layout_definitions
+      if definition["page_layouts"].presence
+        Alchemy::PageLayout.all.select do |layout|
+          layout["name"].in?(definition["page_layouts"])
+        end
+      else
+        Alchemy::PageLayout.all
+      end
     end
 
     # Returns the name for the layout partial

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -40,7 +40,7 @@ module Alchemy
 
         level = path.count + base_level
 
-        path.last[:children] << page_hash(page, has_children, level, folded)
+        path.last[:children] << page_hash(page, level, folded)
       end
 
       tree
@@ -48,7 +48,7 @@ module Alchemy
 
     protected
 
-    def page_hash(page, has_children, level, folded)
+    def page_hash(page, level, folded)
       p_hash = {
         id: page.id,
         name: page.name,
@@ -59,8 +59,8 @@ module Alchemy
         urlname: page.urlname,
         url_path: page.url_path,
         level: level,
-        root: page.depth == 1,
-        root_or_leaf: page.depth == 1 || !has_children,
+        root: page.root?,
+        root_or_leaf: page.root? || page.leaf?,
         children: [],
       }
 

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -25,7 +25,7 @@
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
         <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents.map { |content| Alchemy::ContentEditor.new(content) } %>
+          <%= render element.contents %>
         </div>
 
         <% if element.taggable? %>

data/app/views/alchemy/admin/elements/_element_toolbar.html.erb

@@ -1,4 +1,4 @@
-<% remarkable_type = element.class.name.demodulize.underscore.pluralize %>
+<% remarkable_type = "elements" %>
 <div class="element-toolbar">
   <span class="element_tools">
     <div class="button_with_label">

data/app/views/alchemy/admin/elements/publish.js.erb

@@ -16,5 +16,6 @@ var eye = el.find('> .element-toolbar .publish-element-button .icon');
   eye.addClass('fa-eye');
   label.text('<%= Alchemy.t(:show_element) %>');
 <%- end -%>
+el.toggleClass('visible hidden');
 
 Alchemy.reloadPreview();

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

@@ -1,8 +1,7 @@
 <div class="panel">
   <%= render_message do %>
-    <p><%= Alchemy.t(:language_does_not_exist) %></p>
+    <p><%= Alchemy.t(:homepage_does_not_exist) %></p>
   <% end %>
-<%- if @language -%>
 
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
@@ -19,32 +18,23 @@
     <% end %>
   <%- end -%>
 
-  <%- if params[:action] == "index" -%>
-    <%= alchemy_form_for([:admin, Alchemy::Page.new], id: 'create_language_tree') do |form| %>
-      <% if @languages_with_page_tree.size >= 1 %>
-        <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
-        <p><%= Alchemy.t(:want_to_create_new_language) %></p>
-      <% end %>
-      <%= form.input :name, input_html: {value: @language.frontpage_name} %>
-      <%= form.input :page_layout,
-        collection: @page_layouts,
-        selected: @language.page_layout,
-        label: Alchemy.t(:page_type),
-        include_blank: Alchemy.t('Please choose'),
-        required: true,
-        input_html: {class: 'alchemy_selectbox'} %>
-      <%= form.hidden_field :language_id, value: @language.id %>
-      <%= form.hidden_field :language_code, value: @language.code %>
-      <%= form.hidden_field :language_root, value: true %>
-      <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
-      <%= form.submit Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
+  <%= alchemy_form_for([:admin, Alchemy::Page.new], id: 'create_language_tree') do |form| %>
+    <% if @languages_with_page_tree.size >= 1 %>
+      <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
+      <p><%= Alchemy.t(:want_to_create_new_language) %></p>
     <% end %>
-  <%- end -%>
-
-<%- else -%>
-
-  <p><%= Alchemy.t("Actually this language does not exist. Please create this language first.") %></p>
-
-<%- end -%>
-
+    <%= form.input :name, input_html: {value: @language.frontpage_name} %>
+    <%= form.input :page_layout,
+      collection: @page_layouts,
+      selected: @language.page_layout,
+      label: Alchemy.t(:page_type),
+      include_blank: Alchemy.t('Please choose'),
+      required: true,
+      input_html: {class: 'alchemy_selectbox'} %>
+    <%= form.hidden_field :language_id, value: @language.id %>
+    <%= form.hidden_field :language_code, value: @language.code %>
+    <%= form.hidden_field :language_root, value: true %>
+    <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
+    <%= form.submit Alchemy.t(:create), autofocus: true %>
+  <% end %>
 </div>

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

@@ -1,5 +1,14 @@
 <%= alchemy_form_for([:admin, @page]) do |f| %>
-  <%= f.hidden_field(:parent_id) %>
+  <% if @page.parent_id || @page.layoutpage %>
+    <%= f.hidden_field(:parent_id) %>
+  <% else %>
+    <% @page.parent = @current_language.root_page %>
+    <%= f.input :parent_id,
+      collection: @current_language.pages.contentpages,
+      label_method: :name,
+      value_method: :id,
+      input_html: { class: "alchemy_selectbox" } %>
+  <% end %>
   <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
   <%= f.input :page_layout,

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

@@ -0,0 +1,29 @@
+<div id="page_layout_filter">
+  <label>
+    <h3><%= Alchemy::Page.human_attribute_name(:page_layout) %></h3>
+    <%= select_tag(
+      "page_layout",
+      options_for_select(
+        @current_language.site.page_layout_names.map do |layout|
+          [
+            Alchemy::PageLayout.human_layout_name(layout),
+            layout
+          ]
+        end,
+        search_filter_params[:page_layout]
+      ),
+      include_blank: Alchemy.t(:all, scope: ["resources", "page", "filters"]),
+      class: "alchemy_selectbox full_width"
+    ) %>
+  </label>
+</div>
+
+<script type="text/javascript">
+  $(function() {
+    $("#page_layout").on("change", function(e) {
+      var url = "<%= alchemy.admin_pages_path(search_filter_params.except(:page_layout, :page).merge(view: "list")) %>";
+      delimiter = url.match(/\?/) ? "&" : "?";
+      Turbolinks.visit(url + delimiter + "page_layout=" + encodeURIComponent($(this).val()));
+    });
+  });
+</script>

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

@@ -0,0 +1,27 @@
+<table class="list">
+  <thead>
+    <tr>
+      <th class="icon"></th>
+      <th class="string name">
+        <%= sort_link [:alchemy, @query],
+          "name",
+          Alchemy::Page.human_attribute_name(:name),
+          default_order: "asc" %>
+      </th>
+      <th><%= Alchemy::Page.human_attribute_name(:urlname) %></th>
+      <th><%= Alchemy::Page.human_attribute_name(:page_type) %></th>
+      <th><%= Alchemy::Page.human_attribute_name(:tag_list) %></th>
+      <th>
+        <%= sort_link [:alchemy, @query],
+          :updated_at,
+          Alchemy::Page.human_attribute_name(:updated_at),
+          default_order: "desc" %>
+      </th>
+      <th class="status center"><%= Alchemy::Page.human_attribute_name(:status) %></th>
+      <th class="tools"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: "table_row", collection: @pages, as: "page" %>
+  </tbody>
+</table>

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

@@ -0,0 +1,107 @@
+<tr class="<%= cycle(:even, :odd) %>" data-page-id="<%= page.id %>">
+  <td class="icon">
+    <% if can?(:edit_content, page) %>
+      <% if page.locked? %>
+        <span class="with-hint">
+          <i class="icon fas fa-edit fa-fw"></i>
+          <span class="hint-bubble">
+            <%= Alchemy.t("This page is locked", name: page.locker_name) %>
+          </span>
+        </span>
+      <% else %>
+        <i class="icon far fa-file fa-lg"></i>
+      <% end %>
+    <% else %>
+      <span class="with-hint">
+        <i class="icon fas fa-ban fa-fw"></i>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      </span>
+    <% end %>
+  </td>
+  <td class="string name">
+    <%= link_to_if(
+      can?(:edit_content, page),
+      page.name,
+      alchemy.edit_admin_page_path(page),
+      title: Alchemy.t(:edit_page),
+    ) { content_tag(:span, page.name) } -%>
+  </td>
+  <td class="url">
+    <%= page.url_path %>
+  </td>
+  <td class="page_layout">
+    <%= Alchemy.t(page.page_layout, scope: "page_layout_names", default: page.page_layout.to_s.humanize) %>
+  </td>
+  <td class="tags">
+    <% page.tag_list.each do |tag| %>
+      <%= content_tag(:span, tag, class: "tag") %>
+    <% end %>
+  </td>
+  <td class="date">
+    <%= l(page.updated_at, format: :"alchemy.default") %>
+  </td>
+  <td class="status center">
+    <span class="page_status with-hint">
+      <i class="icon fas fa-fw fa-compass <% unless page.public? %>disabled<% end %>" data-fa-transform="shrink-2"></i>
+      <span class="hint-bubble"><%= page.status_title(:public) %></span>
+    </span>
+    <span class="page_status with-hint">
+      <i class="icon fas fa-fw fa-lock <% unless page.restricted? %>disabled<% end %>" data-fa-transform="shrink-2"></i>
+      <span class="hint-bubble"><%= page.status_title(:restricted) %></span>
+    </span>
+  </td>
+  <td class="tools">
+    <% if can?(:info, page) %>
+      <div class="button_with_label">
+        <%= link_to_dialog(
+          render_icon('info-circle'),
+          alchemy.info_admin_page_path(page),
+          {
+            title: Alchemy.t(:page_infos),
+            size: '520x290'
+          }
+        ) %>
+        <label class="center"><%= Alchemy.t(:page_infos) %></label>
+      </div>
+    <% end %>
+    <% if can?(:configure, page) %>
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_dialog(
+          render_icon(:cog),
+          alchemy.configure_admin_page_path(page),
+          {
+            title: Alchemy.t(:edit_page_properties),
+            size: '450x680'
+          }
+        ) -%>
+        <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
+      </div>
+    <% end %>
+    <% if can?(:copy, page) %>
+      <div class="button_with_label sitemap_tool">
+        <%= link_to(
+          render_icon(:copy),
+          alchemy.insert_admin_clipboard_path(
+            remarkable_type: :pages,
+            remarkable_id: page.id,
+          ),
+          remote: true,
+          method: :post
+        ) %>
+        <label class="center"><%= Alchemy.t(:copy_page) %></label>
+      </div>
+    <% end %>
+    <% if can?(:destroy, page) %>
+      <div class="button_with_label">
+        <%= link_to_confirm_dialog(
+          render_icon(:minus),
+          Alchemy.t(:confirm_to_delete_page),
+          alchemy.admin_page_path(page)
+        ) -%>
+        <label class="center"><%= Alchemy.t(:delete_page) %></label>
+      </div>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,77 @@
+<div class="toolbar_buttons">
+  <%= render "alchemy/admin/partials/site_select" %>
+  <%= render "alchemy/admin/partials/language_tree_select" %>
+  <%= toolbar_button(
+    icon: :plus,
+    url: alchemy.new_admin_page_path(language: @current_language),
+    hotkey: 'alt+n',
+    dialog_options: {
+      title: Alchemy.t('Add a page'),
+      size: '340x215',
+      overflow: true
+    },
+    title: Alchemy.t('Add a page'),
+    label: Alchemy.t('Add a page'),
+    if_permitted_to: [:create, Alchemy::Page]
+  ) %>
+  <div class="toolbar_spacer"></div>
+  <% if can?(:flush, Alchemy::Page) %>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:eraser),
+        alchemy.flush_admin_pages_path,
+        remote: true,
+        method: :post,
+        class: "icon_button please_wait",
+        title: Alchemy.t("Flush page cache")
+      ) %>
+      <label><%= Alchemy.t("Flush page cache") %></label>
+    </div>
+  <% end %>
+  <% if can?(:sort, Alchemy::Page) %>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:random),
+        alchemy.sort_admin_pages_path,
+        method: :get,
+        class: "icon_button",
+        title: Alchemy.t("Sort pages")
+      ) %>
+      <label><%= Alchemy.t("Sort pages") %></label>
+    </div>
+  <% end %>
+  <div class="button_with_label" id="clipboard_button">
+    <%= link_to_dialog(
+      render_icon(clipboard_empty?("pages") ? :clipboard : :paste),
+      alchemy.admin_clipboard_path(remarkable_type: "pages"),
+      {
+        title: Alchemy.t("Clipboard"),
+        size: "380x305"
+      },
+      class: "icon_button",
+      title: Alchemy.t("Show clipboard")
+    ) %>
+    <label><%= Alchemy.t("Show clipboard") %></label>
+  </div>
+  <div class="toolbar_spacer"></div>
+  <div class="button_with_label<%= @view != "list" ? " active" : nil %>">
+    <%= link_to(
+      render_icon(:stream),
+      alchemy.admin_pages_path(view: "tree"),
+      class: "icon_button"
+    ) %>
+    <label><%= Alchemy.t("Hierarchical") %></label>
+  </div>
+  <div class="button_with_label<%= @view == "list" ? " active" : nil %>">
+    <%= link_to(
+      render_icon("sort-amount-down-alt"),
+      alchemy.admin_pages_path(view: "list"),
+      class: "icon_button"
+    ) %>
+    <label><%= Alchemy.t("Sortable List") %></label>
+  </div>
+</div>
+<% search_filter_params[:view] = "list" %>
+<%= render "alchemy/admin/partials/search_form",
+  url: alchemy.admin_pages_path(search_filter_params.except(:q, :page)),
+  additional_params: [:view, :page_layout, :tagged_with, :filter] %>

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

@@ -3,81 +3,48 @@
 <% end %>
 
 <% content_for :toolbar do %>
-<div class="toolbar_buttons">
-  <%= 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(
-      render_icon(:eraser),
-      alchemy.flush_admin_pages_path,
-      :remote => true,
-      :method => :post,
-      :class => 'icon_button please_wait',
-      :title => Alchemy.t('Flush page cache')
-    ) %>
-    <label><%= Alchemy.t('Flush page cache') %></label>
-  </div>
-  <% end %>
-  <% if can?(:sort, Alchemy::Page) %>
-  <div class="button_with_label">
-    <%= link_to(
-      render_icon(:random),
-      alchemy.sort_admin_pages_path,
-      method: :get,
-      class: 'icon_button',
-      title: Alchemy.t('Sort pages')
-    ) %>
-    <label><%= Alchemy.t('Sort pages') %></label>
-  </div>
-  <% end %>
-  <div class="button_with_label" id="clipboard_button">
-    <%= link_to_dialog(
-      render_icon(clipboard_empty?('pages') ? :clipboard : :paste),
-      alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
-      {
-        :title => Alchemy.t('Clipboard'),
-        :size => '380x305'
-      },
-      :class => 'icon_button',
-      :title => Alchemy.t('Show clipboard')
-    ) %>
-    <label><%= Alchemy.t('Show clipboard') %></label>
-  </div>
-</div>
-<div class="search_form">
-  <div class="search_field">
-    <label>
-      <%= text_field_tag 'filter', '',
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search),
-        id: nil %>
-      <%= render_icon :search %>
-    </label>
-    <%= link_to(render_icon(:times, size: 'xs'), '#', {
-      class: "search_field_clear",
-      title: Alchemy.t(:click_to_show_all)
-    }) %>
-  </div>
-</div>
+  <%= render "alchemy/admin/pages/toolbar" %>
 <% end %>
 
-<div id="archive_all">
-<% if @page_root %>
-  <h2 id="page_filter_result"></h2>
-
-  <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>
-
-<% elsif can?(:create, Alchemy::Page) %>
-
-  <%= render partial: 'create_language_form' %>
-
-<% else %>
-
-  <%= render_message :warn do %>
-    <h2>No language root page found.</h2>
-    <p>Please ask the admin to create one.</p>
+<%= content_tag :div,
+  id: "archive_all",
+  class: [@view == "list" && "resources-table-wrapper with_tag_filter"] do %>
+  <% if @view == "list" %>
+    <%= render "alchemy/admin/resources/table_header", resources_instance_variable: @pages %>
+    <% if @pages.any? %>
+      <%= render "table" %>
+    <% elsif search_filter_params.present? %>
+      <%= render_message do %>
+        <%= Alchemy.t("No pages found") %>
+      <% end %>
+    <% elsif can?(:create, Alchemy::Page) %>
+      <%= render partial: "create_language_form" %>
+    <% end %>
+
+    <%= paginate @pages, scope: alchemy, theme: "alchemy" %>
+
+    <div id="library_sidebar">
+      <%= render "page_layout_filter" %>
+
+      <%= render "filter_bar",
+        label: Alchemy::Page.human_attribute_name(:status),
+        url: alchemy.admin_pages_path(search_filter_params.except(:filter, :page).merge(view: "list")) %>
+
+      <% if resource_has_tags %>
+        <%= render "tag_list" %>
+      <% end %>
+    </div>
+  <% else %>
+    <% if @page_root %>
+      <h2 id="page_filter_result"></h2>
+      <%= render "sitemap", page_partial: "page", full: !!@sorting %>
+    <% elsif can?(:create, Alchemy::Page) %>
+      <%= render partial: "create_language_form" %>
+    <% else %>
+      <%= render_message :warn do %>
+        <h2>No language root page found.</h2>
+        <p>Please ask the admin to create one.</p>
+      <% end %>
+    <% end %>
   <% end %>
-
 <% end %>
-</div>