alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

data/app/helpers/alchemy/pages_helper.rb

@@ -367,7 +367,7 @@ module Alchemy
       )
       if @page.contains_feed?
         meta_string += %(
-          <link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, protocol: 'feed', format: :rss)}">
+          <link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, format: :rss)}">
         )
       end
       return meta_string.html_safe

data/app/models/alchemy/element.rb

@@ -193,12 +193,13 @@ module Alchemy
     #
     def content_for_rss_title
       rss_title = content_descriptions.detect { |c| c['rss_title'] }
+      return if rss_title.blank?
       contents.find_by_name(rss_title['name'])
     end
 
-    # Returns the content that is marked as rss definition.
+    # Returns the content that is marked as rss description.
     #
-    # Mark a content as rss definition in your +elements.yml+ file:
+    # Mark a content as rss description in your +elements.yml+ file:
     #
     #   - name: news
     #     contents:
@@ -207,8 +208,9 @@ module Alchemy
     #       rss_description: true
     #
     def content_for_rss_description
-      rss_title = content_descriptions.detect { |c| c['rss_description'] }
-      contents.find_by_name(rss_title['name'])
+      rss_description = content_descriptions.detect { |c| c['rss_description'] }
+      return if rss_description.blank?
+      contents.find_by_name(rss_description['name'])
     end
 
     # Returns the array with the hashes for all element contents in the elements.yml file

data/app/models/alchemy/legacy_page_url.rb

@@ -12,5 +12,9 @@
 class Alchemy::LegacyPageUrl < ActiveRecord::Base
   belongs_to :page, class_name: 'Alchemy::Page'
 
-  validates_presence_of [:urlname, :page_id]
+  validates :page_id,
+    presence: true
+  validates :urlname,
+    presence: true,
+    format: {with: /\A[:\.\w\-+_\/\?&%;=]*\z/}
 end

data/app/models/alchemy/message.rb

@@ -28,10 +28,10 @@ module Alchemy
       validates_presence_of field
 
       case field.to_sym
-      when :email
+      when /email/
         validates_format_of field,
           with: Alchemy::Config.get('format_matchers')['email'],
-          if: -> { email.present? }
+          if: -> { send(field).present? }
       when :email_confirmation
         validates_confirmation_of :email
       end

data/app/models/alchemy/page.rb

@@ -30,6 +30,7 @@
 #  updater_id       :integer
 #  language_id      :integer
 #  cached_tag_list  :text
+#  published_at     :datetime
 #
 
 module Alchemy
@@ -69,10 +70,8 @@ module Alchemy
     stampable stamper_class_name: Alchemy.user_class_name
 
     has_many :folded_pages
-
     has_many :legacy_urls, :class_name => 'Alchemy::LegacyPageUrl'
     belongs_to :language
-    belongs_to :locker, class_name: Alchemy.user_class_name, foreign_key: 'locked_by'
 
     validates_presence_of :language, :on => :create, :unless => :root
     validates_presence_of :page_layout, :unless => :systempage?
@@ -89,12 +88,12 @@ module Alchemy
     after_update :create_legacy_url, if: :urlname_changed?, unless: :redirects_to_external?
 
     # Concerns
-    include Alchemy::Page::Scopes
-    include Alchemy::Page::Natures
-    include Alchemy::Page::Naming
-    include Alchemy::Page::Users
-    include Alchemy::Page::Cells
-    include Alchemy::Page::Elements
+    include Alchemy::Page::PageScopes
+    include Alchemy::Page::PageNatures
+    include Alchemy::Page::PageNaming
+    include Alchemy::Page::PageUsers
+    include Alchemy::Page::PageCells
+    include Alchemy::Page::PageElements
 
     # Class methods
     #
@@ -356,7 +355,7 @@ module Alchemy
         .where(["#{self.class.table_name}.lft #{dir} ?", lft])
         .where(public: options[:public])
         .where(restricted: options[:restricted])
