locomotive_cms 2.0.0.rc9 → 2.0.0.rc10

data/app/assets/stylesheets/locomotive/inline_editor/toolbar.css.scss

@@ -96,7 +96,7 @@
     .editing-mode {
       .toggleSwitch {
         position: relative;
-        top: 0px;
+        top: 5px;
         margin-left: 3px;
         display: inline-block;
 

data/app/assets/stylesheets/locomotive/shared/_helpers.css.scss

@@ -70,3 +70,101 @@
   color: #fff;
   @include single-text-shadow(rgba(0, 0, 0, 0.6), 0px, -1px, 0px);
 }
+
+@mixin tiny-buttons-group {
+  a.add {
+    @include gray-button;
+
+    padding-left: 10px;
+  }
+
+  a.edit, a.remove, a.toggle, a.drag {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+
+    position: relative;
+    top: 4px;
+
+    outline: none;
+    text-indent: -9999px;
+
+    &.edit {
+      background: transparent image-url("locomotive/list/icons/pencil_off.png") repeat 0 0;
+      &:hover {
+        background-image: image-url("locomotive/list/icons/pencil.png");
+      }
+    }
+
+    &.remove {
+      background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
+      &:hover {
+        background-image: image-url("locomotive/list/icons/trash.png");
+      }
+    }
+
+    &.toggle {
+      background: transparent image-url("locomotive/list/icons/toggle_off.png") repeat 0 0;
+      &:hover {
+        background-image: image-url("locomotive/list/icons/toggle.png");
+      }
+      &.open {
+        @include rotate(180deg);
+      }
+      @include single-transition(transform, 0.5s);
+    }
+
+    &.drag {
+      cursor: move;
+      background: transparent image-url("locomotive/list/icons/move_off.png") repeat 0 0;
+      &:hover {
+        background-image: image-url("locomotive/list/icons/move.png");
+      }
+    }
+  }
+}
+
+@mixin select-options-edit-style {
+  .list {
+    line-height: auto;
+
+    ul, li, > span.actions {
+      float: left;
+    }
+
+    ul {
+      width: 558px;
+      min-height: 34px;
+
+      li.entry {
+        background: #c2e0f0;
+        @include border-radius(2px);
+        @include box-shadow(rgba(0, 0, 0, 0.2) 0px 1px 0px 0px);
+
+        padding: 0 8px 0 8px;
+        margin: 2px 10px 8px 0;
+        height: auto;
+
+        color: #29739b;
+        line-height: 24px;
+
+        span.name {
+          cursor: pointer;
+          @include text-shadow(#fff 0px 1px 1px);
+        }
+
+        span.actions {
+          position: static;
+          margin-left: 8px;
+          line-height: 24px;
+        }
+      }
+    } // .list ul
+
+    > span.actions {
+      position: static;
+      margin-left: 15px;
+      line-height: 24px;
+    } // .list .actions
+  }
+}

data/app/assets/stylesheets/locomotive/shared/common.css.scss

@@ -31,4 +31,4 @@ p.no-items {
     @include hover-link;
     color: #ff2900;
   }
-}
+}

data/app/controllers/locomotive/current_site_controller.rb

@@ -11,6 +11,8 @@ module Locomotive
 
     before_filter :filter_attributes
 
+    before_filter :ensure_domains_list, :only => :update
+
     respond_to :json, :only => :update
 
     def edit
@@ -40,5 +42,9 @@ module Locomotive
       end
     end
 
+    def ensure_domains_list
+      params[:site][:domains] = [] unless params[:site][:domains]
+    end
+
   end
 end

data/app/helpers/locomotive/base_helper.rb

@@ -14,6 +14,20 @@ module Locomotive
       resource.persisted? && resource.errors.empty?
     end
 
