alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -5,7 +5,7 @@ module Alchemy
 
       # Renders the name of elements content.
       #
-      # Displays a warning icon if content is missing its description.
+      # Displays a warning icon if content is missing its definition.
       #
       # Displays a mandatory field indicator, if the content has validations.
       #
@@ -16,9 +16,9 @@ module Alchemy
         else
           content_name = content.name_for_label
         end
-        if content.description.blank?
-          warning("Content #{content.name} is missing its description")
-          title = _t(:content_description_missing)
+        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
         end
         if content.has_validations?
@@ -28,86 +28,12 @@ module Alchemy
         end
       end
 
-      # Renders a link to show the new content overlay that lets you add additional contents.
-      #
-      # See +render_create_content_link+ helper for examples on how to define additional contents.
-      #
-      def render_new_content_link(element)
-        link_to_dialog(
-          "#{render_icon(:create)} #{_t('add new content')}".html_safe,
-          alchemy.new_admin_element_content_path(element),
-          {
-            size: '310x115',
-            title: _t('Select an content'),
-            overflow: true
-          },
-          {
-            id: "add_content_for_element_#{element.id}",
-            class: 'button with_icon new_content_link'
-          }
-        )
-      end
-
-      # Renders a link that dynamically adds an additional content into your element editor view.
-      #
-      # NOTE: You have to define additional contents in your elements.yml file first.
-      #
-      # ==== Example:
-      #
-      #   # config/alchemy/elements.yml
-      #   - name: downloads:
-      #     contents:
-      #     - name: file
-      #       type: EssenceFile
-      #     additional_contents:
-      #     - name: file
-      #       type: EssenceFile
-      #
-      # Then add this helper into the elements editor view partial:
-      #
-      #   <%= render_create_content_link(element, 'file') %>
-      #
-      # Optionally you can pass a label:
-      #
-      #   <%= render_create_content_link(element, 'file', label: 'Add a file') %>
-      #
-      def render_create_content_link(element, content_name, options = {}, options_for_content = {})
-        defaults = {
-          label: _t('Add %{name}', name: _t(content_name, scope: :content_names))
-        }
-        options = defaults.merge(options)
-        link_to(render_icon(:create) + options[:label], alchemy.admin_contents_path(
-            content: {
-              name: content_name,
-              element_id: element.id
-            },
-            options: options_for_content.to_json
-          ),
-          method: :post,
-          remote: true,
-          id: "add_content_for_element_#{element.id}",
-          class: 'button with_icon new_content_link'
-        )
-      end
-
-      # Renders a link for removing that content
-      def delete_content_link(content)
-        link_to_confirm_dialog(
-          render_icon('delete-small'),
-          _t('Do you really want to delete this content?'),
-          alchemy.admin_content_path(content),
-          class: 'icon_button small',
-          title: _t('Remove this content')
-        ) if content.settings[:deletable]
-      end
-
       # Renders the label and a remove link for a content.
-      def label_and_remove_link(content)
+      def content_label(content)
         content_tag :label do
-          [render_hint_for(content), render_content_name(content), delete_content_link(content)].compact.join('&nbsp;').html_safe
+          [render_hint_for(content), render_content_name(content)].compact.join('&nbsp;').html_safe
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     module ElementsHelper
-
       include Alchemy::ElementsHelper
       include Alchemy::ElementsBlockHelper
       include Alchemy::Admin::BaseHelper
@@ -22,18 +21,18 @@ module Alchemy
       #
       #   :maximum_amount_of_images    [Integer]   # This option let you handle the amount of images your customer can add to this element.
       #
-      def render_picture_gallery_editor(element, options={})
+      def render_picture_gallery_editor(element, options = {})
         default_options = {
-          :maximum_amount_of_images => nil,
-          :grouped => true
+          maximum_amount_of_images: nil,
+          grouped: true
         }
         options = default_options.merge(options)
         render(
-          :partial => "alchemy/admin/elements/picture_gallery_editor",
-          :locals => {
-            :pictures => element.contents.gallery_pictures,
-            :element => element,
-            :options => options
+          partial: "alchemy/admin/elements/picture_gallery_editor",
+          locals: {
+            pictures: element.contents.gallery_pictures,
+            element: element,
+            options: options
           }
         )
       end
@@ -41,7 +40,7 @@ module Alchemy
 
       # Returns an elements array for select helper.
       #
-      # @param [Array] elements descriptions
+      # @param [Array] elements definitions
       # @return [Array]
       #
       def elements_for_select(elements)
@@ -74,10 +73,11 @@ module Alchemy
             element_array_for_options(e, object_method, cell)
           end
         end
-        options[_t(:main_content)] = elements_for_main_content(elements).map do |e|
+        options[Alchemy.t(:main_content)] = elements_for_main_content(elements).map do |e|
           element_array_for_options(e, object_method)
         end
-        options.delete_if { |_cell, elements| elements.blank? } # Throw out empty cells
+        # Remove empty cells
+        options.delete_if { |_c, e| e.blank? }
       end
 
       def element_array_for_options(e, object_method, cell = nil)
@@ -108,11 +108,33 @@ module Alchemy
           .where(["#{Content.table_name}.element_id != ?", element.id])
           .where(Content.table_name => {essence_type: "Alchemy::EssenceSelect"})
         return if elements.blank?
-        elements.collect do |element|
-          render 'alchemy/admin/elements/refresh_editor', element: element
+        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)
+        [
+          'element-editor',
+          element.content_definitions.present? ? 'with-contents' : 'without-contents',
+          element.nestable_elements.any? ? 'nestable' : 'not-nestable',
+          element.taggable? ? 'taggable' : 'not-taggable',
+          element.folded ? 'folded' : 'expanded',
+          local_assigns[:draggable] == false ? 'not-draggable' : 'draggable'
+        ].join(' ')
+      end
+
+      # Tells us, if we should show the element footer.
+      def show_element_footer?(element, with_nestable_elements = nil)
+        return false if element.folded?
+        if with_nestable_elements
+          element.content_definitions.present? || element.taggable?
+        else
+          element.nestable_elements.empty?
+        end
+      end
+
       private
 
       def elements_for_main_content(elements)
