alchemy_cms 3.4.2 → 3.5.0.rc1

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

@@ -33,25 +33,25 @@ module Alchemy
       end
 
       def create
-        @attachment = Attachment.new(attachment_attributes)
-        if @attachment.save
-          render succesful_uploader_response(file: @attachment)
-        else
-          render failed_uploader_response(file: @attachment)
-        end
+        @attachment = Attachment.create(attachment_attributes)
+        handle_uploader_response(status: :created)
       end
 
       def update
-        @attachment.update_attributes(attachment_attributes)
-        render_errors_or_redirect(
-          @attachment,
-          admin_attachments_path(
-            per_page: params[:per_page],
-            page: params[:page],
-            q: params[:q]
-          ),
-          Alchemy.t("File successfully updated")
-        )
+        @attachment.update(attachment_attributes)
+        if attachment_attributes['file'].present?
+          handle_uploader_response(status: :accepted)
+        else
+          render_errors_or_redirect(
+            @attachment,
+            admin_attachments_path(
+              per_page: params[:per_page],
+              page: params[:page],
+              q: params[:q]
+            ),
+            Alchemy.t("File successfully updated")
+          )
+        end
       end
 
       def destroy
@@ -75,6 +75,14 @@ module Alchemy
 
       private
 
+      def handle_uploader_response(status:)
+        if @attachment.valid?
+          render succesful_uploader_response(file: @attachment, status: status)
+        else
+          render failed_uploader_response(file: @attachment)
+        end
+      end
+
       def in_overlay?
         params[:content_id].present?
       end

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

@@ -2,7 +2,7 @@ module Alchemy
   module Admin
     class ClipboardController < Alchemy::Admin::BaseController
       authorize_resource class: :alchemy_admin_clipboard
-      before_filter :set_clipboard
+      before_action :set_clipboard
 
       def index
         @clipboard_items = model_class.all_from_clipboard(@clipboard)

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

@@ -3,7 +3,7 @@ module Alchemy
     class EssenceFilesController < Alchemy::Admin::BaseController
       authorize_resource class: Alchemy::EssenceFile
 
-      before_filter :load_essence_file, only: [:edit, :update]
+      before_action :load_essence_file, only: [:edit, :update]
 
       helper "Alchemy::Admin::Contents"
 

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

@@ -3,9 +3,9 @@ module Alchemy
     class EssencePicturesController < Alchemy::Admin::BaseController
       authorize_resource class: Alchemy::EssencePicture
 
-      before_filter :load_essence_picture, only: [:edit, :crop, :update]
-      before_filter :load_content, only: [:edit, :update, :assign]
-      before_filter :load_options
+      before_action :load_essence_picture, only: [:edit, :crop, :update]
+      before_action :load_content, only: [:edit, :update, :assign]
+      before_action :load_options
 
       helper 'alchemy/admin/contents'
       helper 'alchemy/admin/essences'
@@ -74,14 +74,15 @@ module Alchemy
         @content = Content.find(params[:content_id])
       end
 
-      # Gets the minimum size of the image to be rendered. the database render_size
-      # has preference over the image_size parameter.
+      # Gets the minimum size of the image to be rendered.
+      #
+      # The +render_size+ attribute has preference over the +size+ parameter.
       #
       def sizes_from_essence_or_params
-        if @essence_picture.render_size? && !@essence_picture.render_size.blank?
+        if @essence_picture.render_size?
           @essence_picture.sizes_from_string(@essence_picture.render_size)
-        elsif @options[:image_size]
-          @essence_picture.sizes_from_string(@options[:image_size])
+        elsif @options[:size]
+          @essence_picture.sizes_from_string(@options[:size])
         else
           { width: 0, height: 0 }
         end

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

@@ -2,6 +2,7 @@ module Alchemy
   module Admin
     class LayoutpagesController < Alchemy::Admin::BaseController
       authorize_resource class: :alchemy_admin_layoutpages
+      helper Alchemy::Admin::PagesHelper
 
       def index
         @layout_root = Page.find_or_create_layout_root_for(Language.current.id)

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

@@ -81,7 +81,7 @@ module Alchemy
       def edit
         # fetching page via before filter
         if page_is_locked?
-          flash[:notice] = Alchemy.t('This page is locked', name: @page.locker_name)
+          flash[:warning] = Alchemy.t('This page is locked', name: @page.locker_name)
           redirect_to admin_pages_path
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
@@ -348,7 +348,7 @@ module Alchemy
       end
 
       def redirect_path_after_create_page