+    # Execute the code only once during the request time. It avoids duplicated
+    # dom elements in the rendered rails page.
+    #
+    # @param [ String / Symbol ] label Unique identifier of the block
+    #
+    def required_once(label, &block)
+      symbol = :"@block_#{label.to_s.underscore}"
+
+      if instance_variable_get(symbol).blank?
+        yield
+        instance_variable_set(symbol, true)
+      end
+    end
+
     def submenu_entry(name, url, options = {}, &block)
       default_options = { :i18n => true, :css => name.dasherize.downcase }
       default_options.merge!(options)

data/app/models/locomotive/content_entry.rb

@@ -38,6 +38,13 @@ module Locomotive
     alias :_permalink :_slug
     alias :_permalink= :_slug=
 
+    # Any content entry owns a label property which is used in the back-office UI
+    # to represent it. The field used as the label is defined within the parent content type.
+    #
+    # @param [ Object ] (optional) The content type to avoid to run another MongoDB and useless query.
+    #
+    # @return [ String ] The "label" of the content entry
+    #
     def _label(type = nil)
       value = if self._label_field_name
         self.send(self._label_field_name.to_sym)
@@ -50,6 +57,11 @@ module Locomotive
 
     alias :to_label :_label
 
+    # Tells if the content entry has been translated or not.
+    # It just checks if the field used for the label has been translated.
+    #
+    # @return [ Boolean ] True if translated, false otherwise
+    #
     def translated?
       if self.respond_to?(:"#{self._label_field_name}_translations")
         self.send(:"#{self._label_field_name}_translations").key?(::Mongoid::Fields::I18n.locale.to_s) #rescue false
@@ -58,18 +70,37 @@ module Locomotive
       end
     end
 
+    # Return the next content entry based on the order defined in the parent content type.
+    #
+    # @param [ Object ] The next content entry or nil if not found
+    #
     def next
       next_or_previous :gt
     end
 
+    # Return the previous content entry based on the order defined in the parent content type.
+    #
+    # @param [ Object ] The previous content entry or nil if not found
+    #
     def previous
       next_or_previous :lt
     end
 
+    # Find a content entry by its permalink
+    #
+    # @param [ String ] The permalink
+    #
+    # @return [ Object ] The content entry matching the permalink or nil if not found
+    #
     def self.find_by_permalink(permalink)
       self.where(:_slug => permalink).first
     end
 
+    # Sort the content entries from an ordered array of content entry ids.
+    # Their new positions are persisted.
+    #
+    # @param [ Array ] The ordered array of ids
+    #
     def self.sort_entries!(ids)
       list = self.any_in(:_id => ids.map { |id| BSON::ObjectId.from_string(id.to_s) }).to_a
       ids.each_with_index do |id, position|
@@ -93,11 +124,19 @@ module Locomotive
 
     protected
 
+    # Retrieve the next or the previous entry following the order
+    # defined in the parent content type.
+    #
+    # @param [ Symbol ] :gt for the next element, :lt for the previous element
+    #
+    # @return [ Object ] The next or previous content entry or nil if none
+    #
     def next_or_previous(matcher = :gt)
-      order_by  = self.content_type.order_by_definition
-      criterion = :_position.send(matcher)
+      order_by  = self.content_type.order_by_definition(matcher == :lt)
+      criterion = self.content_type.order_by_attribute.to_sym.send(matcher)
+      value     = self.send(self.content_type.order_by_attribute.to_sym)
 
-      self.class.where(criterion => self._position).order_by([order_by]).limit(1).first
+      self.class.where(criterion => value).order_by([order_by]).limit(1).first
     end
 
     # Sets the slug of the instance by using the value of the highlighted field

data/app/models/locomotive/content_type.rb

@@ -50,8 +50,13 @@ module Locomotive
       self.order_by == '_position'
     end
 
-    def order_by_definition
+    def order_by_definition(reverse_order = false)
       direction = self.order_manually? ? 'asc' : self.order_direction || 'asc'
