locomotive_cms 2.1.4 → 2.2.0

data/app/assets/javascripts/locomotive/views/pages/list_view.js.coffee

@@ -34,7 +34,7 @@ class Locomotive.Views.Pages.ListView extends Backbone.View
       error:      @.on_failed_sort
 
   on_successful_sort: (data, status, xhr) ->
-    $.growl('success', xhr.getResponseHeader('X-Message'))
+    $.growl('success', decodeURIComponent $.parseJSON xhr.getResponseHeader('X-Message'))
 
   on_failed_sort: (data, status, xhr) ->
-    $.growl('error', xhr.getResponseHeader('X-Message'))
+    $.growl('error', decodeURIComponent $.parseJSON xhr.getResponseHeader('X-Message'))

data/app/assets/javascripts/locomotive/views/shared/fields/belongs_to_view.js.coffee

@@ -0,0 +1,32 @@
+Locomotive.Views.Shared ||= {}
+Locomotive.Views.Shared.Fields ||= {}
+
+class Locomotive.Views.Shared.Fields.BelongsToView extends Backbone.View
+
+  render: ->
+    @enable_select2()
+
+    return @
+
+  enable_select2: ->
+    options = $(@el).data()
+
+    $(@el).select2
+      width:                '50%'
+      minimumInputLength:   1
+      quietMillis:          100
+      ajax:
+        url: options.url
+        data: (term, page) ->
+          q:    term
+          page: page
+        results: (data, page) ->
+          results:  data.map (item) -> { id: item._id, text: item._label || '' }
+          more:     data.length == options.perPage
+
+      initSelection: (el, callback) -> callback(id: el.val(), text: options.value)
+
+    $(@el).on 'select2-selecting', (el) =>
+      @model.set "#{@options.name}_id", el.val
+
+

data/app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee

@@ -26,7 +26,7 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
     @build_target_entry_view()
 
   render: ->
-    $(@el).html(@template()())
+    $(@el).html(@template()()).attr('id', "#{@model.paramRoot}_#{@options.name}")
 
     @insert_entries()
 
@@ -101,7 +101,7 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
   remove_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm($(event.target).data('confirm'))
+    if confirm($(event.target).closest('a').data('confirm'))
       entry = @get_entry_from_element($(event.target))
       entry.set _destroy: true
 

data/app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee

@@ -25,7 +25,7 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
     @all_entries  = @options.all_entries
 
   render: ->
-    $(@el).html(@template()())
+    $(@el).html(@template()()).attr('id', "#{@model.paramRoot}_#{@options.name}_ids")
 
     @insert_entries()
 
@@ -80,7 +80,7 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
   remove_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm($(event.target).data('confirm'))
+    if confirm($(event.target).closest('a').data('confirm'))
       entry = @get_entry_from_element($(event.target))
       @collection.remove(entry)
 

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -44,6 +44,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     xhr.success (model, response, _options) =>
       form.trigger('ajax:complete')
 
+      @model.set(previous_attributes)
       model.attributes = previous_attributes
 
       options.on_success(model, xhr) if options.on_success
@@ -116,6 +117,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
 
     input = @$("##{prefix}#{@model.paramRoot}_#{attribute}")
     input = @$("##{prefix}#{@model.paramRoot}_#{attribute}_id") if input.size() == 0
+    input = @$("##{prefix}#{@model.paramRoot}_#{attribute}_ids") if input.size() == 0
 
     return unless input.size() > 0
 

data/app/assets/javascripts/locomotive/views/snippets/_form_view.js.coffee

@@ -72,7 +72,8 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
       passDelay:        50
       tabMode:          'shift'
       theme:            'default medium'
-      onChange: (editor) => @model.set(template: editor.getValue())
+
+    @editor.on 'change', (editor, change) => @model.set(template: editor.getValue())
 
   after_inputs_fold: ->
     @editor.refresh()

data/app/assets/javascripts/locomotive/views/theme_assets/_form_view.js.coffee

@@ -94,7 +94,8 @@ class Locomotive.Views.ThemeAssets.FormView extends Locomotive.Views.Shared.Form
       passDelay:        50
       tabMode:          'shift'
       theme:            'default'
-      onChange: (editor) => @model.set(plain_text: editor.getValue())
+
+    @editor.on 'change', (editor, change) => @model.set(plain_text: editor.getValue())
 
   bind_source_mode: ->
     @$('#theme_asset_plain_text_type').bind 'change', (event) =>

data/app/assets/javascripts/locomotive/views/theme_assets/index_view.js.coffee

@@ -49,7 +49,6 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
           headers:  { 'X-Flash': true }
 
   insert_asset: (model) ->
