alchemy_cms 2.8.3 → 2.9.0

data/app/assets/stylesheets/alchemy/jquery-ui.scss

@@ -565,7 +565,7 @@
 
 .ui-icon-refresh {
   background: none !important;
-  @extend .icon-ccw;
+  @extend .alchemy-icon-ccw;
 
   &:before {
     text-indent: 0;
@@ -578,7 +578,7 @@
 .ui-icon-fullscreen {
   background: none !important;
   position: relative;
-  @extend .icon-fullscreen;
+  @extend .alchemy-icon-fullscreen;
 
   &:before {
     text-indent: 0;
@@ -592,7 +592,7 @@
 .ui-icon-exit-fullscreen {
   background: none !important;
   position: relative;
-  @extend .icon-fullscreen-exit;
+  @extend .alchemy-icon-fullscreen-exit;
 
   &:before {
     text-indent: 0;
@@ -769,7 +769,7 @@
 .ui-icon-closethick {
   background: none !important;
   position: relative;
-  @extend .icon-cross;
+  @extend .alchemy-icon-cross;
 
   &:before {
     text-indent: 0;

data/app/assets/stylesheets/alchemy/menubar.css.scss

@@ -97,19 +97,27 @@
       @include inline-block;
       list-style-type: none;
       text-align: center;
+    }
+  }
+
+  a, button {
+    @extend %button-defaults;
+    padding-left: $default-padding;
+    padding-right: $default-padding;
+    width: 100%;
+    display: block;
+    line-height: 14px;
+    font-weight: normal;
+    text-decoration: none;
+    text-transform: none;
+    text-align: center;
+    color: $text-color;
+    font-family: $default-font-face;
 
-      a, button {
-        @extend %button-defaults;
-        padding-left: $default-padding;
-        padding-right: $default-padding;
-        width: 100%;
-        display: block;
-        line-height: 14px;
-        font-weight: normal;
-        text-decoration: none !important;
-        color: $text-color !important;
-        font-family: $default-font-face;
-      }
+    // reset potentially icons that the website appends to all buttons
+    &:before, &:after {
+      display: none;
+      content: '';
     }
   }
 }

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

@@ -12,10 +12,6 @@ span.module.pages {
   background-position: -40px 0;
 }
 
-span.module.users {
-  background-position: -80px 0;
-}
-
 span.module.library {
   background-position: -120px 0;
 }

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

@@ -8,7 +8,7 @@
   width: 16px;
   height: 16px;
   line-height: 16px;
-  @extend .icon-cross;
+  @extend .alchemy-icon-cross;
   position: absolute;
   right: 8px;
   top: 7px;

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

@@ -379,7 +379,7 @@ select#language_tree_select {
     width: 16px;
     height: 16px;
     cursor: pointer;
-    @extend .icon-cross;
+    @extend .alchemy-icon-cross;
   }
 }
 

data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy-tinymce-dialog/window.css.scss

@@ -199,7 +199,7 @@ a.mceMove {
 }
 
 .alchemy-tinymce-dialog .mceClose {
-  @extend .icon-cross;
+  @extend .alchemy-icon-cross;
   width: 16px;
   height: 16px;
   top: 7px;
@@ -223,7 +223,7 @@ a.mceMove {
   right: 28px;
   width: 16px;
   height: 16px;
-  @extend .icon-fullscreen-exit;
+  @extend .alchemy-icon-fullscreen-exit;
   top: 6px;
   padding-top: 3px;
 }
@@ -233,7 +233,7 @@ a.mceMove {
   right: 28px;
   width: 16px;
   height: 16px;
-  @extend .icon-fullscreen;
+  @extend .alchemy-icon-fullscreen;
   top: 6px;
   padding-top: 3px;
 }

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

@@ -1,8 +1,8 @@
 module Alchemy
   module Admin
     class BaseController < Alchemy::BaseController
-
       include Userstamp
+
       before_filter { enforce_ssl if ssl_required? && !request.ssl? }
       before_filter :set_translation
 
@@ -14,7 +14,7 @@ module Alchemy
 
       layout 'alchemy/admin'
 
-    private
+      private
 
       # Handles exceptions
       def exception_handler(e)
@@ -30,7 +30,7 @@ module Alchemy
         @error = e
         # truncate the message, because very long error messages (i.e from mysql2) causes cookie overflow errors
         @notice = e.message[0..255]
-        @trace = e.backtrace[0..35]
+        @trace = e.backtrace[0..50]
         if request.xhr?
           render :action => "error_notice", :layout => false
         else
@@ -68,17 +68,21 @@ module Alchemy
       end
 
       def set_stamper
-        User.stamper = current_user
+        if Alchemy.user_class < ActiveRecord::Base
+          Alchemy.user_class.stamper = current_alchemy_user
+        end
       end
 
       def reset_stamper
-        User.reset_stamper
+        if Alchemy.user_class < ActiveRecord::Base
+          Alchemy.user_class.reset_stamper
+        end
       end
 
-      # Returns true if the current_user (The logged-in Alchemy User) has the admin role.
+      # Returns true if the current_alchemy_user (The logged-in Alchemy User) has the admin role.
       def is_admin?
-        return false if !current_user
-        current_user.admin?
+        return false if !current_alchemy_user
+        current_alchemy_user.admin?
       end
 
       # Displays errors in a #errors div if any errors are present on the object.

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

@@ -6,11 +6,16 @@ module Alchemy
     class DashboardController < Alchemy::Admin::BaseController
 
       def index
-        @last_edited_pages = Page.from_current_site.all_last_edited_from(current_user)
+        @last_edited_pages = Page.from_current_site.all_last_edited_from(current_alchemy_user)
         @locked_pages = Page.from_current_site.all_locked
-        @online_users = User.logged_in.to_a - [current_user]
-        @first_time = current_user.sign_in_count == 1 && current_user.last_sign_in_at.nil?
-        @sites = Site.scoped
+        if Alchemy.user_class.respond_to?(:logged_in)
+          @online_users = Alchemy.user_class.logged_in.to_a - [current_alchemy_user]
+        end
+        if current_alchemy_user.respond_to?(:sign_in_count) && current_alchemy_user.respond_to?(:last_sign_in_at)
+          @last_sign_at = current_alchemy_user.last_sign_in_at
+          @first_time = current_alchemy_user.sign_in_count == 1 && @last_sign_at.nil?
+        end
+        @sites = Site.all
       end
 
       def info
@@ -29,7 +34,7 @@ module Alchemy
         render :text => e, :status => 503
       end
 
-    private
+      private
 
       # Returns latest alchemy version.
       def latest_alchemy_version

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

@@ -79,7 +79,7 @@ module Alchemy
       def trash
         @element = Element.find(params[:id])
         @page = @element.page
-        @element.trash
+        @element.trash!
       end
 
       def order

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

@@ -75,7 +75,14 @@ module Alchemy
 
       def sizes_from_essence
         return if @essence_picture.render_size.blank?
-        @essence_picture.render_size.split('x')
+        size_x, size_y = @essence_picture.render_size.split('x').map(&:to_i)
+        if size_x.zero? || size_y.nil? || size_y.zero?
+          size_x_of_original = @essence_picture.picture.image_file_width 
+          size_y_of_original = @essence_picture.picture.image_file_height
+          size_x = size_x_of_original * size_y / size_y_of_original if size_x.zero?
+          size_y = size_y_of_original * size_x / size_x_of_original if size_y.nil? || size_y.zero?
+        end
+        [size_x, size_y]
       end
 
       def sizes_string

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

@@ -3,7 +3,7 @@ module Alchemy
     class LayoutpagesController < Alchemy::Admin::BaseController
 
       def index
-        @locked_pages = Page.from_current_site.all_locked_by(current_user)
+        @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         @layout_root = Page.find_or_create_layout_root_for(session[:language_id])
         @languages = Language.all
       end

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

@@ -15,7 +15,7 @@ module Alchemy
 
       def index
         @page_root = Page.language_root_for(session[:language_id])
-        @locked_pages = Page.from_current_site.all_locked_by(current_user)
+        @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         @languages = Language.all
         if !@page_root
           if @languages.length == 1
@@ -73,12 +73,12 @@ module Alchemy
       # Edit the content of the page and all its elements and contents.
       def edit
         # fetching page via before filter
-        if @page.locked? && @page.locker && @page.locker.logged_in? && @page.locker != current_user
+        if page_is_locked?
           flash[:notice] = _t("This page is locked by %{name}", name: @page.locker_name)
           redirect_to admin_pages_path
         else
-          @page.lock!(current_user)
-          @locked_pages = Page.from_current_site.all_locked_by(current_user)
+          @page.lock!(current_alchemy_user)
+          @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         end
         @layoutpage = @page.layoutpage?
       end
@@ -144,7 +144,7 @@ module Alchemy
 
       def fold
         # @page is fetched via before filter
-        @page.fold!(current_user.id, !@page.folded?(current_user.id))
+        @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
         respond_to do |format|
           format.js
         end
@@ -155,7 +155,7 @@ module Alchemy
         # fetching page via before filter
         @page.unlock!
         flash[:notice] = _t(:unlocked_page, :name => @page.name)
-        @pages_locked_by_user = Page.from_current_site.all_locked_by(current_user)
+        @pages_locked_by_user = Page.from_current_site.all_locked_by(current_alchemy_user)
         respond_to do |format|
           format.js
           format.html {
@@ -337,6 +337,11 @@ module Alchemy
         end
       end
 
+      def page_is_locked?
+        return if !@page.locker.try(:logged_in?)
+        @page.locked? && @page.locker != current_alchemy_user
+      end
+
     end
   end
 end

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

@@ -157,9 +157,9 @@ module Alchemy
       def search_query(search_terms)
         resource_handler.searchable_attributes.map do |attribute|
           if relation = attribute[:relation]
-            "#{relation[:model_association].klass.table_name}.#{relation[:attr_method]} LIKE #{search_terms}"
+            "LOWER(#{relation[:model_association].klass.table_name}.#{relation[:attr_method]}) LIKE #{search_terms}"
           else
-            "#{resource_handler.model.table_name}.#{attribute[:name]} LIKE #{search_terms}"
+            "LOWER(#{resource_handler.model.table_name}.#{attribute[:name]}) LIKE #{search_terms}"
           end
         end.join(" OR ")
       end

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

@@ -2,7 +2,7 @@ module Alchemy
   module Admin
     class UsersController < ResourcesController
 
-      filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy::User
+      filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy.user_class
       filter_access_to [:index, :new, :create], :attribute_check => false
 
       before_filter :set_roles_and_genders, :except => [:index, :destroy]

data/app/controllers/alchemy/base_controller.rb

@@ -8,10 +8,18 @@ module Alchemy
     before_filter :set_current_site
     before_filter :set_language
     before_filter :mailer_set_url_options
-    before_filter :store_user_request_time
     before_filter :set_authorization_user
 
-    helper_method :current_server, :current_site, :multi_site?
+    helper_method :current_alchemy_user,
+      :current_site,
+      :multi_site?,
+      :current_server
+
+    def leave
+      render layout: !request.xhr?
+    end
+
+    private
 
     # Returns a host string with the domain the app is running on.
     def current_server
@@ -43,7 +51,25 @@ module Alchemy
       I18n.t(key, *args)
     end
 
-  private
+    # The current authorized user.
+    #
+    # In order to have Alchemy's authorization work, you have to
+    # provide a +current_user+ method in your app's ApplicationController,
+    # that returns the current user.
+    #
+    # If you don't have an App that can provide a +current_user+ object,
+    # you can install the `alchemy-devise` gem that provides everything you need.
+    #
+    def current_alchemy_user
+      raise NoCurrentUserFoundError if !defined?(current_user)
+      current_user
+    end
+
+    # Returns true if a +current_alchemy_user+ is present
+    #
+    def alchemy_user_signed_in?
+      current_alchemy_user.present?
+    end
 
     # Returns the current site.
     #
@@ -61,7 +87,7 @@ module Alchemy
     # Stores the current_user for declarative_authorization
     #
     def set_authorization_user
-      Authorization.current_user = current_user
+      Authorization.current_user = current_alchemy_user
     end
 
     # Sets Alchemy's GUI translation to users preffered language and stores it in the session.
@@ -77,8 +103,8 @@ module Alchemy
         ::I18n.locale = session[:current_locale]
       elsif params[:locale].present? && ::I18n.available_locales.include?(params[:locale].to_sym)
         session[:current_locale] = ::I18n.locale = params[:locale]
-      elsif current_user && current_user.language.present?
-        ::I18n.locale = current_user.language
+      elsif current_alchemy_user && current_alchemy_user.respond_to?(:language) && current_alchemy_user.language.present?
+        ::I18n.locale = current_alchemy_user.language
       else
         ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first) || ::I18n.default_locale
       end
@@ -137,42 +163,50 @@ module Alchemy
       redirect_to url_for(protocol: 'https')
     end
 
-    # Stores the users request time.
-    def store_user_request_time
-      if user_signed_in?
-        current_user.store_request_time!
+    protected
+
+    def permission_denied(exception = nil)
+      Rails.logger.debug <<-WARN
+
+/!\\ No permissions to request #{request.path} for:
+#{current_alchemy_user.inspect}
+WARN
+      if current_alchemy_user
+        handle_redirect_for_user
+      else
+        handle_redirect_for_guest
+      end
+    end
+
+    def handle_redirect_for_user
+      flash[:warning] = _t('You are not authorized')
+      if permitted_to? :index, :alchemy_admin_dashboard
+        redirect_or_render_notice
+      else
+        redirect_to('/')
       end
     end
 
-  protected
-
-    def permission_denied
-      if current_user
-        if permitted_to? :index, :alchemy_admin_dashboard
-          if request.referer == alchemy.login_url
-            render :file => Rails.root.join('public/422'), :status => 422
-          elsif request.xhr?
-            respond_to do |format|
-              format.js { render status: 403 }
-              format.html {
-                render :partial => 'alchemy/admin/partials/flash', :locals => {:message => _t('You are not authorized'), :flash_type => 'warning'}
-              }
-            end
-          else
-            flash[:error] = _t('You are not authorized')
-            redirect_to alchemy.admin_dashboard_path
-          end
-        else
-          redirect_to alchemy.root_path
+    def redirect_or_render_notice
+      if request.xhr?
+        respond_to do |format|
+          format.js { render status: 403 }
+          format.html {
+            render(partial: 'alchemy/admin/partials/flash', locals: {message: _t('You are not authorized'), flash_type: 'warning'})
+          }
         end
       else
-        flash[:info] = _t('Please log in')
-        if request.xhr?
-          render :action => :permission_denied
-        else
-          store_location
-          redirect_to alchemy.login_path
-        end
+        redirect_to(alchemy.admin_dashboard_path)
+      end
+    end
+
+    def handle_redirect_for_guest
+      flash[:info] = _t('Please log in')
+      if request.xhr?
+        render :permission_denied
+      else
+        store_location
+        redirect_to Alchemy.login_path
       end
     end