alchemy_cms 4.1.0.rc1 → 4.1.0

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -12,7 +12,8 @@ module Alchemy
       include Alchemy::ResourcesHelper
 
       helper Alchemy::ResourcesHelper, TagsHelper
-      helper_method :resource_handler, :search_filter_params
+      helper_method :resource_handler, :search_filter_params,
+        :items_per_page, :items_per_page_options
 
       before_action :load_resource,
         only: [:show, :edit, :update, :destroy]
@@ -37,7 +38,7 @@ module Alchemy
 
         respond_to do |format|
           format.html {
-            items = items.page(params[:page] || 1).per(per_page_value_for_screen_size)
+            items = items.page(params[:page] || 1).per(items_per_page)
             instance_variable_set("@#{resource_handler.resources_name}", items)
           }
           format.csv {
@@ -144,12 +145,25 @@ module Alchemy
         [
           # contrary to Rails' documentation passing an empty hash to permit all keys does not work
           {options: options_from_params.keys},
-          {q: resource_handler.search_field_name},
+          {q: [
+            resource_handler.search_field_name,
+            :s
+          ]},
           :tagged_with,
           :filter,
-          :page
+          :page,
+          :per_page
         ].freeze
       end
+
+      def items_per_page
+        cookies[:alchemy_items_per_page] = params[:per_page] || cookies[:alchemy_items_per_page] || Alchemy::Config.get(:items_per_page)
+      end
+
+      def items_per_page_options
+        per_page = Alchemy::Config.get(:items_per_page)
+        [per_page, per_page * 2, per_page * 4]
+      end
     end
   end
 end

data/app/controllers/alchemy/admin/styleguide_controller.rb

@@ -0,0 +1,7 @@
+module Alchemy
+  module Admin
+    class StyleguideController < BaseController
+      authorize_resource class: :alchemy_admin_styleguide
+    end
+  end
+end

data/app/controllers/alchemy/admin/tags_controller.rb

@@ -10,7 +10,7 @@ module Alchemy
         @tags = @query
                   .result
                   .page(params[:page] || 1)
-                  .per(per_page_value_for_screen_size)
+                  .per(items_per_page)
                   .order("name ASC")
       end
 

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

@@ -1,5 +1,5 @@
 <div id="filter_bar">
-  <h2><%= Alchemy.t('Filter') %></h2>
+  <h3><%= Alchemy.t('Filter') %></h3>
   <%= select_tag(
     'file_type_filter',
     options_for_select(

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

@@ -1,5 +1,5 @@
 <% if Alchemy::Attachment.tag_counts.any? %>
-  <h2><%= Alchemy.t("Filter by tag") %></h2>
+  <h3><%= Alchemy.t("Filter by tag") %></h3>
   <%= js_filter_field '.tag-list li' %>
   <ul>
     <%= render_tag_list('Alchemy::Attachment') %>

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

@@ -12,7 +12,7 @@
 <% end %>
 
 <div id="archive_all" class="with_tag_filter resources-table-wrapper">
-  <%= resources_header %>
+  <%= render 'alchemy/admin/resources/table_header' %>
   <%= render 'files_list' %>
 
   <div id="library_sidebar">

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

@@ -1,4 +1,4 @@
-<div class="widget">
+<div class="widget users">
   <table class="list">
     <tr>
       <th colspan="2"><%= Alchemy.t('Who else is online') %></th>

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

@@ -34,9 +34,10 @@
     <%= render 'recent_pages' %>
   </div>
   <div class="column right">
-    <% if @online_users.any? %>
+    <% if @online_users.try(:any?) %>
       <%= render 'users' %>
     <% end %>
+
     <% if multi_site? %>
       <%= render 'sites' %>
     <% end %>

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

@@ -18,6 +18,6 @@
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= resources_header %>
+  <%= render 'alchemy/admin/resources/table_header' %>
   <%= render 'table' %>
 </div>

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

@@ -1,7 +1,7 @@
 <% if root = Alchemy::Page.rootpage %>
-<div id="create_language_tree_form">
+<div class="panel">
   <%= render_message do %>
-    <h2><%= Alchemy.t(:language_does_not_exist) %></h2>
+    <p><%= Alchemy.t(:language_does_not_exist) %></p>
   <% end %>
 <%- if @language -%>
 

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

@@ -1,6 +1,6 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= Alchemy.t(:enter_external_link) %></h2>
+    <h3><%= Alchemy.t(:enter_external_link) %></h3>
     <p><%= Alchemy.t(:external_link_notice_1) %></p>
     <p><%= Alchemy.t(:external_link_notice_2) %></p>
   <% end %>

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

@@ -1,6 +1,6 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= Alchemy.t(:choose_file_to_link) %></h2>
+    <h3><%= Alchemy.t(:choose_file_to_link) %></h3>
   <% end %>
   <div class="input select">
     <label for="public_filename" class="control-label">

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

@@ -17,13 +17,11 @@
     </div>
   </div>
 
-  <h2><%= Alchemy.t(:names) %></h2>
   <%= f.input :name, autofocus: true %>
   <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
 
-  <h2><%= Alchemy.t(:meta_data) %></h2>
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:search_engines) %></label>
     <div class="control_group">

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

@@ -1,6 +1,6 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= Alchemy.t(:internal_link_headline) %></h2>
+    <h3><%= Alchemy.t(:internal_link_headline) %></h3>
     <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
     <p><%= Alchemy.t(:internal_link_page_anchors_explanation) %></p>
   <% end %>

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

@@ -19,7 +19,6 @@
     <% end %>
     </div>
   </div>
-  <h2><%= Alchemy.t(:names) %></h2>
   <%= f.input :name, autofocus: true %>
   <%= f.input :urlname, as: 'string' %>
   <%= f.input :title %>

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

@@ -1,3 +1,7 @@
+<% content_for :javascript_includes do %>
+  <meta name="turbolinks-cache-control" content="no-cache">
+<% end %>
+
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render 'alchemy/admin/partials/site_select' %>
@@ -56,7 +60,7 @@
 
 <div id="archive_all">
 <% if @page_root %>
-  <h1 id="page_filter_result"></h1>
+  <h2 id="page_filter_result"></h2>
 
   <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>
 

data/app/views/alchemy/admin/pictures/_archive.html.erb

@@ -10,7 +10,7 @@
 
 <%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
   <div class="selected_item_tools">
-    <h2><%= Alchemy.t(:edit_selected_pictures) %></h2>
+    <h3><%= Alchemy.t(:edit_selected_pictures) %></h3>
     <%= link_to(
       render_icon(:edit, size: 'xs') + Alchemy.t("Edit"),
       edit_multiple_admin_pictures_path,
@@ -49,7 +49,8 @@
     <% end %>
   <% else %>
     <%= render partial: 'picture', collection: @pictures %>
-    <%= paginate @pictures, theme: 'alchemy' %>
   <% end %>
   </div>
 <% end %>
+
+<%= paginate @pictures, theme: 'alchemy' %>

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

@@ -1,5 +1,5 @@
 <div id="filter_bar">
-  <h2><%= Alchemy.t('Filter') %></h2>
+  <h3><%= Alchemy.t('Filter') %></h3>
   <%= select_tag(
     'picture_filter',
     options_for_select([

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

@@ -1,5 +1,4 @@
 <%= alchemy_form_for [:admin, @picture] do |f| %>
-  <h2><%= Alchemy.t('Edit image') %></h2>
   <%= f.input :name %>
   <div class="input tag_list">
     <%= f.label :tag_list %>

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -1,6 +1,5 @@
 <div class="resource_info">
   <div class="picture-file-infos">
-    <h2><%= Alchemy.t('Picture infos') %></h2>
     <div class="value">
       <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
       <p><%= @picture.image_file_name %></p>
@@ -17,7 +16,9 @@
 </div>
 
 <div class="picture-usage-info resource_info">
-  <h2><%= Alchemy.t(:this_picture_is_used_on_these_pages) %></h2>
+  <h3>
+    <%= Alchemy.t(:this_picture_is_used_on_these_pages) %>
+  </h3>
   <div id="pictures_page_list">
     <% if @assignments.any? %>
       <ul>

data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb

@@ -6,5 +6,5 @@
   <%= render partial: 'picture_to_assign',
     collection: @pictures,
     locals: {options: options_from_params, size: @size} %>
-  <%= paginate @pictures, theme: 'alchemy', remote: true %>
+  <%= paginate @pictures, theme: 'alchemy', remote: true, hide_per_page_select: true %>
 <% end %>

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -1,5 +1,5 @@
 <% if Alchemy::Picture.tag_counts.any? %>
-  <h2><%= Alchemy.t("Filter by tag") %></h2>
+  <h3><%= Alchemy.t("Filter by tag") %></h3>
   <%= js_filter_field '.tag-list li' %>
   <ul>
     <%= render_tag_list('Alchemy::Picture') %>

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

@@ -55,12 +55,14 @@
     additional_params: [:filter, :tagged_with, :size] %>
 <% end %>
 
-<div id="picture_archive">
-  <h1>
-    <%= @pictures.total_count %>
-    <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-    <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
-  </h1>
+<div id="picture_archive" class="resources-table-wrapper">
+  <div class="resources-header">
+    <h2>
+      <%= @pictures.total_count %>
+      <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
+      <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
+    </h2>
+  </div>
   <%= render 'archive' %>
 </div>
 

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

@@ -1,5 +1,5 @@
 <div id="filter_bar">
-  <h2><%= Alchemy.t('Filter') %></h2>
+  <h3><%= Alchemy.t('Filter') %></h3>
   <%= select_tag(
     'resource_filter',
     options_for_select(

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

@@ -0,0 +1,20 @@
+<%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
+  <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
+    <% if value.is_a? Hash %>
+      <% value.each do |k, v| %>
+        <%= hidden_field_tag "#{key}[#{k}]", v %>
+      <% end %>
+    <% else %>
+      <%= hidden_field_tag key, value %>
+    <% end %>
+  <% end %>
+  <label>
+    <%= Alchemy.t(:items_per_page, model_name: resource_model.model_name.human(count: 2)) %>
+    <%= select_tag :per_page,
+      options_for_select(
+        items_per_page_options,
+        items_per_page
+      ),
+      onchange: 'this.form.submit()' %>
+  </label>
+<% end %>

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

@@ -0,0 +1,5 @@
+<div class="resources-header">
+  <h2>
+    <%= pluralize resources_instance_variable.total_count, resource_model.model_name.human %>
+  </h2>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="tag-list<%= ' with_filter_bar' if resource_has_filters %><%= ' filtered' if search_filter_params[:tagged_with].present? %>">
-  <h2><%= Alchemy.t("Filter by tag") %></h2>
+  <h3><%= Alchemy.t("Filter by tag") %></h3>
   <%= js_filter_field '.tag-list li' %>
   <ul>
     <%= render_tag_list(resource_model.name) %>

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

@@ -26,7 +26,7 @@
 ) %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
-  <%= resources_header %>
+  <%= render 'alchemy/admin/resources/table_header' %>
   <%= render 'table' %>
 
   <% if resource_has_tags || resource_has_filters %>

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

@@ -18,6 +18,6 @@
 ) %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= resources_header %>
+  <%= render 'alchemy/admin/resources/table_header' %>
   <%= render 'table' %>
 </div>

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

@@ -0,0 +1,238 @@
+<% content_for :title do %>
+  <%= "Styleguide" %>
+<% end %>
+
+<% content_for :javascript_includes do %>
+  <meta name="turbolinks-cache-control" content="no-cache">
+<% end %>
+
+<% content_for(:toolbar) do %>
+  <%= toolbar_button(
+    icon: :info,
+    label: 'Info',
+    url: alchemy.dashboard_info_path,
+    title: 'Info',
+    hotkey: 'alt+i',
+    dialog_options: {
+      title: 'Info',
+      size: "430x400"
+    },
+    if_permitted_to: [:index, :alchemy_admin_styleguide]
+  ) %>
+<% end %>
+
+<h1>AlchemyCMS Styleguide</h1>
+
+<h2>Typography</h2>
+
+<h1>Heading 1</h1>
+<h2>Heading 2</h2>
+<h3>Heading 3</h3>
+<h4>Heading 4</h4>
+<h5>Heading 5</h5>
+
+<p>This is a paragraph, with <a href="#">a link</a>, a <kbd>keyboard shortcut</kbd> and an <code>inline code snippet</code>.</p>
+
+<h2>Messages</h2>
+
+<h3>Info Message</h3>
+
+<%= render_message do %>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+<% end %>
+
+<h3>Warning Message</h3>
+
+<%= render_message :warning do %>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+<% end %>
+
+<h3>Error Message</h3>
+
+<%= render_message :error do %>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+<% end %>
+
+<h2>Forms</h2>
+
+<div class="panel">
+  <%= render_message do %>
+    <p>This form is inside a <code>.panel</code> component.</p>
+  <% end %>
+
+  <form class="simple_form alchemy" action="#" accept-charset="UTF-8" method="post">
+    <div class="input select">
+      <label class="select control-label" for="select">Select</label>
+      <select class="select alchemy_selectbox" id="select">
+        <option value="">Please choose</option>
+        <option value="1">Option 1</option>
+        <option selected="selected" value="2">Option 2</option>
+        <option value="3">Option 3</option>
+      </select>
+    </div>
+
+    <div class="input">
+      <label class="control-label" for="datetime_picker">Date Time Picker</label>
+      <input type="text" data-datepicker-type="datetime" id="datetime_picker">
+    </div>
+
+    <div class="input">
+      <label class="control-label">Date & Time Pickers</label>
+      <div class="control_group">
+        <div class="input-row">
+          <div class="input-column">
+            <input type="text" data-datepicker-type="date" id="date_picker">
+          </div>
+          <div class="input-column">
+            <input type="text" data-datepicker-type="time" id="time_picker">
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="input">
+      <label class="control-label" for="optional_string">String</label>
+      <input type="text" id="optional_string">
+    </div>
+    <div class="input required">
+      <label class="required control-label" for="required_string">
+        Required String<abbr title="required">*</abbr>
+      </label>
+      <input type="text" id="required_string">
+    </div>
+    <div class="input field_with_errors">
+      <label class="control-label" for="string_with_error">String with error</label>
+      <input type="text" id="string_with_error">
+      <small class="error">Error message</small>
+    </div>
+    <div class="input">
+      <label class="control-label" for="string_with_counter">String with char counter</label>
+      <input data-alchemy-char-counter="60" type="text" id="string_with_counter">
+    </div>
+
+    <div class="input check_boxes">
+      <label class="control-label">Check Boxes</label>
+      <div class="control_group">
+        <label class="checkbox">
+          <input type="checkbox" value="1" checked="checked">
+          Checked
+        </label>
+        <label class="checkbox">
+          <input type="checkbox" value="1">
+          Unchecked
+        </label>
+      </div>
+    </div>
+
+    <div class="input text">
+      <label class="text control-label" for="textarea_with_counter">Textarea with char counter</label>
+      <textarea data-alchemy-char-counter="160" class="text" id="textarea_with_counter"></textarea>
+    </div>
+
+    <div class="input text">
+      <label class="text control-label" for="textarea">Textarea</label>
+      <textarea class="text" id="textarea"></textarea>
+      <small class="hint">With hint</small>
+    </div>
+
+    <div class="input text tinymce_container">
+      <label class="text control-label" for="tinymce_1">Richtext editor</label>
+      <textarea class="text" id="tinymce_1"></textarea>
+    </div>
+
+    <div class="submit">
+      <button class="secondary">Secondary</button>
+      <button data-alchemy-button>Primary Submit</button>
+    </div>
+  </form>
+</div>
+
+<h2>Tables</h2>
+
+<h3>Normal Table</h3>
+
+<table class="list">
+  <tr>
+    <th>Table Heading 1</th>
+    <th>Table Heading 2</th>
+    <th>Table Heading 3</th>
+  </tr>
+  <tr class="even">
+    <td>Even table cell 1</td>
+    <td>Even table cell 2</td>
+    <td>Even table cell 3</td>
+  </tr>
+  <tr class="odd">
+    <td>Odd table cell 1</td>
+    <td>Odd table cell 2</td>
+    <td>Odd table cell 3</td>
+  </tr>
+</table>
+
+<h3>Table with icons</h3>
+
+<table class="list">
+  <tr>
+    <th class="icon"></th>
+    <th>Table Heading 1</th>
+    <th>Table Heading 2</th>
+    <th>Table Heading 3</th>
+    <th class="tools"></th>
+  </tr>
+  <tr class="even">
+    <td class="icon">
+      <i class="icon fa-fw fas fa-user"></i>
+    </td>
+    <td>Even table cell 1</td>
+    <td>Even table cell 2</td>
+    <td>Even table cell 3</td>
+    <td class="tools">
+      <a href="#" class="icon_button">
+        <i class="icon fa-fw fas fa-minus"></i>
+      </a>
+      <a href="#" class="icon_button">
+        <i class="icon fa-fw fas fa-edit"></i>
+      </a>
+    </td>
+  </tr>
+  <tr class="odd">
+    <td class="icon">
+      <i class="icon fa-fw fas fa-user"></i>
+    </td>
+    <td>Odd table cell 1</td>
+    <td>Odd table cell 2</td>
+    <td>Odd table cell 3</td>
+    <td class="tools">
+      <a href="#" class="icon_button">
+        <i class="icon fa-fw fas fa-minus"></i>
+      </a>
+      <a href="#" class="icon_button">
+        <i class="icon fa-fw fas fa-edit"></i>
+      </a>
+    </td>
+  </tr>
+</table>
+
+<h2>Lists</h2>
+
+<h3>Unordered List</h3>
+
+<ul>
+  <li>List item</li>
+  <li>List item</li>
+  <li>List item</li>
+</ul>
+
+<h3>Ordered List</h3>
+
+<ol>
+  <li>List item</li>
+  <li>List item</li>
+  <li>List item</li>
+</ol>
+
+<%= content_for :javascripts do %>
+  <script>
+    Alchemy.Tinymce.init([1])
+  </script>
+<% end %>