alchemy_cms 4.1.0.beta → 4.1.0.rc1

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -24,7 +24,7 @@
 }
 
 .sitemap_pagename_link {
-  display: inline-block;
+  display: block;
   padding: 0 10px;
   margin: 2px;
   text-decoration: none;
@@ -81,7 +81,7 @@
   height: $sitemap-line-height;
   margin: 3*$default-margin 0;
   position: relative;
-  transition: background-color 250ms;
+  transition: background-color $transition-duration;
 
   &.highlight {
     background-color: $sitemap-highlight-color;

data/app/assets/stylesheets/alchemy/spinner.scss

@@ -7,7 +7,7 @@
   line-height: 1;
 
   path {
-    fill: $dark-gray;
+    fill: $text-color;
     opacity: 1;
     animation: spinner 1s infinite ease-in-out both;
   }

data/app/assets/stylesheets/alchemy/tables.scss

@@ -4,6 +4,22 @@ table {
   padding: 0;
   font-size: inherit;
   width: 100%;
+
+  &.list .tools {
+    button, a {
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      padding: 0;
+      margin: 0 $default-margin;
+      line-height: inherit;
+      text-align: center;
+
+      > .icon {
+        margin: 0;
+      }
+    }
+  }
 }
 
 .list td, .list th {
@@ -11,7 +27,7 @@ table {
   vertical-align: top;
   line-height: 18px;
   border-right: 1px solid $medium-gray;
-  transition: background-color 250ms;
+  transition: background-color $transition-duration;
 
   &:last-child {
     border-right: 0 none;
@@ -90,7 +106,8 @@ td.heading {
   text-decoration: underline;
 }
 
-.list .tools .icon, .list td.icon .icon {
+.list .tools .icon,
+.list td.icon .icon {
   @extend .disable-user-select;
   margin: 0 $default-margin;
 }

data/app/assets/stylesheets/alchemy/tags.scss

@@ -0,0 +1,183 @@
+.tag-list {
+  height: 100%;
+  padding-bottom: 138px;
+
+  &.filtered {
+    padding-bottom: 164px;
+  }
+
+  &.with_filter_bar {
+    padding-bottom: 218px;
+
+    &.filtered {
+      padding-bottom: 244px;
+    }
+  }
+
+  .js_filter_field_box {
+    position: absolute;
+    right: auto;
+    top: auto;
+    width: 200px;
+    z-index: 1100;
+    transition: background-color $transition-duration;
+
+    input {
+      width: 200px;
+      background-color: transparentize($white, 0.25);
+
+      &:focus {
+        background-color: $white;
+      }
+    }
+
+    label { display: none }
+  }
+
+  .js_filter_field_clear {
+    right: 4px;
+  }
+
+  ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 40px 0 4px 0;
+    height: 100%;
+    width: 200px;
+    overflow-x: hidden;
+    overflow-y: auto;
+
+    li {
+      display: block;
+
+      &:first-child { margin-top: 0 }
+
+      a {
+        @include tag-base;
+        text-decoration: none;
+        display: block;
+      }
+
+      &:hover { background-color: $very-light-blue }
+
+      &.active {
+
+        a {
+          background-color: $dark-gray;
+          color: $light-gray
+        }
+      }
+    }
+  }
+}
+
+.tag {
+  @include tag-base(
+    $margin: $default-margin/2 0,
+    $padding: $default-padding 2*$default-padding $default-padding
+  );
+  display: inline-block;
+  vertical-align: middle;
+  color: $text-color;
+  pointer-events: none;
+  font-size: $small-font-size;
+}
+
+.tags .list .tag {
+  padding: 0;
+}
+
+#assign_image_list {
+  .tag-list ul {
+    height: 316px;
+  }
+
+  &.filtered .tag-list ul {
+    height: 292px;
+  }
+}
+
+#assign_file_list {
+  .tag-list ul {
+    height: 396px;
+  }
+
+  &.filtered .tag-list ul {
+    height: 372px;
+  }
+}
+
+#overlay_file_list.with_tag_list {
+  padding-right: 234px;
+}
+
+#tags_tag_list {
+  text-align: left;
+  padding-top: 5px;
+
+  ul.tags {
+    max-height: 10em;
+    padding: 1px;
+    margin: 0;
+    margin-top: 2px;
+    overflow: auto;
+    text-align: left;
+    list-style-type: none;
+
+    li {
+      background-color: $medium-gray;
+      padding: 4px;
+      margin: 0 0 4px 0;
+      position: relative;
+      border-radius: $default-border-radius;
+
+      &.odd { background-color: #eaf3f9 }
+
+      input {
+        position: absolute;
+        top: 3px;
+        left: 4px;
+      }
+
+      label {
+        display: inline-block;
+        margin-left: 2em;
+        line-height: 1.6em;
+      }
+    }
+  }
+
+  .js_filter_field_box {
+    position: relative;
+    top: 0;
+    right: 0;
+    margin: 0;
+
+    .js_filter_field {
+      width: 100%;
+    }
+
+    label {
+      display: none
+    }
+  }
+
+  .js_filter_field_clear {
+    right: 4px;
+  }
+}
+
+.tag_list, .autocomplete_tag_list {
+  .select2-container.select2-container-multi {
+    .select2-search-choice {
+      padding: 0;
+
+      div {
+        @include tag-base(
+          $padding: $default-padding 6*$default-padding $default-padding 3*$default-padding,
+          $margin: 0
+        );
+      }
+    }
+  }
+}

data/app/assets/stylesheets/alchemy/toolbar.scss

@@ -11,7 +11,6 @@
       margin: 0;
       display: inline-block;
       vertical-align: middle;
-      line-height: 5px;
     }
   }
 
