alchemy_cms 4.2.0.rc1 → 4.2.0

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

@@ -42,18 +42,15 @@ div#overlay_text_box {
 }
 
 #header {
+  display: flex;
   height: $header-height;
   line-height: $header-height;
   background: $header-background;
   border-bottom: $default-border;
   position: relative;
 
-  a {
-    display: inline-block;
-
-    &:hover {
-      text-decoration: none;
-    }
+  a:hover {
+    text-decoration: none;
   }
 
   .page_status_and_name {
@@ -76,8 +73,13 @@ div#overlay_text_box {
   }
 
   .page_name {
+    display: inline-block;
+    max-width: 100px;
     margin-right: $default-margin;
     line-height: $header-height;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
@@ -96,12 +98,10 @@ div#overlay_text_box {
 }
 
 #user_info {
-  position: absolute;
-  top: 0;
-  right: 0;
   height: $header-height;
   font-size: $small-font-size;
   padding-left: 2*$default-padding;
+  margin-left: auto;
   border-bottom: $default-border;
   background-color: $header-background;
 
@@ -126,23 +126,3 @@ div#overlay_text_box {
     padding-right: 2*$default-padding;
   }
 }
-
-#locked_pages {
-
-  label {
-    float: left;
-    font-size: $small-font-size;
-    line-height: 27px;
-    height: 27px;
-    margin-left: 8px;
-    margin-right: 4px;
-  }
-
-  img {
-    float: left;
-  }
-
-  .subnavi_tab > a {
-    padding-right: 0;
-  }
-}

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

@@ -209,19 +209,42 @@
   }
 }
 
+#locked_pages {
+  display: flex;
+  flex-grow: 1;
+  flex-wrap: nowrap;
+  height: $header-height;
+
+  label {
+    float: left;
+    font-size: $small-font-size;
+    line-height: 27px;
+    height: 27px;
+    margin-left: 8px;
+    margin-right: 4px;
+  }
+
+  img {
+    float: left;
+  }
+
+  .subnavi_tab > a {
+    padding-right: 0;
+  }
+}
+
 .locked_page {
-  position: relative;
-  float: left;
+  display: flex;
+  flex-wrap: nowrap;
   line-height: $header-height - 1;
   color: #444;
   border-right: $default-border;
   border-bottom: $default-border;
-  padding-right: 24px;
 
   form {
-    position: absolute;
-    right: $default-padding;
-    top: 7px;
+    align-self: center;
+    justify-self: flex-end;
+    margin-right: $default-padding;
     line-height: 1;
   }
 
@@ -231,6 +254,7 @@
   }
 
   > a {
+    display: flex;
     cursor: pointer;
     padding: 0px 8px;
 

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

@@ -16,5 +16,9 @@
 
   .collapsed-menu.elements-window-visible & {
     width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
+
+    @media screen and (min-width: $large-screen-break-point) {
+      max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
+    }
   }
 }

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

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

data/app/controllers/alchemy/pages_controller.rb

@@ -155,10 +155,10 @@ module Alchemy
     end
 
     def set_expiration_headers
-      if @page.cache_page?
-        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
-      else
+      if must_not_cache?
         expires_now
+      else
+        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
       end
     end
 
@@ -190,12 +190,17 @@ module Alchemy
     # or the cache is stale, because it's been republished by the user.
     #
     def render_fresh_page?
-      !@page.cache_page? || stale?(etag: page_etag,
+      must_not_cache? || stale?(etag: page_etag,
         last_modified: @page.published_at,
         public: !@page.restricted,
         template: 'pages/show')
     end
 
+    # don't cache pages if we have flash message to display or the page has caching disabled
+    def must_not_cache?
+      flash.present? || !@page.cache_page?
+    end
+
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end

data/app/helpers/alchemy/base_helper.rb

@@ -11,12 +11,11 @@ module Alchemy
     # Logs a message in the Rails logger (warn level)
     # and optionally displays an error message to the user.
     def warning(message, text = nil)
-      Logger.warn(message, caller(0..0))
+      Logger.warn(message, caller(1..1))
       unless text.nil?
-        warning = content_tag('p', class: 'content_editor_error') do
-          render_icon('warning') + text
+        render_message(:warning) do
+          text.html_safe
         end
-        return warning
       end
     end
 

data/app/models/alchemy/element.rb

@@ -98,7 +98,7 @@ module Alchemy
     scope :not_restricted,    -> { joins(:page).merge(Page.not_restricted) }
     scope :available,         -> { published.not_trashed }
     scope :named,             ->(names) { where(name: names) }
-    scope :excluded,          ->(names) { where(arel_table[:name].not_in(names)) }
+    scope :excluded,          ->(names) { where.not(name: names) }
     scope :fixed,             -> { where(fixed: true) }
     scope :unfixed,           -> { where(fixed: false) }
     scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }

data/app/models/alchemy/page/page_scopes.rb

@@ -66,7 +66,7 @@ module Alchemy
       # Returns all content pages.
       #
       scope :contentpages, -> {
-        where(layoutpage: [false, nil]).where(Page.arel_table[:parent_id].not_eq(nil))
+        where(layoutpage: [false, nil]).where.not(parent_id: nil)
       }
 
       # Returns all public contentpages that are not locked.

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

@@ -7,7 +7,7 @@
       title: Alchemy.t(:info),
       dialog_options: {
         title: Alchemy.t(:info),
-        size: "420x380"
+        size: "420x435"
       },
       if_permitted_to: [:info, :alchemy_admin_dashboard],
       hotkey: 'alt+i'

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

@@ -1,6 +1,11 @@
-<p class="center"><%= image_tag('alchemy/alchemy-logo.svg') %></p>
+<p class="center">
+  <%= image_tag('alchemy/alchemy-logo.svg', width: 267, height: 91) %>
+</p>
 <h2 class="center">
-  <%= Alchemy.t("Version") %>: <%= @alchemy_version %>
+  v<%= @alchemy_version %><br>
+  <small>
+    Ruby v<%= RUBY_VERSION %>, Rails v<%= Rails.version %>
+  </small>
 </h2>
 <% if can? :update_check, :alchemy_admin_dashboard %>
 <p class="center" id="update_check">
@@ -17,6 +22,22 @@
     <%= Alchemy.t 'Update status unavailable' %>
   </span>
 </p>
+<script type="text/javascript">
+  var el = $('#update_check');
+  var spinner = new Alchemy.Spinner('small')
+  spinner.spin(el[0])
+  $.get('<%= alchemy.update_check_path %>', function(data, textStatus, jqXHR) {
+    if (data == 'true') {
+      $('#update_available').show()
+    } else {
+      $('#up_to_date').show()
+    }
+  }).fail(function(jqXHR, textStatus, errorThrown) {
+    $('#error').show()
+  }).always(function() {
+    spinner.stop()
+  })
+</script>
 <% end %>
 <%= render_message do %>
   <p><%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %></p>
@@ -41,23 +62,3 @@
     </li>
   </ul>
 <% end %>
-<% if can? :update_check, :alchemy_admin_dashboard %>
-<script type="text/javascript">
-  (function() {
-    var el = $('#update_check');
-    var spinner = new Alchemy.Spinner('small');
-    spinner.spin(el[0]);
-    $.get('<%= alchemy.update_check_path %>', function(data, textStatus, jqXHR) {
-      if (data == 'true') {
-        $('#update_available').show();
-      } else {
-        $('#up_to_date').show();
-      }
-    }).fail(function(jqXHR, textStatus, errorThrown) {
-      $('#error').show();
-    }).always(function() {
-      spinner.stop();
-    });
-  })();
-</script>
-<% end %>

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

@@ -13,16 +13,6 @@
     <% end %>
   </div>
   <div class="toolbar_spacer"></div>