@@ -128,7 +150,6 @@ module Alchemy
           cell_elements.include?(e.class.name == 'Element' ? e.name : e['name'])
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     module EssencesHelper
-
       include Alchemy::EssencesHelper
       include Alchemy::Admin::ContentsHelper
 
@@ -20,7 +19,7 @@ module Alchemy
       #
       def render_essence_editor_by_name(element, name, options = {}, html_options = {})
         if element.blank?
-          return warning('Element is nil', _t(:no_element_given))
+          return warning('Element is nil', Alchemy.t(:no_element_given))
         end
         content = element.content_by_name(name)
         if content.nil?
@@ -42,7 +41,7 @@ module Alchemy
       #   Method that is called on the page object to get the value that is passed with the params of the form.
       #
       def pages_for_select(pages = nil, selected = nil, prompt = "Choose page", page_attribute = :id)
-        values = [[_t(prompt), ""]]
+        values = [[Alchemy.t(prompt), ""]]
         pages ||= begin
           nested = true
           Language.current.pages.published.order(:lft)
@@ -60,13 +59,13 @@ module Alchemy
       def essence_picture_thumbnail(content, options)
         return if content.ingredient.blank?
         crop = !(content.essence.crop_size.blank? && content.essence.crop_from.blank?) ||
-          (content_settings_value(content, :crop, options) == true || content_settings_value(content, :crop, options) == "true")
+               (content.settings_value(:crop, options) == true || content.settings_value(:crop, options) == "true")
         image_options = {
-          size: content.essence.thumbnail_size(content.essence.render_size.blank? ? content_settings_value(content, :size, options) : content.essence.render_size, crop),
+          size: content.essence.thumbnail_size(content.essence.render_size.blank? ? content.settings_value(:size, options) : content.essence.render_size, crop),
           crop_from: content.essence.crop_from.blank? ? nil : content.essence.crop_from,
           crop_size: content.essence.crop_size.blank? ? nil : content.essence.crop_size,
           crop: crop ? 'crop' : nil,
-          upsample: content_settings_value(content, :upsample, options)
+          upsample: content.settings_value(:upsample, options)
         }
         image_tag(
           alchemy.thumbnail_path({
@@ -76,10 +75,19 @@ module Alchemy
           }.merge(image_options)),
           alt: content.ingredient.name,
           class: 'img_paddingtop',
-          title: _t(:image_name) + ": #{content.ingredient.name}"
+          title: Alchemy.t(:image_name) + ": #{content.ingredient.name}"
         )
       end
 
+      # Size value for edit picture dialog
+      def edit_picture_dialog_size(content, options = {})
+        if content.settings_value(:caption_as_textarea, options)
+          content.settings_value(:sizes, options) ? '380x320' : '380x300'
+        else
+          content.settings_value(:sizes, options) ? '380x290' : '380x255'
+        end
+      end
+
       private
 
       # Returns an Array with page attributes for select options
@@ -114,7 +122,6 @@ module Alchemy
           page.name
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     module FormHelper
-
       # Use this form helper to render any form in Alchemy admin interface.
       #
       # This is simply a wrapper for `simple_form_for`
@@ -14,17 +13,14 @@ module Alchemy
       #
       def alchemy_form_for(object, *args, &block)
         options = args.extract_options!
-        options.merge!({
-          builder: Alchemy::Forms::Builder,
-          remote: request.xhr?,
-          html: {
-            id: options.delete(:id),
-            class: ["alchemy", options.delete(:class)].compact.join(' ')
-          }
-        })
+        options[:builder] = Alchemy::Forms::Builder
+        options[:remote] = request.xhr?
+        options[:html] = {
+          id: options.delete(:id),
+          class: ["alchemy", options.delete(:class)].compact.join(' ')
+        }
         simple_form_for(object, *(args << options), &block)
       end
-
     end
   end
 end

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

@@ -1,10 +1,8 @@
 module Alchemy
   module Admin
