alchemy_cms 4.1.2 → 4.2.0.rc1

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

@@ -24,12 +24,22 @@
 .toolbar_buttons {
   margin-right: 8px;
   white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: visible;
+  max-width: calc(100vw - #{$collapsed-main-menu-width + 65px});
+  -webkit-overflow-scrolling: touch;
+
+  @media screen and (min-width: $medium-screen-break-point) {
+    overflow: visible;
+  }
 
   &.right {
     position: absolute;
-    right: 0;
-    top: 8px;
+    right: -8px;
+    top: 0;
     margin-left: 8px;
+    padding: 8px;
+    background-color: $toolbar-bg-color;
 
     label {
       left: auto;

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

@@ -28,9 +28,6 @@
   direction: ltr;
 }
 
-.mce-widget button {
-}
-
 .mce-container *[unselectable] {
   user-select: none;
 }
@@ -70,6 +67,8 @@
   overflow: hidden;
   height: 100%;
   z-index: 100;
+  background: #fff;
+  border-radius: 0;
 
   .mce-resizehandle {
     display: none;
@@ -337,21 +336,6 @@ div.mce-tinymce-inline {
   }
 }
 
-.mce-fullscreen {
-  border: 0;
-  padding: 0;
-  margin: 0;
-  overflow: hidden;
-  background: #fff;
-  height: 100%;
-}
-
-div.mce-fullscreen {
-  position: fixed;
-  top: 0;
-  left: 0;
-}
-
 #mce-modal-block {
   opacity: 0;
   position: fixed;
@@ -722,9 +706,7 @@ body .mce-abs-layout-item {
 
   &.mce-active,
   &.mce-active:hover {
-    background-color: #e6f0f5;
-    background-image: linear-gradient(#e5e5e5, #cccccc);
-    box-shadow: #c4c4c4 0 1px 2px inset;
+    background-color: $default-border-color;
 
     button i {
       color: #000;
@@ -732,18 +714,7 @@ body .mce-abs-layout-item {
   }
 
   &:not(.mce-disabled):active {
-    background-color: #d6d6d6;
-    background-image: -moz-linear-gradient(top,#e6e6e6,#c0c0c0);
-    background-image: -webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#c0c0c0));
-    background-image: -webkit-linear-gradient(top,#e6e6e6,#c0c0c0);
-    background-image: -o-linear-gradient(top,#e6e6e6,#c0c0c0);
-    background-image: linear-gradient(to bottom,#e6e6e6,#c0c0c0);
-    background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= '#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);
-    zoom: 1;
-    -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
-    -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
-    box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
+    background-color: $default-border-color;
   }
 }
 

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

@@ -4,6 +4,7 @@ module Alchemy
   module Admin
     class AttachmentsController < ResourcesController
       include UploaderResponses
+      include ArchiveOverlay
 
       helper 'alchemy/admin/tags'
 
@@ -85,18 +86,6 @@ module Alchemy
         end
       end
 
-      def in_overlay?
-        params[:content_id].present?
-      end
-
-      def archive_overlay
-        @content = Content.find_by(id: params[:content_id])
-        respond_to do |format|
-          format.html { render partial: 'archive_overlay' }
-          format.js   { render action:  'archive_overlay' }
-        end
-      end
-
       def attachment_attributes
         params.require(:attachment).permit(:file, :name, :file_name, :tag_list)
       end

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

@@ -8,36 +8,14 @@ module Alchemy
       authorize_resource class: Alchemy::Content
 
       def create
-        @element = Element.find(params[:content][:element_id])
-        @content = Content.create_from_scratch(@element, content_params)
+        @content = Content.create(content_params)
         @html_options = params[:html_options] || {}
-        if picture_gallery_editor?
-          @content.update_essence(picture_id: params[:picture_id])
-          @gallery_pictures = @element.contents.gallery_pictures
-          options_from_params[:sortable] = @gallery_pictures.size > 1
-          @content_dom_id = "#add_picture_#{@element.id}"
-        else
-          @content_dom_id = "#add_content_for_element_#{@element.id}"
-        end
-      end
-
-      def order
-        Content.transaction do
-          params[:content_ids].each_with_index do |id, idx|
-            Content.where(id: id).update_all(position: idx + 1)
-          end
-        end
-        @notice = Alchemy.t("Successfully saved content position")
       end
 
       private
 
       def content_params
-        params.require(:content).permit(:element_id, :name, :ingredient, :essence_type)
-      end
-
-      def picture_gallery_editor?
-        params[:content][:essence_type] == 'Alchemy::EssencePicture' && options_from_params[:grouped] == 'true'
+        params.require(:content).permit(:element_id, :name, :ingredient)
       end
     end
   end

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

@@ -8,12 +8,8 @@ module Alchemy
 
       def index
         @page = Page.find(params[:page_id])
-        @cells = @page.cells
-        if @cells.blank?
-          @elements = @page.elements.not_trashed
-        else
-          @elements = @page.elements_grouped_by_cells
-        end
+        @elements = @page.elements
+        @fixed_elements = @page.fixed_elements
       end
 
       def list
@@ -39,21 +35,14 @@ module Alchemy
         Element.transaction do
           if @paste_from_clipboard = params[:paste_from_clipboard].present?
             @element = paste_element_from_clipboard
-            @cell = @element.cell
           else
-            @element = Element.new_from_scratch(create_element_params)
-            if @page.can_have_cells?
-              @cell = find_or_create_cell
-              @element.cell = @cell
-            end
-            @element.save
+            @element = Element.create(create_element_params)
           end
           if @page.definition['insert_elements_at'] == 'top'
             @insert_at_top = true
             @element.move_to_top
           end
         end
-        @cell_name = @cell.nil? ? "for_other_elements" : @cell.name
         if @element.valid?
           render :create
         else
@@ -95,11 +84,10 @@ module Alchemy
         @parent_element = Element.find_by(id: params[:parent_element_id])
         Element.transaction do
           params.fetch(:element_ids, []).each_with_index do |element_id, idx|
-            # Ensure to set page_id, cell_id and parent_element_id to the current page and
-            # cell because of trashed elements could still have old values
+            # Ensure to set page_id and parent_element_id to the current
+            # because of trashed elements could still have old values
             Element.where(id: element_id).update_all(
               page_id: params[:page_id],
-              cell_id: params[:cell_id],
               parent_element_id: params[:parent_element_id],
               position: idx + 1
             )
@@ -120,24 +108,6 @@ module Alchemy
         @element = Element.find(params[:id])
       end
 
-      # Returns the cell for element name in params.
-      # Creates the cell if necessary.
-      def find_or_create_cell
-        if @paste_from_clipboard
-          element_with_cell_name = params[:paste_from_clipboard]
-        else
-          element_with_cell_name = params[:element][:name]
-        end
-        return nil if element_with_cell_name.blank?
-        return nil unless element_with_cell_name.include?('#')
-        cell_name = element_with_cell_name.split('#').last
-        cell_definition = Cell.definition_for(cell_name)
-        if cell_definition.blank?
-          raise CellDefinitionError, "Cell definition not found for #{cell_name}"
-        end
-        @page.cells.find_or_create_by(name: cell_definition['name'])
-      end
-
       def element_from_clipboard
         @element_from_clipboard ||= begin
           @clipboard = get_clipboard('elements')
@@ -147,26 +117,18 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {
+        element = Element.copy(@source_element, {
           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
-        element = Element.copy(@source_element, new_attributes)
+          page_id: @page.id}
+        )
         if element_from_clipboard['action'] == 'cut'
-          cut_element
+          @cut_element_id = @source_element.id
+          @clipboard.delete_if { |item| item['id'] == @source_element.id.to_s }
+          @source_element.destroy
         end
         element
       end
 
-      def cut_element
-        @cutted_element_id = @source_element.id
-        @clipboard.delete_if { |item| item['id'] == @source_element.id.to_s }
-        @source_element.destroy
-      end
-
       def contents_params
         params.fetch(:contents, {}).permit!
       end

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

@@ -49,7 +49,7 @@ module Alchemy
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
-        render layout: 'application'
+        render(layout: Alchemy::Config.get(:admin_page_preview_layout) || 'application')
       end
 
       def info

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

@@ -4,6 +4,7 @@ module Alchemy
   module Admin
     class PicturesController < Alchemy::Admin::ResourcesController
       include UploaderResponses
+      include ArchiveOverlay
 
       helper 'alchemy/admin/tags'
 
@@ -143,20 +144,6 @@ module Alchemy
         end
       end
 
-      def in_overlay?
-        params[:element_id].present?
-      end
-
-      def archive_overlay
-        @content = Content.select('id').find_by(id: params[:content_id])
-        @element = Element.select('id').find_by(id: params[:element_id])
-
-        respond_to do |format|
-          format.html { render partial: 'archive_overlay' }
-          format.js   { render action:  'archive_overlay' }
-        end
-      end
-
       def redirect_to_index
         do_redirect_to admin_pictures_path(search_filter_params)
       end

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

@@ -16,7 +16,7 @@ module Alchemy
       if params[:element_id].present?
         @contents = @contents.where(element_id: params[:element_id])
       end
-      respond_with @contents
+      render json: @contents, adapter: :json, root: :contents
     end
 
     # Returns a json object for content

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

@@ -20,7 +20,7 @@ module Alchemy
       if params[:named].present?
         @elements = @elements.named(params[:named])
       end
-      respond_with @elements
+      render json: @elements, adapter: :json, root: :elements
     end
 
     # Returns a json object for element

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

@@ -16,7 +16,7 @@ module Alchemy
       if params[:page_layout].present?
         @pages = @pages.where(page_layout: params[:page_layout])
       end
-      respond_with @pages
+      render json: @pages, adapter: :json, root: :pages
     end
 
     # Returns all pages as nested json object for tree views

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

@@ -0,0 +1,20 @@
+module Alchemy
+  module Admin
+    module ArchiveOverlay
+      private
+
+      def in_overlay?
+        params[:content_id].present?
+      end
+
+      def archive_overlay
+        @content = Content.find_by(id: params[:content_id])
+
+        respond_to do |format|
+          format.html { render partial: 'archive_overlay' }
+          format.js   { render action:  'archive_overlay' }
+        end
+      end
+    end
+  end
+end

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

@@ -106,7 +106,6 @@ module Alchemy
           concat text_field_tag(nil, nil, options)
           concat render_icon(:search)
           concat link_to(render_icon(:times, size: 'xs'), '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all))
-          concat content_tag(:label, Alchemy.t(:search), for: options[:id])
         end
       end
 
@@ -215,13 +214,6 @@ module Alchemy
         "Alchemy CMS - #{title}"
       end
 
-      # (internal) Returns max image count as integer or nil. Used for the picture editor in element editor views.
-      def max_image_count
-        return nil if !@options
-        image_count = @options[:maximum_amount_of_images] || @options[:max_images]
-        image_count.blank? ? nil : image_count.to_i
-      end
-
       # Renders a toolbar button for the Alchemy toolbar
       #
       # == Example
@@ -338,9 +330,6 @@ module Alchemy
       # If you pass +'datetime'+ as +:type+ the datepicker will also have a Time select.
       # If you pass +'time'+ as +:type+ the datepicker will only have a Time select.
       #
-      # The date value gets localized via +I18n.l+. The format on Time and Date is +datepicker+, +timepicker+
-      # or +datetimepicker+, if you pass another +type+.
-      #
       # This helper always renders "text" as input type because:
       # HTML5 supports input types like 'date' but Browsers are using the users OS settings
       # to validate the input format. Since Alchemy is localized in the backend the date formats
@@ -374,7 +363,7 @@ module Alchemy
         type = html_options.delete(:type) || 'date'
         date = html_options.delete(:value) || object.send(method.to_sym).presence
         date = Time.zone.parse(date) if date.is_a?(String)
-        value = date ? l(date, format: "alchemy.#{type}picker".to_sym) : nil
+        value = date ? date.iso8601 : nil
 
         text_field object.class.name.demodulize.underscore.to_sym,
           method.to_sym, {type: "text", class: type, "data-datepicker-type" => type, value: value}.merge(html_options)
@@ -402,14 +391,15 @@ module Alchemy
 
       # (internal) Returns options for the clipboard select tag
       def clipboard_select_tag_options(items)
-        if @page.persisted? && @page.can_have_cells?
-          grouped_options_for_select(grouped_elements_for_select(items, :id))
-        else
-          options = items.map do |item|
-            [item.respond_to?(:display_name_with_preview_text) ? item.display_name_with_preview_text : item.name, item.id]
+        options = items.map do |item|
+          if item.respond_to?(:display_name_with_preview_text)
+            name = item.display_name_with_preview_text
+          else
+            name = item.name
           end
-          options_for_select(options)
+          [name, item.id]
         end
+        options_for_select(options)
       end
 
       # Returns the regular expression used for external url validation in link dialog.

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

@@ -3,42 +3,69 @@
 module Alchemy
   module Admin
     module ElementsHelper
-      include Alchemy::ElementsHelper
       include Alchemy::ElementsBlockHelper
       include Alchemy::Admin::BaseHelper
       include Alchemy::Admin::ContentsHelper
       include Alchemy::Admin::EssencesHelper
 
-      # Renders the element editor partial
-      def render_editor(element)
-        render_element(element, :editor)
-      end
-
-      # Renders a drag'n'drop picture gallery editor for all EssencePictures.
+      # Renders a {Alchemy::Element} editor partial.
+      #
+      # A element editor partial is the form presented to the content author in page edit mode.
+      #
+      # The partial is located in <tt>app/views/alchemy/elements</tt>.
+      #
+      # == Partial naming
+      #
+      # The partials have to be named after the name of the element as defined in the <tt>elements.yml</tt> file and has to be suffixed with <tt>_editor</tt>.
+      #
+      # === Example
+      #
+      # Given a headline element
+      #
+      #   # elements.yml
+      #   - name: headline
+      #     contents:
+      #     - name: text
+      #       type: EssenceText
       #
-      # It brings full functionality for adding images, deleting images and sorting them via drag'n'drop.
-      # Just place this helper inside your element editor view, pass the element as parameter and that's it.
+      # Then your element editor partial has to be named:
       #
-      # === Options:
+      #   app/views/alchemy/elements/_headline_editor.html.{erb|haml|slim}
       #
-      #   :maximum_amount_of_images    [Integer]   # This option let you handle the amount of images your customer can add to this element.
+      # === Element partials generator
       #
-      def render_picture_gallery_editor(element, options = {})
-        default_options = {
-          maximum_amount_of_images: nil,
-          grouped: true
+      # You can use this handy generator to let Alchemy generate the partials for you:
+      #
+      #   $ rails generate alchemy:elements --skip
+      #
+      # == Usage
+      #
+      #   <%= render_editor(Alchemy::Element.published.named(:headline).first) %>
+      #
+      # @param [Alchemy::Element] element
+      #   The element you want to render the editor for
+      #
+      # @note If the partial is not found
+      #   <tt>alchemy/elements/_editor_not_found.html.erb</tt> gets rendered.
+      #
+      def render_editor(element)
+        if element.nil?
+          warning('Element is nil')
+          render "alchemy/elements/editor_not_found", {name: 'nil'}
+          return
+        end
+
+        render "alchemy/elements/#{element.name}_editor", element: element
+      rescue ActionView::MissingTemplate => e
+        warning(%(
+          Element editor partial not found for #{element.name}.\n
+          #{e}
+        ))
+        render "alchemy/elements/editor_not_found", {
+          name: element.name,
+          error: "Element editor partial not found.<br>Use <code>rails generate alchemy:elements</code> to generate it."
         }
-        options = default_options.merge(options)
-        render(
-          partial: "alchemy/admin/elements/picture_gallery_editor",
-          locals: {
-            pictures: element.contents.gallery_pictures,
-            element: element,
-            options: options
-          }
-        )
       end
-      alias_method :render_picture_editor, :render_picture_gallery_editor
 
       # Returns an elements array for select helper.
       #
@@ -55,57 +82,16 @@ module Alchemy
         end
       end
 
-      # Returns all elements that can be placed on the current page.
-      # The elements will be grouped by cell.
-      #
-      # @param [Array] elements
-      #   collection of element objects
-      # @param [String] object_method
-      #   method that is called on the element objects used for the select option value
-      #
-      def grouped_elements_for_select(elements, object_method = 'name')
-        return [] if elements.blank?
-        cells_definition = @page.cell_definitions
-        return [] if cells_definition.blank?
-        options = {}
-        cells_definition.each do |cell|
-          cell_elements = elements_for_cell(elements, cell)
-          optgroup_label = Cell.translated_label_for(cell['name'])
-          options[optgroup_label] = cell_elements.map do |e|
-            element_array_for_options(e, object_method, cell)
-          end
-        end
-        options[Alchemy.t(:main_content)] = elements_for_main_content(elements).map do |e|
-          element_array_for_options(e, object_method)
-        end
-        # Remove empty cells
-        options.delete_if { |_c, e| e.blank? }
-      end
-
-      def element_array_for_options(element, object_method, cell = nil)
-        case element
-        when Alchemy::Element
-          [
-            element.display_name_with_preview_text,
-            element.send(object_method).to_s + (cell ? "##{cell['name']}" : "")
-          ]
-        else
-          [
-            Element.display_name_for(element['name']),
-            element[object_method] + (cell ? "##{cell['name']}" : "")
-          ]
-        end
-      end
-
       # CSS classes for the element editor partial.
-      def element_editor_classes(element, local_assigns)
+      def element_editor_classes(element)
         [
           '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'
+          element.compact? ? 'compact' : nil,
+          element.fixed? ? 'is-fixed' : 'not-fixed'
         ].join(' ')
       end
 
@@ -118,22 +104,6 @@ module Alchemy
           element.nestable_elements.empty?
         end
       end
-
-      private
-
-      def elements_for_main_content(elements)
-        page_definition = @page.definition['elements']
-        elements.select do |e|
-          page_definition.include?(e.class.name == 'Element' ? e.name : e['name'])
-        end
-      end
-
-      def elements_for_cell(elements, cell)
-        cell_elements = cell['elements']
-        elements.select do |e|
-          cell_elements.include?(e.class.name == 'Element' ? e.name : e['name'])
-        end
-      end
     end
   end
 end