-  <% unless @page.layoutpage? %>
-  <div class="button_with_label">
-    <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
-      <button class="icon_button" title="<%= Alchemy.t('Visit page') %>">
-        <%= render_icon('external-link-alt') %>
-      </button>
-      <label><%= Alchemy.t("Visit page") %></label>
-    <% end %>
-  </div>
-  <% end %>
   <div class="button_with_label">
     <%= link_to_dialog(
       render_icon('info-circle'),
@@ -76,6 +66,16 @@
       <% end %>
     </div>
   <% end %>
+  <% unless @page.layoutpage? %>
+    <div class="button_with_label">
+      <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
+        <%= button_tag class: 'icon_button', disabled: !@page.public? do %>
+          <%= render_icon('external-link-alt') %>
+        <% end %>
+        <label><%= Alchemy.t("Visit page") %></label>
+      <% end %>
+    </div>
+  <% end %>
   <% if @page.has_hint? %>
     <div class="toolbar_spacer"></div>
     <%= render_hint_for(@page) %>

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

@@ -5,14 +5,6 @@
         label_method: relation[:attr_method],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
         input_html: {class: 'alchemy_selectbox'} %>
-    <% elsif attribute[:type] == :datetime || attribute[:type] == :time %>
-      <div class="input <%= attribute[:type] %>">
-        <label class="control-label">
-          <%= f.object.class.human_attribute_name(attribute[:name]) %>
-        </label>
-        <%= alchemy_datepicker resource_instance_variable, attribute[:name],
-          type: attribute[:type] %>
-      </div>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

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

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

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

@@ -11,7 +11,7 @@
   <%= content_label(content) %>
 
   <% if select_values.nil? %>
-    <%== warning(':select_values is nil',
+    <%= warning(':select_values is nil',
     "<strong>No select values given.</strong>
     <br>Please provide :<code>select_values</code> either as argument to
     <code>render_essence_editor</code> helper or as setting on the content definition in

data/config/locales/alchemy.en.yml

@@ -280,7 +280,6 @@ en:
     "User deleted": "%{name} User deleted"
     "User updated": "%{name} User updated"
     "Validation failed": "Validation failed"
-    "Version": "Version"
     "View File": "View File"
     "Attachment Preview": "Attachment Preview"
     "Visit page": "Visit page"
@@ -612,6 +611,12 @@ en:
       error_notification:
         default_message: "Please review the problems below:"
 
+  # Alchemy date formats
+  date:
+    formats:
+      alchemy:
+        default: "%Y-%m-%d"
+
   # Alchemy time formats
   time:
     formats:

data/lib/alchemy/on_page_layout.rb

@@ -47,7 +47,7 @@ module Alchemy
     # Registers a callback for given page layout
     def self.register_callback(page_layout, callback)
       @callbacks ||= {}
-      @callbacks[page_layout] ||= []
+      @callbacks[page_layout] ||= Set.new
       @callbacks[page_layout] << callback
     end
 

data/lib/alchemy/permissions.rb

@@ -64,8 +64,7 @@ module Alchemy
 
         # Resources
         can [:show, :download], Alchemy::Attachment
-        can :read,              Alchemy::Page,      Alchemy::Page.published, &:public?
-        can :see,               Alchemy::Page,      restricted: true, visible: true
+        can :see,               Alchemy::Page, restricted: true, visible: true
 
         can :read, Alchemy::Content, Alchemy::Content.available do |c|
           c.public? && !c.trashed?
@@ -74,6 +73,10 @@ module Alchemy
         can :read, Alchemy::Element, Alchemy::Element.available do |e|
           e.public? && !e.trashed?
         end
+
+        can :read, Alchemy::Page, Alchemy::Page.published do |p|
+          p.public?
+        end
       end
     end
 

data/lib/alchemy/resources_helper.rb

@@ -78,9 +78,11 @@ module Alchemy
       if attribute[:relation]
         record = resource.send(attribute[:relation][:name])
         value = record.present? ? record.send(attribute[:relation][:attr_method]) : Alchemy.t(:not_found)
-      elsif attribute_value && (attribute[:type] == :datetime || attribute[:type] == :time)
+      elsif attribute_value && attribute[:type].to_s =~ /(date|time)/
         localization_format = if attribute[:type] == :datetime
           options[:datetime_format] || :'alchemy.default'
+        elsif attribute[:type] == :date
+          options[:date_format] || :'alchemy.default'
         else
           options[:time_format] || :'alchemy.time'
         end
@@ -100,19 +102,19 @@ module Alchemy
     # Returns a options hash for simple_form input fields.
     def resource_attribute_field_options(attribute)
       options = {hint: resource_handler.help_text_for(attribute)}
-      case attribute[:type].to_s
+      input_type = attribute[:type].to_s
+      case input_type
       when 'boolean'
         options
-      when 'date', 'datetime'
-        options.merge as: 'string',
+      when 'date', 'time', 'datetime'
+        date = resource_instance_variable.send(attribute[:name]) || Time.current
+        options.merge(
+          as: 'string',
           input_html: {
-            type: attribute[:type].to_s,
-            value: l(resource_instance_variable.send(attribute[:name]) || Time.current,
-              format: "#{attribute[:type]}picker".to_sym
-            )
+            'data-datepicker-type' => input_type,
+            value: date ? date.iso8601 : nil
           }
-      when 'time'
-        options.merge(as: 'time')
+        )
       when 'text'
         options.merge(as: 'text', input_html: {rows: 4})
       else