-        .order(dir == '>' ? 'lft' : 'lft DESC')
+        .reorder(dir == '>' ? 'lft' : 'lft DESC')
         .limit(1).first
     end
 

data/app/models/alchemy/page/{cells.rb → page_cells.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Cells
+  module Page::PageCells
 
     extend ActiveSupport::Concern
 

data/app/models/alchemy/page/{elements.rb → page_elements.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Elements
+  module Page::PageElements
 
     extend ActiveSupport::Concern
 

data/app/models/alchemy/page/{naming.rb → page_naming.rb}

@@ -1,28 +1,30 @@
 module Alchemy
-  module Page::Naming
+  module Page::PageNaming
 
     extend ActiveSupport::Concern
     include NameConversions
     RESERVED_URLNAMES = %w(admin messages new)
 
     included do
-      before_validation :set_urlname, :if => :renamed?, :unless => proc { systempage? || redirects_to_external? || name.blank? }
+      before_validation :set_urlname,
+        if: :renamed?,
+        unless: -> { systempage? || redirects_to_external? || name.blank? }
 
-      validates_presence_of :name
-      validates_length_of :urlname, :minimum => 3, :if => 'urlname.present?'
-      validates_uniqueness_of(
-        :urlname,
-        :scope => [:language_id, :layoutpage],
-        :if => 'urlname.present?'
-      )
-      validates :urlname, :exclusion => {:in => RESERVED_URLNAMES}
+      validates :name,
+        presence: true
+      validates :urlname,
+        uniqueness: {scope: [:language_id, :layoutpage], if: 'urlname.present?'},
+        exclusion:  {in: RESERVED_URLNAMES},
+        length:     {minimum: 3, if: 'urlname.present?'},
+        format:     {with: /\A[:\.\w\-+_\/\?&%;=]*\z/, if: :redirects_to_external?},
+        presence:   {if: :redirects_to_external?}
 
       before_save :set_title, :if => 'title.blank?', :unless => proc { systempage? || redirects_to_external? }
-      after_update(:if => proc { Config.get(:url_nesting) && (urlname_changed? || visible_changed?) }) do
-        self.reload
-        self.descendants.map(&:update_urlname!)
-      end
-      after_move :update_urlname!, :if => proc { Config.get(:url_nesting) }
+      after_update :update_descendants_urlnames,
+        if: -> { Config.get(:url_nesting) && (urlname_changed? || visible_changed?) }
+      after_move :update_urlname!,
+        if: -> { Config.get(:url_nesting) },
+        unless: :redirects_to_external?
     end
 
     # Returns true if name or urlname has changed.
@@ -37,8 +39,8 @@ module Alchemy
       new_urlname = (names << slug).join('/')
       if urlname != new_urlname
         legacy_urls.create(urlname: urlname)
+        update_column(:urlname, new_urlname)
       end
-      update_column(:urlname, new_urlname)
     end
 
     # Returns always the last part of a urlname path
@@ -46,7 +48,21 @@ module Alchemy
       urlname.to_s.split('/').last
     end
 
-  private
+    # Returns an urlname prefixed with http://, if no protocol is given
+    def external_urlname
+      return urlname if urlname =~ /\A(\/|[a-z]+:\/\/)/
+      "http://#{urlname}"
+    end
+
+    private
+
+    def update_descendants_urlnames
+      self.reload
+      descendants.each do |descendant|
+        next if descendant.redirects_to_external?
+        descendant.update_urlname!
+      end
+    end
 
     # Sets the urlname to a url friendly slug.
     # Either from name, or if present, from urlname.
@@ -80,6 +96,5 @@ module Alchemy
         url_name
       end
     end
-
   end
 end

data/app/models/alchemy/page/{natures.rb → page_natures.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Natures
+  module Page::PageNatures
 
     extend ActiveSupport::Concern
 

data/app/models/alchemy/page/{scopes.rb → page_scopes.rb}

@@ -2,7 +2,7 @@ module Alchemy
 
   # ActiveRecord scopes for Alchemy::Page
   #
-  module Page::Scopes
+  module Page::PageScopes
     extend ActiveSupport::Concern
 
     included do

data/app/models/alchemy/page/{users.rb → page_users.rb}

@@ -1,7 +1,19 @@
 module Alchemy
-  module Page::Users
+  module Page::PageUsers
     extend ActiveSupport::Concern
 
+    def creator
+      Alchemy.user_class.try(:find, creator_id)
+    end
+
+    def updater
+      Alchemy.user_class.try(:find, updater_id)
+    end
+
+    def locker
+      Alchemy.user_class.try(:find, locked_by)
+    end
+
     # Returns the name of the creator of this page.
     #
     # If no creator could be found or associated user model

data/app/views/alchemy/admin/elements/_add_element_button.html.erb

@@ -0,0 +1,18 @@
+<%= link_to_dialog new_admin_element_path(
+    page_id: @page.id,
+    insert_after: local_assigns[:element_before].try(:id)
+  ),
+  {
+    title: _t("New Element"),
+    size: '320x125'
+  },
+  {
+    class: "#{local_assigns[:expanded] ? 'expanded ' : ''}insert-element-button",
+    id: local_assigns[:id],
+    title: _t("New Element")
+  } do %>
+  <%= render_icon 'create' %>
+  <label>
+    <%= _t('New Element') %>
+  </label>
+<% end %>

data/app/views/alchemy/admin/elements/_add_picture.html.erb

@@ -7,7 +7,7 @@
     ),
     {
       title: _t(:add_image_to_element),
-      size: '780x585',
+      size: '780x580',
       padding: false
     }
   ) %>

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -1,23 +1,24 @@
 <div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
-  <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
-  <% if !element.folded? %>
-    <%= form_for [:admin, element], :remote => true, :html => {:id => "element_#{element.id}_form"} do |f| %>
+  <%= form_for [:admin, element], remote: true, html: {id: "element_#{element.id}_form"} do |f| %>
+    <%= render 'alchemy/admin/elements/element_head', element: element %>
+    <% unless element.folded? %>
       <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
       <div id="element_<%= element.id %>_content" class="element_content">
         <%= render_editor(element) %>
       </div>
       <% if element.has_validations? %>
-      <p class="validation_notice">
-        <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
-      </p>
+        <p class="validation_notice">
+          <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
+        </p>
       <% end %>
       <% if element.taggable? %>
-      <div class="autocomplete_tag_list">
-        <%= f.label :tag_list %>
-        <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-      </div>
+        <div class="autocomplete_tag_list">
+          <%= f.label :tag_list %>
+          <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+        </div>
       <% end %>
-      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element, :f => f} %>
+      <%= render 'alchemy/admin/elements/element_foot', element: element, f: f %>
     <% end %>
   <% end %>