@@ -46,7 +45,6 @@
   }
 
   .icon_button {
-    line-height: 26px;
 
     .icon {
       font-size: 1.25em;

data/app/assets/stylesheets/alchemy/upload.scss

@@ -51,7 +51,7 @@
   padding: 8px;
   overflow: hidden;
   background-color: rgba($dark-gray, 0.6);
-  transition: all 250ms ease-in-out;
+  transition: all $transition-duration ease-in-out;
 
   &.visible {
     bottom: 0;

data/app/assets/stylesheets/alchemy/welcome.sass

@@ -1,15 +1,16 @@
+@import "alchemy/variables"
+@import "alchemy/fonts"
+
 body
-  background: #f2f2f2
-  color: #7f8c8d
-  font-family: 'Open Sans', Helvetica, Arial, sans-serif
+  background-color: $main-menu-bg-color
+  color: $white
+  font-family: $default-font-family
   font-weight: normal
   font-size: 15px
   line-height: 22px
 
 h3
-  color: #34495e
-  font-family: 'Bitter', serif
-  font-weight: normal
+  font-weight: bold
   font-size: 25px
   line-height: 1.2
   margin-bottom: 20px
@@ -32,18 +33,17 @@ ul
   list-style-position: outside
 
 li
-  color: #2980b9
-  font-weight: 600
+  color: $white
   margin-bottom: 12px
   background-color: none
   border-bottom: 0 none
   line-height: 22px
 
 a
-  color: #87ab5a
+  color: $white
   text-decoration: underline
   transition: all 0.1s ease-in-out
 
   &:hover
-    color: #2980b9
-    text-decoration: underline
+    color: $white
+    text-decoration: none

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -662,13 +662,20 @@ body .mce-abs-layout-item {
   &:focus,
   &:hover {
     color: $text-color;
-    background-color: darken($medium-gray, 3%);
 
     button {
       background: inherit;
     }
   }
 
+  &:hover {
+    background-color: darken($medium-gray, 3%);
+  }
+
+  &:focus {
+    background-color: $focus-color;
+  }
+
   button {
     padding: 2px 4px;
     font-size: 12px;
@@ -1021,8 +1028,7 @@ i.mce-i-checkbox {
 }
 
 .mce-path-item:focus {
-  background: #666;
-  color: #fff;
+  @include default-focus-style;
 }
 
 .mce-path .mce-divider {

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

@@ -44,7 +44,7 @@ module Alchemy
         return '' if versions.blank?
         # reject any non release version
         versions.reject! { |v| v =~ /[a-z]/ }
-        versions.sort.last
+        versions.max
       end
 
       # Get alchemy versions from rubygems or github, if rubygems failes.

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

@@ -147,7 +147,10 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {page_id: @page.id}
+        new_attributes = {
+          parent_element_id: create_element_params[:parent_element_id],
+          page_id: @page.id
+        }
         if @page.can_have_cells?
           new_attributes = new_attributes.merge({cell_id: find_or_create_cell.try(:id)})
         end

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

@@ -25,7 +25,7 @@ module Alchemy
       def show
         @previous = @picture.previous(params)
         @next = @picture.next(params)
-        @pages = @picture.essence_pictures.group_by(&:page)
+        @assignments = @picture.essence_pictures.joins(content: {element: :page})
         render action: 'show'
       end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -156,7 +156,7 @@ module Alchemy
 
     def set_expiration_headers
       if @page.cache_page?
-        expires_in @page.expiration_time, public: !@page.restricted
+        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
       else
         expires_now
       end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -200,7 +200,7 @@ module Alchemy
           }, {
             method: 'delete',
             title: options[:title],
-            class: "icon_only #{html_options.delete(:class)}".strip
+            class: "icon_button #{html_options.delete(:class)}".strip
           }.merge(html_options)
         )
       end

data/app/models/alchemy/cell.rb

@@ -27,7 +27,7 @@ module Alchemy
   class Cell < BaseRecord
     include Alchemy::Logger
 
-    belongs_to :page, required: true
+    belongs_to :page, inverse_of: :cells
     validates_uniqueness_of :name, scope: 'page_id'
     validates_format_of :name, with: /\A[a-z0-9_-]+\z/
     has_many :elements, -> { where(parent_element_id: nil).order(:position) }, dependent: :destroy

data/app/models/alchemy/content.rb

@@ -24,8 +24,8 @@ module Alchemy
     # Concerns
     include Alchemy::Content::Factory
 
-    belongs_to :essence, required: true, polymorphic: true, dependent: :destroy
-    belongs_to :element, required: true, touch: true
+    belongs_to :essence, polymorphic: true, dependent: :destroy
+    belongs_to :element, touch: true, inverse_of: :contents
     has_one :page, through: :element
 
     stampable stamper_class_name: Alchemy.user_class_name

data/app/models/alchemy/element.rb

@@ -69,13 +69,13 @@ module Alchemy
       foreign_key: :parent_element_id,
       dependent: :destroy
 
-    belongs_to :cell, required: false, touch: true
-    belongs_to :page, required: true, touch: true
+    belongs_to :cell, optional: true, touch: true
+    belongs_to :page, touch: true, inverse_of: :descendent_elements
 
     # A nested element belongs to a parent element.
     belongs_to :parent_element,
       class_name: 'Alchemy::Element',
-      required: false,
+      optional: true,
       touch: true
 
     has_and_belongs_to_many :touchable_pages, -> { distinct },

data/app/models/alchemy/essence_file.rb

@@ -17,7 +17,7 @@
 
 module Alchemy
   class EssenceFile < BaseRecord
-    belongs_to :attachment, required: false
+    belongs_to :attachment, optional: true
     acts_as_essence ingredient_column: 'attachment'
 
     def attachment_url

data/app/models/alchemy/essence_picture.rb

@@ -27,7 +27,7 @@ module Alchemy
   class EssencePicture < BaseRecord
     acts_as_essence ingredient_column: 'picture'
 
-    belongs_to :picture, required: false
+    belongs_to :picture, optional: true
     delegate :image_file_width, :image_file_height, :image_file, to: :picture
     before_save :fix_crop_values
     before_save :replace_newlines

data/app/models/alchemy/folded_page.rb

@@ -12,9 +12,8 @@
 
 module Alchemy
   class FoldedPage < BaseRecord
-    belongs_to :page, required: true
-    belongs_to :user, required: true,
-      class_name: Alchemy.user_class_name
+    belongs_to :page, inverse_of: :folded_pages
+    belongs_to :user, inverse_of: :folded_pages, class_name: Alchemy.user_class_name
 
     def self.folded_for_user(user)
       return none unless Alchemy.user_class < ActiveRecord::Base

data/app/models/alchemy/language.rb

@@ -22,7 +22,7 @@
 
 module Alchemy
   class Language < BaseRecord
-    belongs_to :site, required: true
+    belongs_to :site
     has_many :pages
 
     before_validation :set_locale, if: -> { locale.blank? }

data/app/models/alchemy/page.rb

@@ -86,7 +86,7 @@ module Alchemy
 
     stampable stamper_class_name: Alchemy.user_class_name
 
-    belongs_to :language, required: false
+    belongs_to :language, optional: true
 
     has_one :site, through: :language
     has_many :site_languages, through: :site, source: :languages

data/app/models/alchemy/picture/transformations.rb

@@ -7,6 +7,9 @@ module Alchemy
   module Picture::Transformations
     extend ActiveSupport::Concern
 
+    THUMBNAIL_WIDTH = 160
+    THUMBNAIL_HEIGHT = 120
+
     # Returns the default centered image mask for a given size.
     # If the mask is bigger than the image, the mask is scaled down
     # so the largest possible part of the image is visible.
@@ -37,7 +40,7 @@ module Alchemy
         size = get_base_dimensions
       end
 
-      size = size_when_fitting({width: 111, height: 93}, size)
+      size = size_when_fitting({width: THUMBNAIL_WIDTH, height: THUMBNAIL_HEIGHT}, size)
       "#{size[:width]}x#{size[:height]}"
     end
 

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

@@ -10,7 +10,9 @@
         </li>
       <% end %>
     </ul>
-    <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
+    <div id="cell_for_other_elements"
+      class="sortable_cell for_other_elements_cell"
+      data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
       <%= render partial: 'alchemy/admin/elements/element',
         collection: @page.elements.not_trashed.not_in_cell %>
     </div>
@@ -18,7 +20,7 @@
       <%= content_tag :div,
         id: "cell_#{cell.name}",
         class: ["sortable_cell", "#{cell.name}_cell"].join(' '),
-        data: {'cell-id' => cell.id, 'data-droppable-elements' => cell.element_definitions.join(' ')} do %>
+        data: {'cell-id' => cell.id, 'droppable-elements' => cell.element_definitions.join(' ')} do %>
         <%= render partial: 'alchemy/admin/elements/element', collection: elements %>
       <% end %>
     <% end %>

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

@@ -11,7 +11,8 @@
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
-      <%= f.hidden_field(:page_id) %>
+      <%= f.hidden_field :page_id %>
+      <%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',

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

@@ -19,12 +19,15 @@
 <div class="picture-usage-info resource_info">
   <h2><%= Alchemy.t(:this_picture_is_used_on_these_pages) %></h2>
   <div id="pictures_page_list">
-    <% if @pages.any? %>
-      <ol>
-        <% @pages.each do |page, essence_pictures| %>
+    <% if @assignments.any? %>
+      <ul>
+        <% @assignments.group_by(&:page).each do |page, essence_pictures| %>
           <% if page %>
             <li>
-              <h3><%= link_to page.name, edit_admin_page_path(page) %></h3>
+              <h3>
+                <%= render_icon 'file-alt' %>
+                <p><%= link_to page.name, edit_admin_page_path(page) %></p>
+              </h3>
               <ul class="list">
                 <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
                   <li class="<%= cycle('even', 'odd') %>">
@@ -33,14 +36,22 @@
                     <% pictures = essence_pictures.collect do |e|
                                     e.content.name_for_label
                                   end.to_sentence %>
-                    <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                    <% if element.public? %>
+                      <%= render_icon('window-maximize', style: 'regular') %>
+                    <% else %>
+                      <%= render_icon('window-close') %>
+                    <% end %>
+                    <p>
+                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                      <em><%= Alchemy::Element.human_attribute_name(:trashed) if element.trashed? %></em>
+                    </p>
                   </li>
                 <% end %>
               </ul>
             </li>
           <% end %>
         <% end %>
-      </ol>
+      </ul>
     <% else %>
       <%= render_message do %>
         <%= Alchemy.t(:picture_not_in_use_yet) %>

data/app/views/alchemy/admin/uploader/_button.html.erb

@@ -1,11 +1,11 @@
 <%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
   <%= f.file_field file_attribute,
     class: 'fileupload fileupload--field', multiple: true,
-    name: "#{f.object_name}[#{file_attribute}]" %>
+    name: "#{f.object_name}[#{file_attribute}]", tabindex: '-1' %>
   <%= hidden_field_tag("#{f.object_name}[upload_hash]", Time.current.hash) if object.respond_to?(:upload_hash) %>
   <%= f.label file_attribute, data: {alchemy_hotkey: 'alt+n'} do %>
     <div class="button_with_label">
-      <span class="icon_button"><%= render_icon :upload %></span>
+      <span class="icon_button" tabindex="0"><%= render_icon :upload %></span>
       <label>
         <%= local_assigns[:label] ||
           Alchemy.t(:button_label, scope: [:uploader, object.class.model_name.i18n_key]) %>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -1,7 +1,7 @@
 <% linkable = content.settings_value(:linkable, options) != false %>
 
 <% if content.essence && content.essence.allow_image_cropping?(options) %>
-  <%= link_to_dialog render_icon('crop'),
+  <%= link_to_dialog render_icon(:crop),
     alchemy.crop_admin_essence_picture_path(
       content.essence,
       options: content.settings.update(options)
@@ -12,7 +12,7 @@
       padding: false
     }, {title: Alchemy.t('Edit Picturemask')} %>
 <%- else -%>
-  <a href="#" class="disabled"><%= render_icon('crop') %></a>
+  <a href="#" class="disabled" tabindex="-1"><%= render_icon(:crop) %></a>
 <%- end -%>
 
 <%= link_to_dialog render_icon('file-image', style: 'regular'),
@@ -24,7 +24,7 @@
   ),
   {
     title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
-    size: '780x580',
+    size: '790x590',
     padding: false
   },
   title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)) %>
@@ -35,15 +35,20 @@
   title: Alchemy.t(:link_image),
   'data-content-id' => content.id,
   id: "edit_link_#{content.id}"
-} %>
+} do %>
+  <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>
+<% end %>
 
-<%= link_to_if linkable, render_icon('unlink'), '', {
+<%= link_to_if linkable, render_icon(:unlink), '', {
   onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
   class: content.linked? ? 'linked' : 'disabled',
+  tabindex: content.linked? ? nil : '-1',
   title: Alchemy.t(:unlink)
-} %>
+} do %>
+  <span class="disabled" tabindex="-1"><%= render_icon(:unlink) %></span>
+<% end %>
 
-<%= link_to_dialog render_icon('edit'),
+<%= link_to_dialog render_icon(:edit),
   alchemy.edit_admin_essence_picture_path(
     id: content.essence.id,
     content_id: content.id,

data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb

@@ -13,6 +13,7 @@
     '#',
     onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
     class: "icon_button unlink-essence #{content.linked? ? 'linked' : 'disabled'}",
+    tabindex: content.linked? ? nil : '-1',
     'data-content-id' => content.id,
     title: Alchemy.t(:unlink)
   ) %>