-    window.foo = model
     list_view = @pick_list_view(model.get('content_type'))
     list_view.collection.add(model) if list_view?
 

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/es.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('es.locomotive_media',{"image_desc": "Inserte los medios de comunicación"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/et.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('et.locomotive_media',{"image_desc": "Sisesta meedia"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/it.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('it.locomotive_media',{"image_desc": "Inserire un supporto"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/ja.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('ja.locomotive_media',{"image_desc": "メディアを挿入"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/nb.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('nb.locomotive_media',{"image_desc": "Sett inn media"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/nl.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('nl.locomotive_media',{"image_desc": "Steek media"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/no.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('no.locomotive_media',{"image_desc": "Sett inn media"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/pl.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('pl.locomotive_media',{"image_desc": "Włóż nośnik"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/pt.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('pt.locomotive_media',{"image_desc": "Insira a mídia"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/zh-cn.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('zh-cn.locomotive_media',{"image_desc": "插入媒体"});

data/app/assets/stylesheets/locomotive.css

@@ -8,6 +8,7 @@
  *= require locomotive/jquery.tagit.css
  *= require locomotive/font-awesome
  *= require formtastic
+ *= require select2/select2.css
  *= require codemirror
  *= require codemirror/themes/neat
  *= require locomotive/toggle.css

data/app/assets/stylesheets/locomotive/backoffice/codemirror_changes.css.scss

@@ -11,6 +11,8 @@
   font-weight: normal;
   line-height: 15px;
 
+  height: 400px;
+
   @include background-image(linear-gradient(top, #f0f0f0, #f9f9f9 4px, #f9f9f9 4px, #ffffff 12px, #ffffff));
 
   .medium {

data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss

@@ -231,7 +231,7 @@ form.formtastic {
           }
         } // div.inline-errors
 
-        &.string, &.password, &.numeric {
+        &.string, &.password, &.numeric, &.select2 {
           label {
             padding-top: 2px;
           }
@@ -264,10 +264,10 @@ form.formtastic {
 
         &.text {
 
-          &.short textarea {
+          textarea {
             padding: 5px;
-            height: 28px;
             width: 696px;
+            height: auto;
             overflow-y: hidden;
           }
 
@@ -281,6 +281,20 @@ form.formtastic {
           }
         } // li.select_with_edit
 
+        &.select2 {
+
+          a.select2-choice {
+            @include default-input-style;
+            padding: 0px 4px;
+            @include border-radius(0px);
+
+            & > div {
+              @include border-radius(0px);
+            }
+          }
+
+        } // li.select2
+
         &.locale, &.locales {
           .list {
             margin-left: 150px;

data/app/controllers/locomotive/content_entries_controller.rb

@@ -13,13 +13,17 @@ module Locomotive
 
     before_filter :authorize_content
 
-    respond_to :json, only: [:show, :edit, :create, :update, :sort]
+    respond_to :json, only: [:index, :show, :edit, :create, :update, :sort]
 
     respond_to :csv,  only: [:export]
 
     def index
       options = { page: params[:page] || 1, per_page: Locomotive.config.ui[:per_page] }
-      @content_entries = @content_type.list_or_group_entries(options)
+      @content_entries = if params[:q]
+        @content_type.ordered_entries(options.merge(q: params[:q]))
+      else
+        @content_type.list_or_group_entries(options)
+      end
       respond_with @content_entries
     end
 

data/app/controllers/locomotive/public/content_entries_controller.rb

@@ -4,6 +4,8 @@ module Locomotive
 
       include Locomotive::Render
 
+      before_filter :set_locale
+
       before_filter :set_content_type
 
       before_filter :sanitize_entry_params, only: :create
@@ -21,6 +23,10 @@ module Locomotive
 
       protected
 
+      def set_locale
+        ::I18n.locale = params[:locale] || current_site.default_locale
+      end
+
       def set_content_type
         @content_type = current_site.content_types.where(slug: params[:slug]).first
 

data/app/helpers/locomotive/base_helper.rb

@@ -192,5 +192,13 @@ module Locomotive
       current_site.localized? && current_content_locale.to_s != current_site.default_locale.to_s
     end
 
+    def localize(object, options = nil)
+      if respond_to?(:current_site) && current_site && object.respond_to?(:in_time_zone)
+        object = object.in_time_zone(current_site.timezone)
+      end
+      I18n.localize(object, options)
+    end
+    alias :l :localize
+
   end
 end

data/app/helpers/locomotive/sites_helper.rb

@@ -10,6 +10,12 @@ module Locomotive
         [I18n.t("locomotive.locales.#{locale}"), locale]
       end
     end
+    
+    def options_for_site_timezones
+      ActiveSupport::TimeZone.all.map do |tz|
+        [tz, tz.name]
+      end
+    end
 
   end
 end

data/app/models/locomotive/content_entry.rb

@@ -9,13 +9,14 @@ module Locomotive
     include Extensions::ContentEntry::Csv
 
     ## fields ##
-    field :_slug
+    field :_slug,             localize: true
     field :_label_field_name
     field :_position,         type: Integer, default: 0
     field :_visible,          type: Boolean, default: true
 
     ## validations ##
-    validates :_slug, presence: true, uniqueness: { scope: :content_type_id }
+    validates_presence_of     :_slug
+    validates_uniqueness_of   :_slug, scope: :content_type_id, allow_blank: true
 
     ## associations ##
     belongs_to  :site,          class_name: 'Locomotive::Site'
@@ -60,6 +61,7 @@ module Locomotive
 
     # Tell if the content entry has been translated or not.
     # It just checks if the field used for the label has been translated.
+    # It assumes the entry is localized.
     #
     # @return [ Boolean ] True if translated, false otherwise
     #
@@ -76,13 +78,22 @@ module Locomotive
     # @return [ Array ] The list of locales. Nil if not localized
     #
     def translated_in
-      if self.respond_to?(:"#{self._label_field_name}_translations")
+      if self.localized?
         self.send(:"#{self._label_field_name}_translations").keys
       else
         nil
       end
     end
 
+    # Tell if the entry is localized or not, meaning if the label field
+    # is localized or not.
+    #
+    # @return [ Boolean ] True if localized, false otherwise
+    #
+    def localized?
+      self.respond_to?(:"#{self._label_field_name}_translations")
+    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
@@ -158,7 +169,7 @@ module Locomotive
       self.class.where(criterion => value).order_by(:order_by.asc).limit(1).first
     end
 
-    # Sets the slug of the instance by using the value of the highlighted field
+    # Set the slug of the instance by using the value of the highlighted field
     # (if available). If a sibling content instance has the same permalink then a
     # unique one will be generated
     def set_slug
@@ -168,6 +179,23 @@ module Locomotive
         self._slug.permalink!
         self._slug = self.next_unique_slug if self.slug_already_taken?
       end
+
+      # all the site locales share the same slug ONLY IF the entry is not localized.
+      self.set_same_slug_for_all_site_locales if !self.localized?
+    end
+
+    # For each locale of the site, we set the slug
+    # coming from the value for the default locale.
+    def set_same_slug_for_all_site_locales
+      return unless self.set_site.localized?
+
+      default_slug = self._slug
+
+      self.set_site.locales.each do |locale|
+        ::Mongoid::Fields::I18n.with_locale(locale) do
+          self._slug = default_slug
+        end
+      end
     end
 
     # Return the next available unique slug as a string
@@ -199,7 +227,9 @@ module Locomotive
     end
 
     def add_to_list_bottom
-      self._position = self.class.max(:_position).to_i + 1
+      unless self.class.empty?
+        self._position = self.class.max(:_position).to_i + 1
+      end
     end
 
     def send_notifications

data/app/models/locomotive/content_type.rb

@@ -67,9 +67,31 @@ module Locomotive
       [order_by_attribute, direction]
     end
 
-    def ordered_entries(conditions = {})
-      _order_by_definition = (conditions || {}).delete(:order_by).try(:split) || self.order_by_definition
-      self.entries.order_by([_order_by_definition]).where(conditions)
+    # Order the list of entries, paginate it if requested
+    # and filter it.
+    #
+    # @param [ Hash ] options Options to filter and paginate.
+    #
+    # @return [ Criteria ] A Mongoid criteria if not paginated (array otherwise).
+    #
+    def ordered_entries(options = nil)
+      options ||= {}
+
+      page, per_page = options.delete(:page), options.delete(:per_page)
+
+      # search for a label
+      if options[:q]
+        options[label_field_name.to_sym] = /#{options.delete(:q)}/i
+      end
+
+      # order list
+      _order_by_definition = (options || {}).delete(:order_by).try(:split) || self.order_by_definition
+
+      # get list
+      _entries = self.entries.order_by([_order_by_definition]).where(options)
+
+      # pagination or full list
+      page ? _entries.page(page).per(per_page) : _entries
     end
 
     def groupable?
@@ -88,11 +110,7 @@ module Locomotive
           group_by_belongs_to_field(self.group_by_field)
         end
       else
-        if options[:page].nil?
-          self.ordered_entries
-        else
-          self.ordered_entries.page(options[:page]).per(options[:per_page])
-        end
+        self.ordered_entries(options)
       end
     end
 

data/app/models/locomotive/editable_element.rb

@@ -70,7 +70,7 @@ module Locomotive
     end
 
     # Copy attributes from an existing editable element coming
-    # from the parent page. Each editable element may or not
+    # from the parent page. Each type of an editable element may or not
     # override this method. The source element is a new record.
     #
     # @param [ EditableElement] el The source element
@@ -80,6 +80,20 @@ module Locomotive
       self.from_parent  = true
     end
 
+    # Copy the default attributes: _type, hint, fixed, priority and locales
+    # from an existing editable element coming from the parent page.
+    # Each type of an editable element may or not override this method for
+    # options for instance.
+    #
+    # @param [ EditableElement] el The source element
+    #
+    def copy_default_attributes_from(el)
+      # only the type, hint and fixed properties can be modified from the element
+      %w(_type hint fixed priority locales).each do |attr|
+        self.send(:"#{attr}=", el.send(attr.to_sym))
+      end
+    end
+
     # Set the default content from an existing editable element coming
     # from the parent page. Each editable element may or not
     # override this method. The source element is an existing record.