alchemy_cms 4.1.0.rc1 → 4.1.0

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

@@ -1,15 +1,15 @@
 <%= alchemy_form_for @tag, as: 'tag', url: alchemy.admin_tag_path(@tag), html: {method: 'patch'} do |f| %>
-  <%= render_message :info do %>
+  <h3>
     <%= Alchemy.t(:you_can_rename_this_tag) %>
-  <% end %>
+  </h3>
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:rename) %>
 <% end %>
 <% if @tags.any? -%>
   <%= alchemy_form_for @tag, as: 'tag', url: alchemy.admin_tag_path(@tag), html: {method: 'patch'} do |f| %>
-    <%= render_message :info do %>
+    <h3>
       <%= Alchemy.t(:or_replace_it_with_an_existing_tag) %>
-    <% end %>
+    </h3>
     <div class="input tags">
       <label class="control-label"><%= Alchemy.t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">

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

@@ -16,10 +16,7 @@
 ) %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <h1 class="resources-header">
-    <%= @tags.total_count %>
-    <%= Gutentag::Tag.model_name.human(count: @tags.total_count) %>
-  </h1>
+  <%= render 'alchemy/admin/resources/table_header' %>
   <% if @tags.any? %>
 
   <table class="list">

data/app/views/alchemy/elements/_editor_not_found.html.erb

@@ -1,4 +1,4 @@
 <%= render_message :warning do %>
-  <h1><%= Alchemy.t(:element_editor_not_found) %>:</h1>
+  <h2><%= Alchemy.t(:element_editor_not_found) %>:</h2>
   <p><%= error.html_safe %></p>
 <% end %>

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -24,7 +24,6 @@
       <div class="thumbnail_background">
         <%- if content.ingredient -%>
           <%= essence_picture_thumbnail(content, options) %>
-          <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
         <% else %>
           <%= render_icon(:image, style: 'regular') %>
         <% end %>
@@ -43,6 +42,8 @@
       } %>
     </div>
   </div>
+  <%= hidden_field_tag content.form_field_name(:picture_id),
+    content.ingredient.try!(:id) %>
   <%= hidden_field_tag content.form_field_name(:link),
     content.essence.link %>
   <%= hidden_field_tag content.form_field_name(:link_title),

data/app/views/kaminari/alchemy/_paginator.html.erb

@@ -1,13 +1,13 @@
 <%# The container tag
   - available local variables
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
-<%= paginator.render do -%>
-  <div class="pagination">
+<div class="pagination">
+  <%= paginator.render do -%>
     <%= first_page_tag %>
     <%= prev_page_tag -%>
     <% each_page do |page| -%>
@@ -19,5 +19,8 @@
     <% end -%>
     <%= next_page_tag -%>
     <%= last_page_tag %>
-  </div>
-<% end -%>
+  <% end -%>
+  <% unless local_assigns[:hide_per_page_select] %>
+    <%= render 'alchemy/admin/resources/per_page_select' %>
+  <% end %>
+</div>

data/config/alchemy/config.yml

@@ -57,6 +57,11 @@ sitemap:
 #
 url_nesting: true
 
+# === Default items per page in admin views
+#
+# In Alchemy's Admin, change how many items you would get shown per page by Kaminari
+items_per_page: 15
+
 # === Picture rendering settings
 #
 # Alchemy uses Dragonfly to render images. Use {size: "XXXxYYY", crop: BOOLEAN [true]} to resize images.

data/config/locales/alchemy.en.yml

@@ -199,6 +199,7 @@ en:
     "Hide childpages": "Hide childpages"
     hide_elements: Hide Elements
     hide_element: "Hide element"
+    items_per_page: "%{model_name} per page"
     "Image missing": "Image missing"
     "Image size": "Image size"
     "Language successfully created": "Language successfully created."

data/config/routes.rb

@@ -117,6 +117,8 @@ Alchemy::Engine.routes.draw do
     end
 
     resources :sites
+
+    get '/styleguide' => 'styleguide#index'
   end
 
   get '/attachment/:id/download(/:name)' => 'attachments#download',

data/lib/alchemy/permissions.rb

@@ -180,7 +180,7 @@ module Alchemy
         alchemy_editor_rules
 
         # Navigation
-        can :index,                 [:alchemy_admin_sites]
+        can :index,                 [:alchemy_admin_sites, :alchemy_admin_styleguide]
 
         # Controller actions
         can [:info, :update_check], :alchemy_admin_dashboard

data/lib/alchemy/resources_helper.rb

@@ -122,7 +122,8 @@ module Alchemy
 
     # Renders the human model name with a count as h1 header
     def resources_header
-      content_tag :h1, "#{resources_instance_variable.total_count} #{resource_model.model_name.human(count: resources_instance_variable.total_count)}", class: 'resources-header'
+      Alchemy::Deprecation.warn "resources_header is deprecated. Render 'alchemy/admin/resources/table_header' partial instead."
+      render 'alchemy/admin/resources/table_header'
     end
 
     # Returns true if the resource contains any relations

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.1.0.rc1"
+  VERSION = "4.1.0"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -255,14 +255,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -453,6 +453,7 @@ files:
 - app/assets/stylesheets/alchemy/tags.scss
 - app/assets/stylesheets/alchemy/toolbar.scss
 - app/assets/stylesheets/alchemy/trash.scss
+- app/assets/stylesheets/alchemy/typography.scss
 - app/assets/stylesheets/alchemy/upload.scss
 - app/assets/stylesheets/alchemy/welcome.sass
 - app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss
@@ -482,6 +483,7 @@ files:
 - app/controllers/alchemy/admin/pictures_controller.rb
 - app/controllers/alchemy/admin/resources_controller.rb
 - app/controllers/alchemy/admin/sites_controller.rb
+- app/controllers/alchemy/admin/styleguide_controller.rb
 - app/controllers/alchemy/admin/tags_controller.rb
 - app/controllers/alchemy/admin/trash_controller.rb
 - app/controllers/alchemy/api/base_controller.rb
@@ -705,14 +707,17 @@ files:
 - app/views/alchemy/admin/pictures/update.js.erb
 - app/views/alchemy/admin/resources/_filter_bar.html.erb
 - app/views/alchemy/admin/resources/_form.html.erb
+- app/views/alchemy/admin/resources/_per_page_select.html.erb
 - app/views/alchemy/admin/resources/_resource.html.erb
 - app/views/alchemy/admin/resources/_table.html.erb
+- app/views/alchemy/admin/resources/_table_header.html.erb
 - app/views/alchemy/admin/resources/_tag_list.html.erb
 - app/views/alchemy/admin/resources/edit.html.erb
 - app/views/alchemy/admin/resources/index.csv.erb
 - app/views/alchemy/admin/resources/index.html.erb
 - app/views/alchemy/admin/resources/new.html.erb
 - app/views/alchemy/admin/sites/index.html.erb
+- app/views/alchemy/admin/styleguide/index.html.erb
 - app/views/alchemy/admin/tags/_radio_tag.html.erb
 - app/views/alchemy/admin/tags/_tag.html.erb
 - app/views/alchemy/admin/tags/edit.html.erb
@@ -978,13 +983,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4