+
+      if reverse_order
+        direction = (direction == 'asc' ? 'desc' : 'asc')
+      end
+
       [order_by_attribute, direction]
     end
 

data/app/models/locomotive/editable_element.rb

@@ -75,6 +75,15 @@ module Locomotive
       self.locales << locale unless self.locales.include?(locale)
     end
 
+    # Set the content of the editable element with a default value
+    # only if the content has not already been modified by the user.
+    #
+    # @param [ String ] content The default content.
+    #
+    def content_from_default=(content)
+      # needs to be overridden for each kind of elements
+    end
+
     protected
 
     def _selector

data/app/models/locomotive/editable_short_text.rb

@@ -8,6 +8,7 @@ module Locomotive
     ## methods ##
 
     def content=(value)
+      return if value == self.content
       self.add_current_locale
       self.default_content = false unless self.new_record?
       super
@@ -17,6 +18,14 @@ module Locomotive
       !!self.default_content
     end
 
+    def content_from_default=(content)
+      if self.default_content?
+        self.content_will_change!
+        self.attributes['content'] ||= {}
+        self.attributes['content'][::Mongoid::Fields::I18n.locale.to_s] = content
+      end
+    end
+
     def copy_attributes_from(el)
       super(el)
 

data/app/models/locomotive/extensions/page/tree.rb

@@ -81,8 +81,8 @@ module Locomotive
         #
         # @return [ Array ] The children pages ordered by their position
         #
-        def children_with_minimal_attributes( attrs = [] )
-          self.children.minimal_attributes( attrs )
+        def children_with_minimal_attributes(attrs = [])
+          self.children.minimal_attributes(attrs)
         end
 
         # Assigns the new position of each child of this node.
@@ -115,8 +115,7 @@ module Locomotive
         end
 
         def persist_depth
-          self.attributes['depth'] = self.depth
-          self.depth_will_change!
+          self.depth = self.parent_ids.count
         end
 
       end

data/app/presenters/locomotive/content_entry_presenter.rb

@@ -1,7 +1,9 @@
 module Locomotive
   class ContentEntryPresenter < BasePresenter
 
-    delegate :_label, :_slug, :_position, :seo_title, :meta_keywords, :meta_description, :file_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields, :to => :source
+    delegate :_label, :_slug, :_position, :seo_title,
+      :meta_keywords, :meta_description, :select_custom_fields,
+      :file_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields, :to => :source
 
     # Lists of all the attributes editable thru the html form for instance
     #
@@ -31,7 +33,7 @@ module Locomotive
     end
 
     def included_methods
-      default_list = %w(_label _slug _position content_type_slug file_custom_fields has_many_custom_fields many_to_many_custom_fields safe_attributes)
+      default_list = %w(_label _slug _position content_type_slug select_custom_fields file_custom_fields has_many_custom_fields many_to_many_custom_fields safe_attributes)
       default_list << 'errors' if !!self.options[:include_errors]
       super + self.filtered_custom_fields_methods + default_list
     end

data/app/views/locomotive/content_entries/_form.html.haml

@@ -3,7 +3,8 @@
 
 - content_for :backbone_view_data do
   :plain
-    content_entry: #{j @content_entry.to_json.html_safe}
+    content_entry: #{j @content_entry.to_json.html_safe},
+    content_type: #{j @content_type.to_json.html_safe}
 
 = f.inputs :name => :attributes do
   - @content_type.ordered_entries_custom_fields.each_with_index do |field, index|

data/app/views/locomotive/custom_fields/_form.html.haml

@@ -30,7 +30,8 @@
       = g.select :type, options_for_custom_field_type, {}, { :class => 'type' }
 
     .required-input.col
-      = g.check_box :required, :class => 'required', :'data-on-label' => t('.required'), :'data-off-label' => t('.optional')
+      %span= t('.required')
+      = g.check_box :required, :class => 'required'
 
     %ol.nested{ :style => 'display: none' }
 
