alchemy_cms 5.1.0.beta1 → 5.1.2

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>

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

@@ -0,0 +1,31 @@
+<% if @pages.any? %>
+  <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 class="status center"><%= Alchemy::Page.human_attribute_name(:status) %></th>
+        <th class="tools"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: "page", collection: @pages %>
+    </tbody>
+  </table>
+<% elsif search_filter_params.present? %>
+  <%= render_message do %>
+    <%= Alchemy.t('No pages found') %>
+  <% end %>
+<% else %>
+  <%= render partial: 'alchemy/admin/pages/create_language_form' %>
+<% end %>
+
+<%= paginate @pages, scope: alchemy, theme: 'alchemy' %>

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

@@ -2,12 +2,12 @@
   var locked_page_tab = document.querySelector('#locked_page_<%= @page.id -%>')
   var locked_page_icon = document.querySelector(
     '#page_<%= @page.id -%> > .sitemap_page > .sitemap_left_images .with-hint'
-  )
+  ) || document.querySelector('[data-page-id="<%= @page.id -%>"] > .icon')
   if (locked_page_tab) {
     locked_page_tab.remove()
   }
   if (locked_page_icon) {
-    locked_page_icon.innerHTML = '<%= j render_icon(:file, style: 'regular', size: 'lg') %>'
+    locked_page_icon.innerHTML = '<i class="icon far fa-file fa-lg"></i>'
   }
   Alchemy.growl('<%= flash[:notice] -%>')
 })()

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

@@ -1,5 +1,5 @@
 (function() {
-  var $page;
+  var page = document.querySelector('#page_<%= @page.id %>');
 
 <% if @old_page_layout != @page.page_layout -%>
   Alchemy.ElementsWindow.reload();
@@ -9,18 +9,27 @@
 <% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
-  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("current_page", current_page: @page) %>');
+  document.querySelector('#page_<%= @page.id %>_status').outerHTML = '<%= j render("current_page", current_page: @page) %>';
+  Alchemy.growl("<%= j @notice %>");
+  Alchemy.closeCurrentDialog();
 
 <% else -%>
 
-  var page_html = "<%= j render('page', page: @page) %>";
-  var compiler = Handlebars.compile(page_html);
-  var tree = <%== @tree.to_json %>;
-  var html = compiler(tree.pages[0]);
-  $('#page_<%= @page.id %>').replaceWith(html);
+  if (page) {
+    var page_html = "<%= j render('page', page: @page) %>";
+    var compiler = Handlebars.compile(page_html);
+    var tree = <%== @tree.to_json %>;
+    page.outerHTML = compiler(tree.pages[0]);
+    Alchemy.growl("<%= j @notice %>");
+    Alchemy.closeCurrentDialog();
+  } else {
+    document.addEventListener('turbolinks:load', function () {
+      Alchemy.growl("<%= j @notice %>");
+    }, { once: true })
+    Alchemy.closeCurrentDialog(function() {
+      Turbolinks.visit(location.toString(), { action: "replace" });
+    });
+  }
 
 <% end -%>
-
-  Alchemy.growl("<%= j @notice %>");
-  Alchemy.closeCurrentDialog();
 })()

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

@@ -1,21 +1,23 @@
 <div id="filter_bar">