-
     # This module contains helper methods for rendering the admin navigation.
     #
     module NavigationHelper
-
       # Renders one admin main navigation entry
       #
       # @param [Hash] alchemy_module
@@ -203,11 +201,11 @@ module Alchemy
       def admin_mainnavi_active?(main_navigation)
         main_navigation.stringify_keys!
         # Has the given navigation entry a active sub navigation?
-        has_active_entry?(module_sub_navigation(main_navigation)) or
+        has_active_entry?(module_sub_navigation(main_navigation)) ||
           # Has the given navigation entry a active nested navigation?
-          has_active_entry?(module_nested_navigation(main_navigation)) or
-            # Is the navigation entry active?
-            entry_active?(main_navigation)
+          has_active_entry?(module_nested_navigation(main_navigation)) ||
+          # Is the navigation entry active?
+          entry_active?(main_navigation)
       end
 
       # Returns true if the given entry's controller is current controller
@@ -232,7 +230,6 @@ module Alchemy
       def has_active_entry?(entries)
         !entries.detect { |entry| entry_active?(entry) }.nil?
       end
-
     end
   end
 end

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

@@ -3,66 +3,45 @@ module Alchemy
     module PagesHelper
       include Alchemy::BaseHelper
 
-      # Used for rendering the folder link in +Admin::Pages#index+ sitemap.
-      #
-      def sitemap_folder_link(page)
-        if page.folded?(current_alchemy_user.id)
-          css_class = 'folded'
-          title = _t('Show childpages')
-        else
-          css_class = 'collapsed'
-          title = _t('Hide childpages')
-        end
-        link_to(
-          '',
-          alchemy.fold_admin_page_path(page),
-          remote: true,
-          method: :post,
-          class: "page_folder #{css_class} spinner",
-          title: title,
-          id: "fold_button_#{page.id}"
-        )
-      end
-
       # Returns options tags for the screen sizes select in page edit view.
       #
       def preview_sizes_for_select
         options_for_select([
           'auto',
-          [_t('240', :scope => 'preview_sizes'), 240],
-          [_t('320', :scope => 'preview_sizes'), 320],
-          [_t('480', :scope => 'preview_sizes'), 480],
-          [_t('768', :scope => 'preview_sizes'), 768],
-          [_t('1024', :scope => 'preview_sizes'), 1024],
-          [_t('1280', :scope => 'preview_sizes'), 1280]
+          [Alchemy.t('240', scope: 'preview_sizes'), 240],
+          [Alchemy.t('320', scope: 'preview_sizes'), 320],
+          [Alchemy.t('480', scope: 'preview_sizes'), 480],
+          [Alchemy.t('768', scope: 'preview_sizes'), 768],
+          [Alchemy.t('1024', scope: 'preview_sizes'), 1024],
+          [Alchemy.t('1280', scope: 'preview_sizes'), 1280]
         ])
       end
 
-      # Returns the translated explanation of the page´s status.
+      # Returns the translated explanation of the page status.
       #
       def combined_page_status(page)
-        page.status.map do |state, value|
+        page.status.map do |state, _value|
           next if state == :locked
           val = content_tag(:span, '', class: page.send(state) ? "page_status #{state}" : "page_status not_#{state}")
-          val += page.status_title(state)
+          val + page.status_title(state)
         end.delete_if(&:blank?).join("<br>").html_safe
       end
 
       # Renders a label for page's page layout
       #
-      # If the page layout description of the page is missing, it displays a warning.
+      # If the page layout definition of the page is missing, it displays a warning.
       #
       def page_layout_label(page)
-        if page.persisted? && page.layout_description.blank?
+        if page.persisted? && page.definition.blank?
           [
             content_tag(:span, '',
               class: 'inline warning icon',
-              title: _t(:page_layout_description_missing)
+              title: Alchemy.t(:page_definition_missing)
             ),
-            _t(:page_type)
+            Alchemy.t(:page_type)
           ].join('&nbsp;').html_safe
         else
-          _t(:page_type)
+          Alchemy.t(:page_type)
         end
       end
     end

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

@@ -1,30 +1,28 @@
 module Alchemy
   module Admin
     module PicturesHelper
-
       def create_or_assign_url(picture_to_assign, options)
         if @content.nil?
           {
-            :controller => :contents,
-            :action => :create,
-            :picture_id => picture_to_assign.id,
-            :content => {
-              :essence_type => "Alchemy::EssencePicture",
-              :element_id => @element.id
+            controller: :contents,
+            action: :create,
+            picture_id: picture_to_assign.id,
+            content: {
+              essence_type: "Alchemy::EssencePicture",
+              element_id: @element.id
             },
-            :options => options
+            options: options
           }
         else
           {
-            :controller => :essence_pictures,
-            :action => :assign,
-            :picture_id => picture_to_assign.id,
-            :content_id => @content.id,
-            :options => options
+            controller: :essence_pictures,
+            action: :assign,
+            picture_id: picture_to_assign.id,
+            content_id: @content.id,
+            options: options
           }
         end
       end
-
     end
   end
 end