@@ -56,20 +57,5 @@
 
     .clear
 
-
-%script{ :type => 'text/html', :id => 'select_options_list' }
-
-  %ul{ :'data-prompt' => t('.select_options.ask_name') }
-
-  %span.actions
-    = link_to t('locomotive.buttons.new_item'), '#', :class => 'add'
-
-
-%script{ :type => 'text/html', :id => 'select_option_entry' }
-
-  %li.entry
-    %span.name {{name}}
-
-    %span.actions
-      = link_to 'drag', '#', :class => 'drag'
-      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
+/ Handlebar templates for managing the select options
+= render 'locomotive/custom_fields/select_templates'

data/app/views/locomotive/custom_fields/_select_templates.html.haml

@@ -0,0 +1,16 @@
+%script{ :type => 'text/html', :id => 'select_options_list' }
+
+  %ul{ :'data-prompt' => t('locomotive.custom_fields.form.select_options.ask_name') }
+
+  %span.actions
+    = link_to t('locomotive.buttons.new_item'), '#', :class => 'add'
+
+
+%script{ :type => 'text/html', :id => 'select_option_entry' }
+
+  %li.entry
+    %span.name {{name}}
+
+    %span.actions
+      = link_to 'drag', '#', :class => 'drag'
+      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/custom_fields/types/_has_many.html.haml

@@ -47,7 +47,7 @@
         %span.new-section= t('locomotive.content_entries.new.title', :type => name.capitalize).html_safe
         %span.edit-section= t('locomotive.content_entries.edit.title', :type => name.capitalize).html_safe
 
-      = semantic_form_for new_target_content_entry, :as => :content_entry, :url => content_entries_url(target_content_type.slug), :html => { :multipart => true } do |form|
+      = semantic_form_for new_target_content_entry, :as => :content_entry, :url => content_entries_url(target_content_type.slug), :html => { :multipart => true, :data => { :sending_form_message => t('locomotive.messages.sending_form') } } do |form|
 
         = form.inputs :name => :attributes do
           - target_content_type.ordered_entries_custom_fields.each_with_index do |_field, index|
@@ -65,6 +65,6 @@
         = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
 
         .button-wrapper
-          %span.new-section= submit_tag t('locomotive.shared.form_actions.create')
-          %span.edit-section= submit_tag t('locomotive.shared.form_actions.update')
+          %span.new-section= submit_tag t('locomotive.shared.form_actions.create'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
+          %span.edit-section= submit_tag t('locomotive.shared.form_actions.update'), :'data-disable-with' => t('locomotive.shared.form_actions.disable_with')
 

data/app/views/locomotive/custom_fields/types/_select.html.haml

@@ -2,4 +2,33 @@
   :label      => field.label,
   :hint       => field.hint,
   :as         => :select,
-  :collection => field.ordered_select_options.map { |option| [option.name, option.id] }
+  :collection => field.ordered_select_options.map { |option| [option.name, option.id] }
+
+- content_for :head do
+
+  - required_once :select_options do
+
+    / Handlebar templates for managing the select options
+    = render 'locomotive/custom_fields/select_templates'
+
+    %script{ :type => 'text/html', :id => 'edit_select_options_button' }
+      = link_to t('locomotive.content_entries.form.edit_select_options'), '#', :class => 'edit-options-button'
+
+
+- content_for :foot do
+
+  - required_once :select_options_popup do
+
+    / Handlebar template for the popup
+    %div{ :id => 'edit-select-option-entries', :style => 'display: none' }
+
+      %h2
+        = t('.manage_select_options_entries')
+
+      .placeholder{ :data => { :sending_form_message => t('locomotive.messages.sending_form') } }
+
+      .dialog-actions
+        = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
+
+        .button-wrapper
+          = submit_tag t('locomotive.shared.form_actions.update'), { :data => { :disable_with => t('locomotive.shared.form_actions.disable_with') } }