-        if @page.redirects_to_external?
+        if @page.redirects_to_external? || !@page.editable_by?(current_alchemy_user)
           admin_pages_path
         else
           params[:redirect_to] || edit_admin_page_path(@page)

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

@@ -10,10 +10,10 @@ module Alchemy
       helper Alchemy::ResourcesHelper, TagsHelper
       helper_method :resource_handler
 
-      before_filter :load_resource,
+      before_action :load_resource,
         only: [:show, :edit, :update, :destroy]
 
-      before_filter do
+      before_action do
         authorize!(action_name.to_sym, resource_instance_variable || resource_handler.model)
       end
 

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

@@ -1,7 +1,7 @@
 module Alchemy
   module Admin
     class TagsController < ResourcesController
-      before_filter :load_tag, only: [:edit, :update, :destroy]
+      before_action :load_tag, only: [:edit, :update, :destroy]
 
       def index
         @query = ActsAsTaggableOn::Tag.ransack(params[:q])

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

@@ -12,6 +12,22 @@ module Alchemy
       respond_with @pages
     end
 
+    # Returns all pages as nested json object for tree views
+    #
+    # Pass a page_id param to only load tree for this page
+    #
+    # Pass elements=true param to include elements for pages
+    #
+    def nested
+      @page = Page.find_by(id: params[:page_id]) || Language.current_root_page
+
+      render json: PageTreeSerializer.new(@page,
+        ability: current_ability,
+        user: current_alchemy_user,
+        elements: params[:elements],
+        full: true)
+    end
+
     # Returns a json object for page
     #
     # You can either load the page via id or its urlname

data/app/controllers/alchemy/messages_controller.rb

@@ -42,7 +42,7 @@ module Alchemy
   # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
   #
   class MessagesController < Alchemy::BaseController
-    before_filter :get_page, except: :create
+    before_action :get_page, except: :create
 
     helper 'alchemy/pages'
 

data/app/controllers/concerns/alchemy/admin/uploader_responses.rb

@@ -3,7 +3,7 @@ module Alchemy
     module UploaderResponses
       extend ActiveSupport::Concern
 
