alchemy_cms 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47456fa8fded3fd78ac81d01bb4dd3b051c34c77
-  data.tar.gz: f94ce0049b27128fe5868a04e13b41376a34db06
+  metadata.gz: 2e25191bd90849e3276a03f409875bcd05a49ce5
+  data.tar.gz: ce85ab765e70be9351d4d6c69a7a5aaf84b174bd
 SHA512:
-  metadata.gz: d32252e1256371e7c98bee941dfedf654fd5e4115bec71e8181d626c6da0baf9d9b38c2d1cf752a295d12a527ef073d2328ca761c4a83904e6d7dc47af25fbe0
-  data.tar.gz: 91f58b59b4d938486de085b6783b4054bad57b7f8c08740ef3490b621311cd9109d71c5c454c2b61452724be8d211a118c922371bf8a05d836bb394cae983c92
+  metadata.gz: 4d0b6f298b7b9ccb71f4a539a329dc5b3e485f3c02a029ea248214b694634112b19712270009d5fe0f2f3e367972a10876d88be2e9508b72a116528d35e664cb
+  data.tar.gz: 45bed619a0e65bb9427fe91c76ee8077c261c7c969ac3d07e455e9cdc50e02393ad40e07952c7f54bdfbb8a3360652621e703bcc7cd37f270ecb46c64c6a884f

data/Gemfile

@@ -29,9 +29,9 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
-group :development do
+group :development, :test do
   unless ENV['CI']
-    gem 'debugger'
+    gem 'pry'
     gem 'quiet_assets' # Mute assets loggin
     gem 'thin' # Get rid off 'Could not determine content-length of response body' Warning. Start with 'rails s thin'
   end

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -72,7 +72,7 @@ $.extend Alchemy,
     $element = $(selector)
     Alchemy.setElementClean selector
     Alchemy.Buttons.enable $element
-    return
+    return true
 
   # Initializes all select tag with .alchemy_selectbox class as selectBoxIt instance
   # Pass a jQuery scope to only init a subset of selectboxes.

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee

@@ -2,8 +2,16 @@ window.Alchemy = {} if typeof (window.Alchemy) is "undefined"
 
 $.extend Alchemy,
 
-  SortableElements: (page_id, form_token, selector) ->
-    selector = "#element_area .sortable_cell"  if typeof (selector) is "undefined"
+  SortableElements: (page_id, form_token, selector = '#element_area .sortable_cell') ->
+
+    getTinymceIDs = (ui) ->
+      ids = []
+      $textareas = ui.item.find('textarea.default_tinymce, textarea.custom_tinymce')
+      $($textareas).each ->
+        id = this.id.replace(/tinymce_/, '')
+        ids.push parseInt(id, 10)
+      return ids
+
     $(selector).sortable
       items: "div.element_editor"
       handle: ".element_handle"
@@ -37,12 +45,10 @@ $.extend Alchemy,
             Alchemy.TrashWindow.refresh page_id
 
       start: (event, ui) ->
-        $textareas = ui.item.find("textarea.default_tinymce, textarea.custom_tinymce")
-        Alchemy.Tinymce.removeEditor $textareas
+        Alchemy.Tinymce.remove getTinymceIDs(ui)
 
       stop: (event, ui) ->
-        $textareas = ui.item.find("textarea.default_tinymce, textarea.custom_tinymce")
-        Alchemy.Tinymce.addEditor $textareas
+        Alchemy.Tinymce.init getTinymceIDs(ui)
 
   SortableContents: (selector, token) ->
     $(selector).sortable

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -44,8 +44,13 @@ Alchemy.ElementEditors =
     $("#element_area .element_editor").removeClass "selected"
     $element.addClass "selected"
     self.scrollToElement this
+    self.selectElementInPreview id
+
+  # Selcts and scrolls to element with given id in the preview window.
+  #
+  selectElementInPreview: (id) ->
     $frame_elements = document.getElementById("alchemyPreviewWindow").contentWindow.jQuery("[data-alchemy-element]")
-    $selected_element = $frame_elements.closest("[data-alchemy-element=\"" + id + "\"]")
+    $selected_element = $frame_elements.closest("[data-alchemy-element='#{id}']")
     $selected_element.trigger "Alchemy.SelectElement"
 
   # Binds the custom 'Alchemy.SelectElementEditor' event.

data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee

@@ -31,7 +31,7 @@ Alchemy.ElementsWindow =
     $('#main_content').append($dialog)
     self.currentWindow = $dialog.dialog
       modal: false
-      minWidth: 420
+      minWidth: 400
       minHeight: 300
       height: $(window).height() - 88
       title: options.texts.title

data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee

@@ -13,10 +13,10 @@ Alchemy.PreviewWindow =
       Alchemy.PreviewWindow.currentWindow = $iframe.dialog(
         modal: false
         title: title
-        width: $(window).width() - 502
-        height: $(window).height() - 76
-        minWidth: 600
+        minWidth: 320
         minHeight: 300
+        width: $(window).width() - 482
+        height: $(window).height() - 76
         show: "fade"
         hide: "fade"
         position: [70, 84]
@@ -43,15 +43,17 @@ Alchemy.PreviewWindow =
     else
       $("#alchemyPreviewWindow").dialog "open"
 
-  refresh: ->
+  refresh: (callback) ->
     $iframe = $("#alchemyPreviewWindow")
     $spinner = $(".preview-refresh-spinner")
     $refresh = $('.ui-dialog-titlebar-refresh')
     $spinner.show()
     $refresh.hide()
-    $iframe.load ->
+    $iframe.load (e) ->
       $spinner.hide()
       $refresh.show()
+      if callback
+        callback.call(e, $iframe)
     $iframe.attr("src", $iframe.attr("src"))
     true
 

data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb

@@ -21,71 +21,69 @@ window.Alchemy.Tinymce =
   #
   customConfigs: {}
 
-  # Returns default config for tinymce editors.
+  # Returns default config for a tinymce editor.
   #
-  getDefaultConfig: ->
+  getDefaultConfig: (id) ->
     config = @defaults
     config.language = Alchemy.locale
-    config.mode = "specific_textareas"
-    config.editor_selector = "default_tinymce"
-    config.init_instance_callback = (inst) ->
-      $this = $("##{inst.editorId}")
-      parent = $this.parents('.element_editor')
-      parent.find('.spinner').remove()
-      inst.onChange.add ->
-        Alchemy.setElementDirty(parent)
+    config.mode = 'exact'
+    config.elements = "tinymce_#{id}"
+    config.init_instance_callback = @initInstanceCallback
     return config
 
   # Returns configuration for given custom tinymce editor selector.
   #
   # It uses the +.getDefaultConfig+ and merges the custom parts.
   #
-  getCustomConfig: (editor) ->
-    if editor_config = @customConfigs[editor]
-      config = $.extend({}, @getDefaultConfig(), editor_config)
-      config.mode = 'specific_textareas'
-      config.editor_selector = new RegExp("custom_tinymce #{editor}")
-      return config
+  getCustomConfig: (id, selector) ->
+    editor_config = @customConfigs[selector]
+    if editor_config
+      $.extend({}, @getDefaultConfig(id), editor_config)
 
-  # Initializes all default TinyMCE instances
+  # Initializes all TinyMCE editors with given ids
   #
-  init: ->
-    spinner = Alchemy.Spinner.small()
-    $('.tinymce_container').prepend spinner.spin().el
-    tinymce.init @getDefaultConfig()
-
-  # Initializes all tinymce editors with custom configuration.
-  #
-  # @param editors [Array]
-  #   - Editor selectors that should be initialized. The selector has to be in format of:
-  #     "element_name_content_name"
+  # @param ids [Array]
+  #   - Editor ids that should be initialized.
   #
-  initCustomEditors: (editors) ->
-    return if not editors
-    for editor in editors
-      if custom_editor_config = @getCustomConfig(editor)
-        tinymce.init custom_editor_config
+  init: (ids) ->
+    for id in ids
+      @initEditor(id)
 
-  # Adds a TinyMCE editor to given dom elements.
+  # Initializes one specific TinyMCE editor
   #
-  # Checks if element has custom tinymce config and uses this to init editor.
-  # Otherwise it uses the default config.
+  # @param id [Number]
+  #   - Editor id that should be initialized.
   #
-  addEditor: (elements) ->
-    self = Alchemy.Tinymce
-    $(elements).each ->
-      if custom_editor = this.classList[1]
-        config = self.getCustomConfig(custom_editor)
-      else
-        config = self.getDefaultConfig()
+  initEditor: (id) ->
+    textarea = $("textarea#tinymce_#{id}")
+    return if textarea.length == 0
+    if selector = textarea[0].classList[1]
+      config = @getCustomConfig(id, selector)
+    else
+      config = @getDefaultConfig(id)
+    if config
+      spinner = Alchemy.Spinner.small()
+      textarea.parents('.tinymce_container').prepend spinner.spin().el
       tinymce.init(config)
-      tinymce.execCommand('mceAddControl', true, this.id)
+    else
+      Alchemy.debug('No tinymce configuration found for', id)
+
+  # Gets called after an editor instance gets intialized
+  #
+  initInstanceCallback: (inst) ->
+    $this = $("##{inst.editorId}")
+    parent = $this.parents('.element_editor')
+    parent.find('.spinner').remove()
+    inst.onChange.add ->
+      Alchemy.setElementDirty(parent)
 
-  # Removes the TinyMCE editor from given dom elements.
+  # Removes the TinyMCE editor from given dom ids.
   #
-  removeEditor: (elements) ->
-    $(elements).each ->
-      tinymce.get(this.id).remove()
+  remove: (ids) ->
+    for id in ids
+      editor = tinymce.get("tinymce_#{id}")
+      if editor
+        editor.remove()
 
 # Populate custom tinymce configurations
 <% Alchemy::Tinymce.custom_config_contents.each do |content| %>

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

@@ -269,10 +269,6 @@ ul.list li.legend {
   font-weight: bold;
 }
 
-#layoutpages li img.site_status {
-  float: left;
-}
-
 ul.list span.right {
   float: right;
 }