-  <h3><%= Alchemy.t('Filter') %></h3>
-  <%= select_tag(
-    'resource_filter',
-    options_for_select(
-      resource_filter_select, search_filter_params[:filter]
-    ),
-    include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
-    data: { remote: !!request.xhr? },
-    class: 'alchemy_selectbox'
-  ) %>
+  <label>
+    <h3><%= local_assigns[:label] || Alchemy.t('Filter') %></h3>
+    <%= select_tag(
+      'resource_filter',
+      options_for_select(
+        resource_filter_select, search_filter_params[:filter]
+      ),
+      include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
+      data: { remote: !!request.xhr? },
+      class: 'alchemy_selectbox'
+    ) %>
+  </label>
 </div>
 
 <script type="text/javascript">
   $(function() {
     $('#resource_filter').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
+      var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
       if ($this.data('remote') === true) {
         $.get(url, {filter: $this.val()}, null, 'script');
       } else {

data/config/locales/alchemy.en.yml

@@ -171,8 +171,8 @@ en:
     anchor_link_headline: "You can link to an element anchor from the actual page."
     attribute_fixed: Value can't be changed for this page type
     back: 'back'
-    create_tree_as_new_language: "Create %{language} as a new language tree"
     locked_pages: "Active pages"
+    "Add a page": "Add a page"
     "Add global page": "Add global page"
     "Add page link": "Add page link"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy is open software and itself uses open software and free resources:"
@@ -339,13 +339,13 @@ en:
     copy_element: "Copy this element"
     copy_page: "Copy page"
     "Could not delete Pictures": "Could not delete Pictures"
-    copy_language_tree_heading: "Copy page tree"
+    copy_language_tree_heading: "Copy pages"
     country_code_placeholder: 'i.e. US (optional)'
     country_code_foot_note: "You only need to set a country code if you want to support multiple countries with the same language."
     create: "create"
     "Create language": "Create a new language"
     "Create site": "Create a new site"
-    create_language_tree_heading: "Create empty language tree"
+    create_language_tree_heading: "Create new homepage"
     create_menu: "Add a menu"
     create_node: "Add a menu node"
     create_page: "Create a new subpage"
@@ -402,6 +402,7 @@ en:
         "Open upload form": "Open upload form"
         "Select all pictures": "Select all pictures"
     hide_element_content: "Hide this elements content."
+    homepage_does_not_exist: "This language has no homepage yet"
     dashboard: "Dashboard"
     image_alt_tag: "Alt-tag"
     image_caption: "Caption"
@@ -415,7 +416,6 @@ en:
     javascript_disabled_headline: "Javascript is disabled!"
     javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
     language_code_placeholder: 'i.e. en'
-    language_does_not_exist: "This language tree does not exist"
     language_pages_copied: "Language tree successfully copied."
     last_upload_only: "Last upload only"
     left: "left"
@@ -521,6 +521,7 @@ en:
       '768': '768px (iPad - Portrait)'
       '1024': '1024px (iPad - Landscape)'
       '1280': '1280px (Desktop)'
+    preview_url: Preview
     recently_uploaded_only: 'Recently uploaded only'
     "regular method": "Regular method"
     remove: "Remove"
@@ -690,6 +691,7 @@ en:
       alchemy/message:
         one: Message
         other: Messages
+      alchemy/admin/preview_url: Internal
     attributes:
       alchemy/message:
         salutation: 'Salutation'

data/lib/alchemy.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "alchemy/admin/preview_url"
+
+module Alchemy
+  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
+
+  # Define page preview sources
+  #
+  # A preview source is a Ruby class returning an URL
+  # that is used as source for the preview frame in the
+  # admin UI.
+  #
+  # == Example
+  #
+  #     # lib/acme/preview_source.rb
+  #     class Acme::PreviewSource < Alchemy::Admin::PreviewUrl
+  #       def url_for(page)
+  #         if page.site.name == "Next"
+  #           "https://user:#{ENV['PREVIEW_HTTP_PASS']}@next.acme.com"
+  #         else
+  #           "https://www.acme.com"
+  #         end
+  #       end
+  #     end
+  #
+  #     # config/initializers/alchemy.rb
+  #     require "acme/preview_source"
+  #     Alchemy.preview_sources << Acme::PreviewSource
+  #
+  #     # config/locales/de.yml
+  #     de:
+  #       activemodel:
+  #         models:
+  #           acme/preview_source: Acme Vorschau
+  #
+  def self.preview_sources
+    @_preview_sources ||= begin
+      Set.new << Alchemy::Admin::PreviewUrl
+    end
+  end
+
+  # Define page publish targets
+  #
+  # A publish target is a ActiveJob that gets performed
+  # whenever a user clicks the publish page button.
+  #
+  # Use this to trigger deployment hooks of external
+  # services in an asychronous way.
+  #
+  # == Example
+  #
+  #     # app/jobs/publish_job.rb
+  #     class PublishJob < ApplicationJob
+  #       def perform(page)
+  #         RestClient.post(ENV['BUILD_HOOK_URL'])
+  #       end
+  #     end
+  #
+  #     # config/initializers/alchemy.rb
+  #     Alchemy.publish_targets << PublishJob
+  #
+  def self.publish_targets
+    @_publish_targets ||= Set.new
+  end
+end

data/lib/alchemy/admin/preview_url.rb

@@ -31,6 +31,8 @@ module Alchemy
     #           password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
     #
     class PreviewUrl
+      extend ActiveModel::Translation
+
       class MissingProtocolError < StandardError; end
 
       def initialize(routes:)

data/lib/alchemy/engine.rb

@@ -9,10 +9,6 @@ module Alchemy
       Alchemy::LOOKUP_CONTEXT = ActionView::LookupContext.new(Rails.root.join("app", "views", "alchemy"))
     end
 
-    initializer "alchemy.admin.preview_url" do
-      Alchemy::Admin::PREVIEW_URL = Alchemy::Admin::PreviewUrl.new(routes: Alchemy::Engine.routes)
-    end
-
     initializer "alchemy.dependency_tracker" do
       [:erb, :slim, :haml].each do |handler|
         ActionView::DependencyTracker.register_tracker(handler, CacheDigests::TemplateTracker)

data/lib/alchemy/permissions.rb

@@ -220,6 +220,7 @@ module Alchemy
         :update,
         :unlock,
         :visit,
+        :tree,
         to: :edit_content
     end
 

data/lib/alchemy/test_support/integration_helpers.rb

@@ -17,15 +17,8 @@ module Alchemy
         else
           user = build(:alchemy_dummy_user, user_or_role)
         end
-        set_phantomjs_browser_language("en")
         allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
       end
-
-      def set_phantomjs_browser_language(lang = nil)
-        if Capybara.current_driver == :poltergeist
-          page.driver.headers = {"Accept-Language" => lang}
-        end
-      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.1.0.beta1"
+  VERSION = "5.1.2"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
+
 # Instantiate the global Alchemy namespace
-module Alchemy
-  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
-end
+require "alchemy"
 
 # Require globally used external libraries
 require "acts_as_list"
@@ -22,7 +21,6 @@ require "request_store"
 require "responders"
 require "sassc-rails"
 require "simple_form"
-require "select2-rails"
 require "turbolinks"
 require "userstamp"
 require "webpacker"