+  <%= render 'alchemy/admin/elements/add_element_button', element_before: element %>
 </div>

data/app/views/alchemy/admin/elements/_new_element_form.html.erb

@@ -5,6 +5,9 @@
   </div>
 <%- else -%>
   <%= alchemy_form_for [:admin, @element] do |form| %>
+    <% if params[:insert_after].present? %>
+      <%= hidden_field_tag :insert_after, params[:insert_after] %>
+    <% end %>
     <%= form.hidden_field :page_id %>
   <%- if @page.can_have_cells? -%>
     <%= form.input :name,

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

@@ -16,10 +16,10 @@
 
   $element_area = $('#cell_<%= @cell_name %>');
 
-<%- if @insert_at_top -%>
-  $element_area.prepend(element_html);
+<%- if @element_before -%>
+  $('#element_<%= @element_before.id %>').after(element_html);
 <%- else -%>
-  $element_area.append(element_html);
+  $('#insert_element_top').after(element_html).removeClass('expanded');
 <%- end -%>
 
   if ($element_area.find('.element_editor').length > 0) {

data/app/views/alchemy/admin/elements/index.html.erb

@@ -5,22 +5,37 @@
       <% @elements.each do |cell, elements| %>
         <li>
           <a href="#cell_<%= cell.name %>">
-            <%= _t(cell.name, :scope => :cell_names) %>
+            <%= _t(cell.name, scope: 'cell_names') %>
           </a>
         </li>
       <% end %>
     </ul>
     <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
-      <%= render :partial => 'alchemy/admin/elements/element', :collection => @page.elements.not_trashed.not_in_cell, :locals => {:draggable => true} %>
+      <%= render 'add_element_button',
+        expanded: @page.elements.not_trashed.not_in_cell.empty?,
+        id: 'insert_element_top' %>
+      <%= render partial: 'alchemy/admin/elements/element',
+        collection: @page.elements.not_trashed.not_in_cell,
+        locals: {draggable: true} %>
     </div>
     <% @elements.each do |cell, elements| -%>
       <div id="cell_<%= cell.name %>" class="sortable_cell <%= cell.name %>_cell" data-cell-id="<%= cell.id %>">
-        <%= render :partial => 'alchemy/admin/elements/element', :collection => elements, :locals => {:draggable => true} %>
+        <%= render 'add_element_button',
+          expanded: elements.empty?,
+          id: 'insert_element_top' %>
+        <%= render partial: 'alchemy/admin/elements/element',
+          collection: elements,
+          locals: {draggable: true} %>
       </div>
     <% end %>
   </div>
 <% else %>
   <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements">
-    <%= render :partial => 'alchemy/admin/elements/element', :collection => @elements, :locals => {:draggable => true} %>
+    <%= render 'add_element_button',
+      expanded: @elements.empty?,
+      id: 'insert_element_top' %>
+    <%= render partial: 'alchemy/admin/elements/element',
+      collection: @elements,
+      locals: {draggable: true} %>
   </div>
 <% end %>

data/app/views/alchemy/admin/elements/new.html.erb

@@ -11,6 +11,9 @@
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
+      <% if params[:insert_after].present? %>
+        <%= hidden_field_tag :insert_after, params[:insert_after] %>
+      <% end %>
       <%= f.hidden_field(:page_id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= _t("Element") %></label>

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

@@ -1,12 +1,16 @@
-$('#element_<%= @element.id %>').hide(200, function() {
-  $(this).remove();
-  Alchemy.growl('<%= j _t("Element trashed") %>');
-  $('#element_area .sortable_cell').sortable('refresh');
-  Alchemy.TrashWindow.refresh();
-  $('#element_trash_button .icon').addClass('full');
-  Alchemy.PreviewWindow.refresh();
-  <% @element.contents.essence_richtexts.each do |content| %>
-  tinymce.get('contents_content_<%= content.id %>_body').remove();
-  <% end %>
-  <%= update_essence_select_elements(@page, @element) -%>
-});
+(function() {
+  var $el = $('#element_<%= @element.id %>');
+  var $parent = $el.parent();
+  $el.hide(200, function() {
+    $(this).remove();
+    Alchemy.growl('<%= j _t("Element trashed") %>');
+    $('#element_area .sortable_cell').sortable('refresh');
+    Alchemy.TrashWindow.refresh();
+    $('#element_trash_button .icon').addClass('full');
+    Alchemy.PreviewWindow.refresh();
+    <%= update_essence_select_elements(@page, @element) -%>
+    if ($parent.find('.element_editor').length === 0) {
+      $('#insert_element_top').addClass('expanded');
+    }
+  });
+})();

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

@@ -7,7 +7,7 @@
       <%- if can?(:configure, layoutpage) -%>
       <%= link_to_dialog(
         render_icon('configure_page'),
-        alchemy.configure_admin_page_path(layoutpage),
+        alchemy.edit_admin_layoutpage_path(layoutpage),
         {
           title: _t(:edit_page_properties),
           size: '410x170'

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

@@ -0,0 +1,11 @@
+<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.input :name, autofocus: true %>
+  <% if @page.taggable? %>
+    <div class="input string">
+      <%= f.label :tag_list %>
+      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+    </div>
+  <% end %>
+  <%= f.submit _t(:save) %>
+<% end %>