@@ -428,6 +424,13 @@ p.foot_note {
     position: relative;
   }
 
+  .info.message {
+    float: right;
+    width: 134px;
+    margin-left: 8px;
+    padding: 0 8px 0 32px;
+  }
+
   .jcrop-holder { @include inline-block }
 
   img {
@@ -437,13 +440,19 @@ p.foot_note {
 
   form {
     padding: 0;
-    text-align: right;
     position: absolute;
-    width: 800px;
     bottom: 2 * $default-padding;
-    left: 2 * $default-padding;
-
-    .button.with_icon { float: left }
+    right: 2 * $default-padding;
+    width: 176px;
+    margin-left: 8px;
+
+    .reset_mask, button {
+      display: block;
+      margin-bottom: 0;
+      text-align: center;
+    }
+    .reset_mask { padding-top: 4px }
+    button { width: 100% }
   }
 }
 

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

@@ -488,50 +488,54 @@ div.file_icon {
   float: left;
   height: 24px;
   width: 24px;
-}
 
-div.file_icon span.icon {
-  margin: $default-margin;
-}
+  span.icon {
+    margin: $default-margin;
+  }
 
-div.file_icon a.assign_file {
-  display: block;
-  height: 16px;
-  background: image-url('alchemy/icons.png') no-repeat -480px -40px;
-  width: 16px;
-  margin: $default-margin;
+  a.assign_file {
+    display: block;
+    height: 16px;
+    background: image-url('alchemy/icons.png') no-repeat -480px -40px;
+    width: 16px;
+    margin: $default-margin;
+  }
 }
 
-div.file_name {
-  white-space: nowrap;
-  overflow: hidden;
-  float: left;
-  width: 293px;
-  line-height: 25px;
-  font-size: 10px;
+.content_editor.essence_file {
+
+  .file_name {
+    white-space: nowrap;
+    overflow: hidden;
+    float: left;
+    max-width: 80%;
+    line-height: 25px;
+    font-size: 10px;
+    text-overflow: ellipsis;
+  }
 }
 
-div.essence_file_tools {
+.essence_file_tools {
   height: 24px;
   float: right;
   background-color: white;
   width: 48px;
-}
 
-div.essence_file_tools a {
-  text-decoration: none;
-  width: 16px;
-  height: 16px;
-  margin: $default-margin;
-  float: left;
-}
+  a {
+    text-decoration: none;
+    width: 16px;
+    height: 16px;
+    margin: $default-margin;
+    float: left;
 
-div.essence_file_tools a.assign_file {
-  background: image-url('alchemy/icons.png') -512px -40px;
-}
+    &.assign_file {
+      background: image-url('alchemy/icons.png') -512px -40px;
+    }
 
-div.essence_file_tools a.edit_file {
-  background: image-url('alchemy/icons.png') -160px -167px;
+    &.edit_file {
+      background: image-url('alchemy/icons.png') -160px -167px;
+    }
+  }
 }
 
 a.new_content_link {

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

@@ -38,7 +38,7 @@
   box-shadow: $shadow;
 }
 
-@mixin box-sizing($box-sizing-type: content-box) {
+@mixin box-sizing($box-sizing-type: border-box) {
   -webkit-box-sizing: $box-sizing-type;
   -moz-box-sizing: $box-sizing-type;
   box-sizing: $box-sizing-type;
@@ -47,8 +47,8 @@
 #alchemy_menubar {
   position: fixed;
   top: 0;
-  left: -353px;
-  width: 346px;
+  left: -356px;
+  width: 400px;
   z-index: 10000;
   background: $light-gray;
   @include transition;
@@ -58,7 +58,7 @@
   @include box-sizing;
   border-right: $default-border;
   border-bottom: $default-border;
-  height: 8 * $default-padding + 2px;
+  height: 44px;
   padding: 4px 40px 4px 8px;
   overflow: hidden;
   font: $default-font-style;
@@ -90,15 +90,21 @@
     height: auto;
 
     li {
+      width: 32%;
       height: 35px;
-      margin: 0 $default-padding 0 0;
+      margin: 0 $default-margin 0 0;
       padding: 0;
       @include inline-block;
       list-style-type: none;
+      text-align: center;
 
       a, button {
-        line-height: 14px;
         @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;

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

@@ -198,7 +198,7 @@ td, th {
   &.center, &.boolean {
     text-align: center;
 
-    .icon {
+    .icon.false {
       @extend .false;
     }
 

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

@@ -62,7 +62,7 @@ module Alchemy
           @page.set_language_from_parent_or_default_language
         end
         if @page.save
-          redirect_path = params[:redirect_to] || edit_admin_page_path(@page)
+          redirect_path = redirect_path_after_page_create
         else
           # TODO: Make a rollback, because the page is already persisted here.
           redirect_path = admin_pages_path
@@ -238,7 +238,7 @@ module Alchemy
         end
       end
 
-    private
+      private
 
       def load_page
         @page = Page.find(params[:id])
@@ -259,6 +259,14 @@ module Alchemy
         end
       end
 
+      def redirect_path_after_page_create
+        if @page.redirects_to_external?
+          admin_pages_path
+        else
+          params[:redirect_to] || edit_admin_page_path(@page)
+        end
+      end
+
     end
   end
 end

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

@@ -15,11 +15,6 @@ module Alchemy
         "#{c.essence_type.demodulize.underscore}_#{c.id}"
       end
 
-      # Returns a jquery selector string of form field ids from given contents
-      def contents_form_field_ids_string(contents)
-        contents.collect { |c| "##{c.form_field_id}" }.join(', ')
-      end
-
       # Renders the name of elements content or the default name defined in elements.yml
       def render_content_name(content)
         if content.blank?

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

@@ -88,13 +88,14 @@ module Alchemy
       #
       def url_for_module_sub_navigation(navigation)
         alchemy_module = module_definition_for(navigation)
+        return if alchemy_module.nil?
         route_from_engine_or_main_app(
           alchemy_module['engine_name'],
           url_options_for_navigation_entry(navigation)
         )
       end
 
-    private
+      private
 
       # Calls +url_for+ helper on engine if present or on host app.
       #

data/app/helpers/alchemy/elements_helper.rb

@@ -70,6 +70,8 @@ module Alchemy
     #   Reverse the rendering order
     # @option options [String] :sort_by
     #   The name of a {Alchemy::Content} to sort the elements by
+    # @option options [String] :separator
+    #   A string that will be used to join the element partials. Default nil
     #
     def render_elements(options = {})
       default_options = {
@@ -114,10 +116,11 @@ module Alchemy
             end
           end
         end
+        element_string = []
         all_elements.each_with_index do |element, i|
-          element_string += render_element(element, :view, options, i+1)
+          element_string << render_element(element, :view, options, i+1)
         end
-        element_string.html_safe
+        element_string.join(options[:separator]).html_safe
       end
     end
 

data/app/helpers/alchemy/pages_helper.rb

@@ -155,7 +155,7 @@ module Alchemy
     #   :submenu => true                                 # Shows the nested children
     #   :level => 2                                      # Normally there is no need to change the level parameter, just in a few special cases
     #
-    def render_subnavigation(options = {})
+    def render_subnavigation(options = {}, html_options = {})
       default_options = {
         :from_page => @page,
         :submenu => true,
@@ -166,7 +166,7 @@ module Alchemy
         while options[:from_page].level > options[:level] do
           options[:from_page] = options[:from_page].parent
         end
-        render_navigation(options)
+        render_navigation(options, html_options)
       else
         return nil
       end

data/app/models/alchemy/element.rb

@@ -358,6 +358,12 @@ module Alchemy
     end
     alias_method :richtext_contents, :rtf_contents
 
+    # Returns an array of all EssenceRichtext contents ids
+    #
+    def richtext_contents_ids
+      contents.essence_richtexts.pluck('alchemy_contents.id')
+    end
+
     # The names of all cells from given page this element could be placed in.
     def belonging_cellnames(page)
       cellnames = page.cells.select { |c| c.available_elements.include?(self.name) }.collect(&:name).flatten.uniq

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

@@ -166,14 +166,13 @@ module Alchemy
       elements.named(definition['feed_elements'])
     end
 
-    # Returns an array of selectors for all contents with custom tinymce config.
-    def custom_tinymce_contents_selectors
-      Tinymce.page_custom_config_contents(self).collect do |c|
-        "#{c['element']}_#{c['name']}"
-      end
+    # Returns an array of all EssenceRichtext contents ids
+    #
+    def richtext_contents_ids
+      contents.essence_richtexts.pluck('alchemy_contents.id')
     end
 
-  private
+    private
 
     # Looks in the page_layout descripion, if there are elements to autogenerate.
     #

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

@@ -86,7 +86,7 @@ module Alchemy
 
       # All pages for xml sitemap
       #
-      scope :sitemap, published.contentpages.where(sitemap: true)
+      scope :sitemap, from_current_site.published.contentpages.where(sitemap: true)
     end
 
   end

data/app/views/alchemy/admin/contents/create.js.erb

@@ -44,7 +44,7 @@
 
 <% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
 
-  Alchemy.Tinymce.addEditor('#<%= @content.form_field_id %>');
+  Alchemy.Tinymce.initEditor(<%= @content.id %>);
 
 <% end %>
 

data/app/views/alchemy/admin/elements/_refresh_editor.js.erb

@@ -1,10 +1,8 @@
-<%- rtfs = element.contents.essence_richtexts -%>
+<%- rtfs = element.richtext_contents_ids -%>
 (function() {
   var $element = $('.element_content', '#element_<%= element.id %>');
-  <% rtfs.each do |content| %>
-  tinymce.get('contents_content_<%= content.id %>_body').remove();
-  <% end %>
+  Alchemy.Tinymce.remove(<%= rtfs.to_json %>);
   $element.html('<%= escape_javascript render_editor(element) %>');
   Alchemy.GUI.init($element);
-  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
+  Alchemy.Tinymce.init(<%= rtfs.to_json %>);
 })();

data/app/views/alchemy/admin/elements/create.js.erb

@@ -30,9 +30,7 @@
 
   Alchemy.growl('<%= _t(:successfully_added_element) -%>');
   Alchemy.closeCurrentWindow();
-<% if (rtfs = @element.contents.essence_richtexts).any? %>
-  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
-<% end %>
+  Alchemy.Tinymce.init(<%= @element.richtext_contents_ids.to_json %>);
   Alchemy.PreviewWindow.refresh();
   Alchemy.ElementEditors.init();
 

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -1,5 +1,3 @@
-<% rtfs = @element.contents.essence_richtexts %>
-
 (function($) {
   var $el = $('.element_editor[data-element-id="<%= @element.id %>"]');
 
@@ -16,21 +14,13 @@
 
 <% if @element.folded %>
 
-<% if rtfs.any? %>
-
-  Alchemy.Tinymce.removeEditor('<%= contents_form_field_ids_string(rtfs) %>');
-
-<% end %>
+  Alchemy.Tinymce.remove(<%= @element.richtext_contents_ids.to_json %>);
 
 <% else %>
 
   $el.trigger('Alchemy.SelectElementEditor');
   Alchemy.SelectBox($el);
-
-<% if rtfs.any? %>
-  Alchemy.Tinymce.addEditor('<%= contents_form_field_ids_string(rtfs) %>');
-<% end %>
-
+  Alchemy.Tinymce.init(<%= @element.richtext_contents_ids.to_json %>);
   Alchemy.GUI.initElement($el);
 
 <% end %>

data/app/views/alchemy/admin/elements/update.js.erb

@@ -8,7 +8,9 @@
   $("#element_<%= @element.id %>_errors").hide();
   Alchemy.setElementSaved($el);
   Alchemy.growl('<%= _t(:element_saved) %>');
-  Alchemy.PreviewWindow.refresh();
+  Alchemy.PreviewWindow.refresh(function() {
+    Alchemy.ElementEditors.selectElementInPreview(<%= @element.id %>);
+  });
   <%= update_essence_select_elements(@page, @element) -%>
 <%- else -%>
   Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -1,5 +1,4 @@
 (function($) {
-  var $el = $('#element_<%= @content.element.id %>');
   $('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(
     render partial: "alchemy/essences/essence_file_editor",
       formats: [:html],
@@ -10,6 +9,6 @@
   ) %>');
   Alchemy.closeCurrentWindow();
   Alchemy.reloadPreview();
-  Alchemy.setElementDirty($el);
-  Alchemy.overlayObserver($el);
+  Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));
+  Alchemy.overlayObserver($('#<%= content_dom_id(@content) %>'));
 })(jQuery);

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -5,7 +5,7 @@
   <% end %>
 <% else %>
   <%= render_message do %>
-    <%= _t('explain cropping') %>
+    <%= simple_format _t(:explain_cropping) %>
   <% end %>
   <div class="thumbnail_background">
     <%= image_tag(
@@ -22,11 +22,11 @@
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag :content_id, @content.id %>
-    <%= link_to(render_icon('delete-small') + _t('Reset Imagemask'), '#', {
+    <%= f.button "#{render_icon(:true)} #{_t(:apply)}".html_safe, class: 'with_icon' %>
+    <%= link_to _t('Reset Imagemask'), '#', {
       onclick: 'Alchemy.ImageCropper.reset()',
-      class: 'button with_icon'
-    }) %>
-    <%= f.button _t(:apply), class: 'button' %>
+      class: 'reset_mask'
+    } %>
   <% end %>
 </div>
 <% end %>

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

@@ -26,7 +26,12 @@
     </tr>
     <tr>
       <td class="label"><%= f.label :page_layout %></td>
-      <td class="input"><%= f.text_field :page_layout, class: 'thin_border' %></td>
+      <td class="select">
+        <%= f.select :page_layout,
+          Alchemy::PageLayout.all.map { |p| [Alchemy::PageLayout.human_layout_name(p['name']), p['name']] },
+          {prompt: _t('Please choose')},
+          {class: 'alchemy_selectbox long'} %>
+      </td>
     </tr>
     <tr>
       <td></td>

data/app/views/alchemy/admin/languages/_language.html.erb

@@ -12,7 +12,7 @@
     <%= language.frontpage_name %>
   </td>
   <td>
-    <%= language.page_layout %>
+    <%= Alchemy::PageLayout.human_layout_name(language.page_layout) %>
   </td>
   <td class="center">
     <%= language.public? ? render_icon('true') : '' %>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -1,7 +1,7 @@
 <li class="page_level_<%= layoutpage.level %>" id="page_<%= layoutpage.id %>">
-  <div class="sitemap_page">
+  <div class="sitemap_page<%= layoutpage.locked ? ' locked' : '' %>">
     <div class="sitemap_left_images">
-      <span class="site_status <%= layoutpage.locked ? ' locked' : '' %>" ></span>
+      <span class="site_status"></span>
     </div>
     <div class="sitemap_right_tools">
       <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>

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

@@ -165,8 +165,7 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element_editor');
-      Alchemy.Tinymce.init();
-      Alchemy.Tinymce.initCustomEditors(<%= raw @page.custom_tinymce_contents_selectors.to_json %>);
+      Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
       jQuery('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
       Alchemy.ElementDirtyObserver('#element_area');
       if (window.location.hash) {
@@ -201,6 +200,7 @@
         width = Alchemy.PreviewWindow.currentWidth;
       }
       Alchemy.PreviewWindow.currentWindow.dialog('widget').css('width', width);
+      Alchemy.PreviewWindow.currentWindow.dialog('moveToTop');
     });
   });
 

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

@@ -1,4 +1,4 @@
-<div class="content_editor" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_file" id="<%= content_dom_id(content) %>">
   <label style="display: inline">
     <%= render_content_name(content) %>
     <%= delete_content_link(content) %>

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

@@ -5,7 +5,8 @@
     <%= text_area_tag(
       content.form_field_name,
       content.ingredient || '',
-      class: content.tinymce_class_name
+      class: content.tinymce_class_name,
+      id: "tinymce_#{content.id}"
     ) %>
   </div>
 </div>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -1,14 +1,15 @@
 <% if options[:crop] && content.ingredient %>
 <%= link_to_overlay_window(
   render_icon('crop'),
-  alchemy.crop_admin_essence_picture_path(content.essence, :options => options.to_json),
+  alchemy.crop_admin_essence_picture_path(content.essence, options: options.to_json),
   {
-    :size => "816x754",
-    :title => _t('Edit Picturemask'),
-    :image_loader => false
+    size: "1000x653",
+    title: _t('Edit Picturemask'),
+    image_loader: false,
+    modal: false
   },
   {
-    :title => _t('Edit Picturemask')
+    title: _t('Edit Picturemask')
   }
 ) %>
 <%- else -%>

data/config/locales/alchemy.de.yml

@@ -399,7 +399,7 @@ de:
     element_of_type: "Element"
     element_saved: "Element wurde gespeichert."
     enter_external_link: "Geben Sie hier die Adresse der Seite ein zu der Sie einen Link setzen wollen."
-    'explain cropping': "Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen. Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern."
+    explain_cropping: "<p>Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen.</p><p>Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern.</p>"
     explain_publishing: "Die gecachte Version vom Server löschen und die aktuellen Änderungen veröffentlichen"
     explain_sitemap_dragndrop_sorting: "Tip: Halten Sie zum Sortieren der Seiten das Seitensymbol mit der Maus fest und bewegen Sie sie an ihre neue Position."
     explain_unlocking: "Die Seite verlassen und für andere Benutzer zum Bearbeiten freigeben."

data/config/locales/alchemy.en.yml

@@ -237,7 +237,7 @@ en:
     element_of_type: "Element"
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
-    'explain cropping': "Move the frame and change its size to adjust the image section. Click on apply when you are satisfied."
+    explain_cropping: "<p>Move the frame and change its size to adjust the image section.</p><p>Click on apply when you are satisfied.</p>"
     explain_publishing: "Publish the page and remove the cached version from the server."
     explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."

data/lib/alchemy/modules.rb

@@ -1,38 +1,75 @@
 module Alchemy
   module Modules
+    mattr_accessor :alchemy_modules
 
-    @@alchemy_modules = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/alchemy', 'modules.yml'))
+    @@alchemy_modules = YAML.load_file(File.expand_path('../../../config/alchemy/modules.yml', __FILE__))
 
     def self.included(base)
       base.send :helper_method, :alchemy_modules, :module_definition_for
     end
 
-    def alchemy_modules
-      @@alchemy_modules
-    end
-
+    # Get the module definition for given module name
+    #
+    # You can also pass a hash of an module definition.
+    # It then tries to find the module defintion from controller name and action name
+    #
     def module_definition_for(name)
-      if name.is_a? String
-        alchemy_modules.detect { |p| p["name"] == name }
-      elsif name.is_a? Hash
+      case name
+      when String
+        alchemy_modules.detect { |p| p['name'] == name }
+      when Hash
         alchemy_modules.detect do |alchemy_module|
-          alchemy_module.stringify_keys!
-          name.symbolize_keys!
-          module_navi = alchemy_module["navigation"].stringify_keys
-          if module_navi["sub_navigation"]
-            module_navi["sub_navigation"].map(&:stringify_keys).detect do |subnavi|
-              subnavi["controller"].gsub(/^\//, '') == name[:controller] && subnavi["action"] == name[:action]
-            end
-          end
+          definition_from_subnavi(alchemy_module, name.symbolize_keys)
         end
       else
         raise "Could not find module definition for #{name}"
       end
     end
 
+    # Register a Alchemy module.
+    #
+    # A module is a Hash that must have at least a name and a navigation key
+    # that has a controller and action name.
+    #
+    # == Example:
+    #
+    #     name: 'module',
+    #     navigation: {
+    #       controller: 'admin/controller_name',
+    #       action: 'index'
+    #     }
+    #
     def self.register_module(module_definition)
       @@alchemy_modules << module_definition.stringify_keys
     end
 
+    private
+
+    def alchemy_module_navigation(alchemy_module)
+      alchemy_module.stringify_keys!
+      alchemy_module.fetch('navigation', {}).stringify_keys
+    end
+
+    def definition_from_subnavi(alchemy_module, name)
+      module_navi = alchemy_module_navigation(alchemy_module)
+      subnavi = module_navi['sub_navigation']
+      return if subnavi.nil?
+      subnavi.map(&:stringify_keys).detect do |subnavi|
+        controller_matches?(subnavi, name) && action_matches?(subnavi, name)
+      end
+    end
+
+    def controller_matches?(subnavi, name)
+      remove_slash(subnavi['controller']) == remove_slash(name[:controller])
+    end
+
+    def action_matches?(subnavi, name)
+      subnavi['action'] == name[:action]
+    end
+
+    def remove_slash(name)
+      name.gsub(/^\//, '')
+    end
+
   end
 end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 
   def self.version
     VERSION

data/spec/controllers/admin/pages_controller_spec.rb

@@ -73,13 +73,13 @@ module Alchemy
       let(:language) { mock_model('Language', code: 'kl') }
       let(:parent) { mock_model('Page', language: language) }
       let(:page_params) do
-        {parent_id: parent.id, name: 'new Page'} 
+        {parent_id: parent.id, name: 'new Page'}
       end
 
       context "" do
         before do
           Page.any_instance.stub(:set_language_from_parent_or_default_language)
-          Page.any_instance.stub(:save).and_return(true)
+          Page.any_instance.stub(save: true)
         end
 
         it "nests a new page under given parent" do
@@ -88,6 +88,13 @@ module Alchemy
           expect(assigns(:page).parent_id).to eq(parent.id)
         end
 
+        it "redirects to edit page template" do
+          page = mock_model('Page')
+          controller.should_receive(:edit_admin_page_path).and_return('bla')
+          post :create, page: page_params
+          response.should redirect_to('bla')
+        end
+
         context "if new page can not be saved" do
           it "should redirect to admin_pages_path" do
             Page.any_instance.stub(:save).and_return(false)
@@ -114,6 +121,14 @@ module Alchemy
             end
           end
         end
+
+        context 'with page redirecting to external' do
+          it "redirects to sitemap" do
+            Page.any_instance.should_receive(:redirects_to_external?).and_return(true)
+            post :create, page: page_params
+            response.should redirect_to(admin_pages_path)
+          end
+        end
       end
 
       context "with paste_from_clipboard in parameters" do
@@ -130,13 +145,11 @@ module Alchemy
             parent,
             'pasted Page'
           ).and_return(
-            mock_model('Page', save: true, name: 'pasted Page')
+            mock_model('Page', save: true, name: 'pasted Page', redirects_to_external?: false)
           )
           post :create, {paste_from_clipboard: page_in_clipboard.id, page: {parent_id: parent.id, name: 'pasted Page'}, format: :js}
         end
-
       end
-
     end
 
     describe '#copy_language_tree' do
@@ -283,7 +296,7 @@ module Alchemy
           end
         end
       end
-      
+
     end
 
   end

data/spec/helpers/admin/contents_helper_spec.rb

@@ -7,17 +7,6 @@ describe Alchemy::Admin::ContentsHelper do
     helper.content_dom_id(element.content_by_type('EssenceText')).should match(/essence_text_\d{1,}/)
   end
 
-  describe '#contents_form_field_ids_string' do
-    let(:content_1) { double('Alchemy::Content', form_field_id: 'contents_content_1_body') }
-    let(:content_2) { double('Alchemy::Content', form_field_id: 'contents_content_2_body') }
-
-    it "renders a jquery selector string of form field ids from given contents" do
-      expect(
-        helper.contents_form_field_ids_string([content_1, content_2])
-      ).to eq('#contents_content_1_body, #contents_content_2_body')
-    end
-  end
-
   it "should render the content name" do
     helper.render_content_name(element.content_by_type('EssenceText')).should == "Intro"
   end

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -18,10 +18,10 @@ describe Alchemy::Admin::NavigationHelper do
 
   let(:event_module) { {
     'navigation' => {
-      'controller' => 'admin/events',
+      'controller' => '/admin/events',
       'action' => 'index',
       'sub_navigation' => [{
-        'controller' => 'admin/events',
+        'controller' => '/admin/events',
         'action' => 'index'
       }]
     }
@@ -176,29 +176,38 @@ describe Alchemy::Admin::NavigationHelper do
   end
 
   describe '#url_for_module_sub_navigation' do
-    context "with module within an engine" do
-      let(:navigation) { alchemy_module['navigation']['sub_navigation'].first }
+    subject { helper.url_for_module_sub_navigation(navigation) }
 
-      before {
-        helper.stub(:module_definition_for).and_return(alchemy_module)
-      }
+    let(:current_module) { alchemy_module }
+    let(:navigation)     { current_module['navigation']['sub_navigation'].first }
+
+    before do
+      helper.stub(module_definition_for: current_module)
+    end
+
+    context "with module within an engine" do
+      let(:current_module) { alchemy_module }
 
       it "returns correct url string" do
-        helper.url_for_module_sub_navigation(navigation).should == '/admin/layoutpages'
+        should == '/admin/layoutpages'
       end
     end
 
     context "with module within host app" do
-      let(:navigation) { event_module['navigation']['sub_navigation'].first }
-
-      before {
-        helper.stub(:module_definition_for).and_return(event_module)
-      }
+      let(:current_module) { event_module }
 
       it "returns correct url string" do
-        helper.url_for_module_sub_navigation(navigation).should == '/admin/events'
+        should == '/admin/events'
       end
     end
+
+    context 'without module found' do
+      before do
+        helper.stub(module_definition_for: nil)
+      end
+
+      it { should be_nil }
+    end
   end
 
 end

data/spec/libraries/modules_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+module Alchemy
+  class ModulesTestController < ApplicationController
+    include Modules
+  end
+
+  describe Modules do
+    let(:controller)      { ModulesTestController.new }
+    let(:alchemy_modules) { YAML.load_file(File.expand_path('../../../config/alchemy/modules.yml', __FILE__)) }
+
+    describe '#module_definition_for' do
+      subject { controller.module_definition_for(name) }
+
+      let(:dashboard_module) { alchemy_modules.first }
+
+      context 'with a string given as name' do
+        let(:name) { 'dashboard' }
+
+        it "returns the module definition" do
+          should == dashboard_module
+        end
+      end
+
+      context 'with a hash given as name' do
+        let(:controller_name) { 'alchemy/admin/dashboard' }
+        let(:name)            { {controller: controller_name, action: 'index'} }
+
+        it "returns the module definition" do
+          should == dashboard_module
+        end
+
+        context 'with leading slash in controller name' do
+          let(:controller_name) { '/alchemy/admin/dashboard' }
+
+          it "returns the module definition" do
+            should == dashboard_module
+          end
+        end
+      end
+
+      context 'with nil given as name' do
+        let(:name) { nil }
+        it 'raises an error' do
+          expect { subject }.to raise_error('Could not find module definition for ')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -966,6 +966,7 @@ files:
 - spec/javascripts/spec.js
 - spec/libraries/config_spec.rb
 - spec/libraries/essence_spec.rb
+- spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
 - spec/libraries/page_layout_spec.rb
 - spec/libraries/resource_spec.rb
@@ -1145,7 +1146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 3
@@ -1257,6 +1258,7 @@ test_files:
 - spec/javascripts/spec.js
 - spec/libraries/config_spec.rb
 - spec/libraries/essence_spec.rb
+- spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
 - spec/libraries/page_layout_spec.rb
 - spec/libraries/resource_spec.rb