-      def succesful_uploader_response(file:)
+      def succesful_uploader_response(file:, status: :created)
         message = Alchemy.t(:upload_success,
           scope: [:uploader, file.class.model_name.i18n_key],
           name: file.name
@@ -11,7 +11,7 @@ module Alchemy
 
         {
           json: uploader_response(file: file, message: message),
-          status: :created
+          status: status
         }
       end
 

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

@@ -6,6 +6,17 @@ module Alchemy
       def mime_to_human(mime)
         Alchemy.t(mime, scope: 'mime_types', default: Alchemy.t(:document))
       end
+
+      def attachment_preview_size(attachment)
+        case attachment.icon_css_class
+        when 'image' then '600x475'
+        when 'audio' then '600x190'
+        when 'video' then '600x485'
+        when 'pdf'   then '600x500'
+        else
+          '600x145'
+        end
+      end
     end
   end
 end

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

@@ -58,7 +58,7 @@ module Alchemy
 
       # Used for translations selector in Alchemy cockpit user settings.
       def translations_for_select
-        Alchemy::I18n.available_locales.map do |locale|
+        Alchemy::I18n.available_locales.sort.map do |locale|
           [Alchemy.t(locale, scope: :translations), locale]
         end
       end
@@ -397,16 +397,24 @@ module Alchemy
         current_params.merge(p).delete_if { |_k, v| v.blank? }
       end
 
+      # Render a hint icon with tooltip for given object.
+      # The model class needs to include the hints module
       def render_hint_for(element)
         return unless element.has_hint?
-        link_to '#', class: 'hint' do
-          render_icon(:hint) + content_tag(:span, element.hint.html_safe, class: 'bubble')
+        content_tag :span, class: 'hint-with-icon' do
+          render_icon(:questionmark) +
+            content_tag(:span, element.hint.html_safe, class: 'hint-bubble')
         end
       end
 
       # Appends the current controller and action to body as css class.
       def alchemy_body_class
-        "#{controller_name} #{action_name}"
+        [
+          controller_name,
+          action_name,
+          content_for(:main_menu_style),
+          content_for(:alchemy_body_class)
+        ].compact
       end
 
       # (internal) Returns options for the clipboard select tag
@@ -426,6 +434,31 @@ module Alchemy
         Alchemy::Config.get(:format_matchers)['link_url'] || /^(mailto:|\/|[a-z]+:\/\/)/
       end
 
+      # Renders a hint with tooltip
+      #
+      # == Example
+      #
+      #   <%= hint_with_tooltip('Page layout is missing', class: 'warning icon') %>
+      #
+      # @param text [String] - The text displayed in the tooltip
+      # @param html_options [Hash] - Options passed to the wrapper `content_tag`
+      #
+      def hint_with_tooltip(text, html_options = {})
+        css_class = "#{html_options[:class]} with-hint"
+        content_tag :span, html_options.merge(class: css_class) do
+          content_tag(:span, text, class: 'hint-bubble')
+        end
+      end
+
+      # Renders a warning icon with a hint
+      # that explains the user that the page layout is missing
+      def page_layout_missing_warning
+        hint_with_tooltip(
+          Alchemy.t(:page_definition_missing),
+          class: 'inline warning icon'
+        )
+      end
+
       private
 
       def permission_from_options(options)

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

@@ -13,14 +13,21 @@ module Alchemy
         if content.blank?
           warning('Content is nil')
           return
-        else
-          content_name = content.name_for_label
         end
+
+        content_name = content.name_for_label
+
         if content.definition.blank?
           warning("Content #{content.name} is missing its definition")
-          title = Alchemy.t(:content_definition_missing)
-          content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;#{content_name}).html_safe
+
+          icon = hint_with_tooltip(
+            Alchemy.t(:content_definition_missing),
+            class: 'inline warning icon'
+          )
+
+          content_name = "#{icon} #{content_name}".html_safe
         end
+
         if content.has_validations?
           "#{content_name}<span class='validation_indicator'>*</span>".html_safe
         else

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

@@ -94,25 +94,6 @@ module Alchemy
         end
       end
 
-      # This helper loads all elements from page that have EssenceSelects in them.
-      #
-      # It returns a javascript function that replaces all editor partials of this elements.
-      #
-      # We need this while updating, creating or trashing an element,
-      # because another element on the same page could have a element selector in it.
-      #
-      # In cases like this one wants Ember.js databinding!
-      #
-      def update_essence_select_elements(page, element)
-        elements = page.elements.not_trashed.joins(:contents)
-          .where(["#{Content.table_name}.element_id != ?", element.id])
-          .where(Content.table_name => {essence_type: "Alchemy::EssenceSelect"})
-        return if elements.blank?
-        elements.collect do |el|
-          render 'alchemy/admin/elements/refresh_editor', element: el
-        end.join.html_safe
-      end
-
       # CSS classes for the element editor partial.
       def element_editor_classes(element, local_assigns)
         [

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

@@ -56,41 +56,18 @@ module Alchemy
         render 'alchemy/admin/contents/missing', {element: element, name: name, options: options}
       end
 
-      def essence_picture_thumbnail(content, options)
-        ingredient = content.ingredient
+      # Renders a thumbnail for given EssencePicture content with correct cropping and size
+      def essence_picture_thumbnail(content, options = {})
+        picture = content.ingredient
         essence = content.essence
-        return if ingredient.blank?
 
-        crop = !(essence.crop_size.blank? && essence.crop_from.blank?) ||
-               (
-                 content.settings_value(:crop, options) == true ||
-                 content.settings_value(:crop, options) == "true"
-               )
-
-        size = if essence.render_size.blank?
-                 content.settings_value(:size, options)
-               else
-                 essence.render_size
-               end
-
-        image_options = {
-          size: essence.thumbnail_size(size, crop),
-          crop_from: essence.crop_from.blank? ? nil : essence.crop_from,
-          crop_size: essence.crop_size.blank? ? nil : essence.crop_size,
-          crop: crop ? 'crop' : nil,
-          upsample: content.settings_value(:upsample, options)
-        }
+        return if picture.nil?
 
         image_tag(
-          alchemy.thumbnail_path({
-            id: ingredient.id,
-            name: ingredient.urlname,
-            sh: ingredient.security_token(image_options),
-            format: ingredient.image_file_format
-          }.merge(image_options)),
-          alt: ingredient.name,
+          essence.thumbnail_url(options),
+          alt: picture.name,
           class: 'img_paddingtop',
-          title: Alchemy.t(:image_name) + ": #{ingredient.name}"
+          title: Alchemy.t(:image_name) + ": #{picture.name}"
         )
       end
 

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

@@ -11,24 +11,11 @@ module Alchemy
       def alchemy_main_navigation_entry(alchemy_module)
         render(
           'alchemy/admin/partials/main_navigation_entry',
-          alchemy_module: alchemy_module.stringify_keys,
-          navigation: module_main_navigation(alchemy_module)
+          alchemy_module: alchemy_module,
+          navigation: alchemy_module['navigation']
         )
       end
 
-      # Renders the subnavigation from current module
-      #
-      # We find the module from current controller and index action.
-      #
-      def admin_subnavigation
-        if current_alchemy_module.present?
-          render(
-            'alchemy/admin/partials/sub_navigation',
-            entries: current_sub_navigation
-          )
-        end
-      end
-
       # Used for checking the main navi permissions
       #
       # To let your module be navigatable by the user you have to provide an Ability for it.
@@ -46,7 +33,6 @@ module Alchemy
       #   can :index, :my_admin_posts
       #
       def navigate_module(navigation)
-        navigation.stringify_keys!
         [
           navigation['action'].to_sym,
           navigation['controller'].to_s.gsub(/\A\//, '').gsub(/\//, '_').to_sym
@@ -58,8 +44,9 @@ module Alchemy
       def main_navigation_css_classes(navigation)
         [
           'main_navi_entry',
-          admin_mainnavi_active?(navigation) ? 'active' : nil
-        ].compact.join(' ')
+          admin_mainnavi_active?(navigation) ? 'active' : nil,
+          navigation.key?('sub_navigation') ? 'has_sub_navigation' : nil
+        ].compact
       end
 
       # Returns true if given navi entry is in params controller and action
@@ -148,7 +135,7 @@ module Alchemy
       #   A Alchemy module definition
       #
       def url_options_for_module(alchemy_module)
-        url_options_for_navigation_entry(module_main_navigation(alchemy_module))
+        url_options_for_navigation_entry(alchemy_module['navigation'] || {})
       end
 
       # Returns a url options hash for given navigation entry.
@@ -157,7 +144,6 @@ module Alchemy
       #   A Alchemy module navigation entry
       #
       def url_options_for_navigation_entry(entry)
-        entry.stringify_keys!
         {
           controller: entry['controller'],
           action: entry['action'],
@@ -172,40 +158,15 @@ module Alchemy
         module_definition_for(controller: params[:controller], action: 'index')
       end
 
-      # Returns the sub navigation for current Alchemy module.
-      #
-      def current_sub_navigation
-        module_sub_navigation(module_main_navigation(current_alchemy_module))
-      end
-
-      # Returns navigation entries from given module.
-      #
-      def module_main_navigation(alchemy_module)
-        alchemy_module.fetch('navigation', {}).stringify_keys
-      end
-
-      # Returns sub navigation entries from given module.
-      #
-      def module_sub_navigation(alchemy_module)
-        alchemy_module.fetch('sub_navigation', []).map(&:stringify_keys)
-      end
-
-      # Returns nested navigation entries for given module.
-      #
-      def module_nested_navigation(alchemy_module)
-        alchemy_module.fetch('nested', []).map(&:stringify_keys)
-      end
-
       # Returns true if the current controller and action is in a modules navigation definition.
       #
-      def admin_mainnavi_active?(main_navigation)
-        main_navigation.stringify_keys!
+      def admin_mainnavi_active?(navigation)
         # Has the given navigation entry a active sub navigation?
-        has_active_entry?(module_sub_navigation(main_navigation)) ||
+        has_active_entry?(navigation['sub_navigation'] || []) ||
           # Has the given navigation entry a active nested navigation?
-          has_active_entry?(module_nested_navigation(main_navigation)) ||
+          has_active_entry?(navigation['nested'] || []) ||
           # Is the navigation entry active?
-          entry_active?(main_navigation)
+          entry_active?(navigation || {})
       end
 
       # Returns true if the given entry's controller is current controller
@@ -219,7 +180,8 @@ module Alchemy
       # Also checks if given entry has a +nested_actions+ key, if so it checks if one of them is current controller's action
       #
       def is_entry_action_active?(entry)
-        entry['action'] == params[:action] || entry['nested_actions'].to_a.include?(params[:action])
+        entry['action'] == params[:action] ||
+          entry.fetch('nested_actions', []).include?(params[:action])
       end
 
       # Returns true if an entry of given entries is active.
@@ -228,7 +190,7 @@ module Alchemy
       #   Alchemy module navigation entries.
       #
       def has_active_entry?(entries)
-        !entries.detect { |entry| entry_active?(entry) }.nil?
+        entries.any? { |entry| entry_active?(entry) }
       end
     end
   end