locomotive_cms 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5296380d468cf4e5522e01268698e14df1be493
-  data.tar.gz: f55fa2c7671c33d05b6d93c12cd6a33034b69b61
+  metadata.gz: 2213955e65720bed32b9918ab1d4ec4bd270c7cc
+  data.tar.gz: 621fef84725a59a1c6f53163e9f51e2231477845
 SHA512:
-  metadata.gz: 3c1bfd20751c88557fe805ba6b3e2292c4c9f03c71e8034f5cb6cd3ad5f2120b830b9fedcdb03eda475b34c97b6fc752d93cefd9f5c4f09286d9a392b33bc295
-  data.tar.gz: 7db9d6cb249af95f012abb14833df09945373194d487515c84a879611ed3605707992069a4011ab8bf3a3a13bfb173c3a24c90c3485c735ca5a629ea06e0a585
+  metadata.gz: 605e58bc0eecf723829454e04fda1b2061df9762b99d7e51142be34072b7641a32f947c8d462f17aaa488f86f267175ea7fb876f1522736003be987cf2cb43a2
+  data.tar.gz: 305ea2476b38f3309272d24a9cb055f66781bd76b22da0c36417122b7e8f4c0ac1a9bd1d7af1c600d35bb1beccb23f23e7256bced8821d2b0fc9820a8e995698

data/app/assets/javascripts/locomotive/models/content_entry.js.coffee

@@ -29,6 +29,10 @@ class Locomotive.Models.ContentEntry extends Backbone.Model
       @set_attribute attribute, attributes[attribute]
       @set_attribute "remove_#{field}", false
 
+  reset_attributes: ->
+    _.each _.keys(@attributes), (name) =>
+      @set_attribute name, null
+
   toMinJSON: ->
     _.tap {}, (hash) =>
       _.each @attributes, (val, key) =>

data/app/assets/javascripts/locomotive/views/content_assets/picker_view.js.coffee

@@ -20,8 +20,6 @@ class Locomotive.Views.ContentAssets.PickerView extends Locomotive.Views.Shared.
   build_uploader: (el, link) ->
     link.bind 'click', (event) ->
       event.stopPropagation() & event.preventDefault()
-      console.log(el)
-      window.foo = el
       el.click()
 
     el.bind 'change', (event) =>

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

@@ -159,7 +159,7 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
   refresh: ->
     @$('li.input.toggle input[type=checkbox]').checkToggle('sync')
-    _.each @_file_field_views, (view) => view.refresh()
+    @refresh_file_fields()
 
   reset: ->
     @$('li.input.string input[type=text], li.input.text textarea, li.input.date input[type=text]').val('').trigger('change')

data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee

@@ -15,6 +15,8 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     return @
 
   save: (event) ->
+    @touch_richtexteditor()
+
     @save_in_ajax event,
       headers:  { 'X-Flash': true }
       on_success: (response, xhr) =>
@@ -70,6 +72,7 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     $(@el).dialog('option', 'position', 'center')
 
   reset: (entry) =>
+    @model.reset_attributes()
     @model.set entry.attributes
 
     if entry.isNew()
@@ -87,5 +90,9 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
   enable_many_to_many_fields: ->
     # disabled in a popup form
 
+  touch_richtexteditor: ->
+    _.each @$('li.input.rte textarea.html'), (textarea) =>
+      $(textarea).tinymce().save()
+
   tinyMCE_settings: ->
     window.Locomotive.tinyMCE.popupSettings

data/app/assets/javascripts/locomotive/views/inline_editor/application_view.js.coffee

@@ -84,7 +84,7 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
     _window       = @_window()
 
     _jQuery('a[class!="ui-tabs-anchor"]').live 'click', (event) ->
-      link  = _jQuery(event.target)
+      link  = _jQuery(this)
       url   = link.attr('href')
 
       if url? && url.indexOf('#') != 0 && /^(www|http)/.exec(url) == null && /(\/_edit)$/.exec(url) == null && /^\/sites\//.exec(url) == null

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

@@ -159,4 +159,5 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
         @$('li#page_redirect_url_input, li#page_redirect_type_input').hide()
 
   enable_other_checkboxes: ->
-    @$('li.toggle input[type=checkbox].simple-toggle').checkToggle()
+    @$('li.toggle input[type=checkbox].simple-toggle').checkToggle()
+    @$('li.toggle.simple-toggle input[type=checkbox]').checkToggle()

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

@@ -0,0 +1,45 @@
+Locomotive.Views.Shared ||= {}
+Locomotive.Views.Shared.Fields ||= {}
+
+class Locomotive.Views.Shared.Fields.RelationshipView extends Backbone.View
+
+  enable_select2: (element, options) ->
+    options ||= {}
+    options.init_selection_fn ||= (element, callback) -> null
+
+    element.select2
+      width:                '50%'
+      minimumInputLength:   1
+      quietMillis:          100
+      allowClear:           true
+      placeholder:          ' '
+      initSelection: options.init_selection_fn
+      ajax:
+        url: options.url
+        data: (term, page) ->
+          q:    term
+          page: page
+        results: (data, page) =>
+          results:  @build_results(data, options.groupBy)
+          more:     data.length == options.perPage
+
+  build_results: (raw_data, group_by) ->
+    _.tap [], (list) =>
+      _.each raw_data, (data) =>
+        if !@collection? || !@collection.get(data._id)?
+          data.text = data._label
+
+          if group_by?
+            group_name = _.result(data, group_by)
+
+            # does the group exist?
+            group = _.find list, (_group) -> _group.text == group_name
+
+            unless group?
+              # build a new group
+              group = { text: group_name, children: [] }
+              list.push(group)
+
+            group.children.push(data)
+          else
+            list.push(data)

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

@@ -1,7 +1,7 @@
 Locomotive.Views.Shared ||= {}
 Locomotive.Views.Shared.Fields ||= {}
 
-class Locomotive.Views.Shared.Fields.BelongsToView extends Backbone.View
+class Locomotive.Views.Shared.Fields.BelongsToView extends Locomotive.Views.Shared.Fields.RelationshipView
 
   render: ->
     @enable_select2()
@@ -10,25 +10,9 @@ class Locomotive.Views.Shared.Fields.BelongsToView extends Backbone.View
 
   enable_select2: ->
     options = $(@el).data()
+    options.init_selection_fn = (el, callback) -> callback(id: el.val(), text: options.value)
 
-    $(@el).select2
-      width:                '50%'
-      minimumInputLength:   1
-      quietMillis:          100
-      allowClear:           true
-      placeholder:          ' '
-      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)
+    super($(@el), options)
 
     $(@el).on 'select2-selecting', (el) =>
-      @model.set "#{@options.name}_id", el.val
-
-
+      @model.set "#{@options.name}_id", el.val

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

@@ -1,16 +1,16 @@
 Locomotive.Views.Shared ||= {}
 Locomotive.Views.Shared.Fields ||= {}
 
-class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
+class Locomotive.Views.Shared.Fields.ManyToManyView extends Locomotive.Views.Shared.Fields.RelationshipView
 
   tagName: 'div'
 
   className: 'list'
 
   events:
-    'click .new-entry a.add':         'add_entry'
-    'keypress .new-entry select':     'add_entry'
-    'click ul span.actions a.remove': 'remove_entry'
+    'click .new-entry a.add':                   'add_entry'
+    'keypress .new-entry input.selected-entry': 'add_entry'
+    'click ul span.actions a.remove':           'remove_entry'
 
   template: ->
     ich["#{@options.name}_list"]
@@ -22,7 +22,6 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
     _.bindAll(@, 'refresh_position_entries')
 
     @collection   = @model.get(@options.name)
-    @all_entries  = @options.all_entries
 
   render: ->
     $(@el).html(@template()()).attr('id', "#{@model.paramRoot}_#{@options.name}_ids")
@@ -31,7 +30,7 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
 
     @make_entries_sortable()
 
-    @refresh_select_field()
+    @enable_select2()
 
     return @
 
@@ -69,13 +68,17 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
   add_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    entry_id  = @$('.new-entry select').val()
-    entry     = @get_entry_from_id(entry_id)
+    # get the raw data of the selected entry
+    data = @$('.new-entry .selected-entry').select2('data')
 
-    return unless entry?
+    return if !data? || _.isArray(data)
+
+    # build a new instance of a content entry
+    entry = new Locomotive.Models.ContentEntry(data)
 
     @insert_entry(entry)
-    @refresh_select_field()
+
+    @$('.new-entry .selected-entry').select2('val', '')
 
   remove_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
@@ -87,45 +90,53 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
       $(event.target).closest('li').remove()
       @$('.empty').show() if @$('> ul > li').size() == 0
 
-      @refresh_position_entries() & @refresh_select_field()
+      @refresh_position_entries()
 
-  refresh_select_field: ->
-    @$('.new-entry select optgroup, .new-entry select option').remove()
+  enable_select2: ->
+    $input  = @$('.new-entry .selected-entry')
+    options = $input.data()
 
-    _.each @all_entries, (entry_or_group) =>
-      if _.isArray(entry_or_group.entries)
-        group_html = $('<optgroup/>').attr('label', entry_or_group.name)
+    super($input, options)
 
-        _.each entry_or_group.entries, (entry) =>
-          unless @collection.get(entry._id)?
-            option = new Option(entry._label, entry._id, false)
-            group_html.append(option)
+  #   $input.select2
+  #     width:                '50%'
+  #     minimumInputLength:   1
+  #     quietMillis:          100
+  #     allowClear:           true
+  #     placeholder:          ' '
+  #     ajax:
+  #       url: options.url
+  #       data: (term, page) ->
+  #         q:    term
+  #         page: page
+  #       results: (data, page) =>
+  #         results:  @build_results(data, options.groupBy)
+  #         more:     data.length == options.perPage
 
-        @$('.new-entry select').append(group_html)
-      else
-        unless @collection.get(entry_or_group._id)?
-          option = new Option(entry_or_group._label, entry_or_group._id, false)
-          @$('.new-entry select').append(option)
+  #     initSelection: (element, callback) -> null
 
-  get_entry_from_element: (element) ->
-    entry_html  = $(element).closest('li')
-    id          = $(entry_html).data('data-entry-id')
-    @collection.get(id)
+  # build_results: (raw_data, group_by) ->
+  #   _.tap [], (list) =>
+  #     _.each raw_data, (data) =>
+  #       unless @collection.get(data._id)?
+  #         data.text = data._label
 
-  get_entry_from_id: (id) ->
-    entry = null
-
-    _.each @all_entries, (entry_or_group) =>
-      if _.isArray(entry_or_group.entries)
-        entry ||= _.detect(entry_or_group.entries, (_entry) => _entry._id == id)
-      else
-        entry = entry_or_group if entry_or_group._id == id
-
-    if entry?
-      new Locomotive.Models.ContentEntry(entry)
-    else
-      null
+  #         if group_by?
+  #           group_name = _.result(data, group_by)
 
+  #           # does the group exist?
+  #           group = _.find list, (_group) -> _group.text == group_name
 
+  #           unless group?
+  #             # build a new group
+  #             group = { text: group_name, children: [] }
+  #             list.push(group)
 
+  #           group.children.push(data)
+  #         else
+  #           list.push(data)
 
+  get_entry_from_element: (element) ->
+    entry_html  = $(element).closest('li')
+    id          = $(entry_html).data('data-entry-id')
+    @collection.get(id)

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

@@ -39,7 +39,6 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
     @$('#snippet_name').slugify
       target:     @$('#snippet_slug')
       url:        window.permalink_service_url
-      underscore: true
 
   open_image_picker: (event) ->
     event.stopPropagation() & event.preventDefault()

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

@@ -96,6 +96,37 @@ ul.list {
   } // ul.list li
 }
 
+#entries-list.grouped {
+
+  li.item {
+    span.handle {
+      display: none;
+    }
+  } // li.item
+
+  &.sortable {
+
+    li.item {
+      span.handle {
+        @include icon-button;
+
+        margin: 0px;
+        top: -1px !important;
+
+        i {
+          font-size: 9px;
+        }
+      }
+
+      a {
+        margin-left: 0px;
+      }
+    } // .sortable li.item
+
+  }
+
+}
+
 #entries-list.list {
 
   li.item {

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

@@ -182,6 +182,24 @@ form.formtastic {
             float: left;
             margin: -3px 10px 0 0;
           }
+
+          .localized-icon {
+            margin-right: 8px;
+            padding: 2px;
+
+            background-color: #6D6D6B;
+            @include border-radius(8px);
+
+            font-size: 10px;
+            color: #fff;
+            @include single-text-shadow(transparent, 0px, 0px, 0px, 0px);
+            text-shadow: none;
+
+            &.untranslated {
+              background-color: #f2af00;
+            }
+          }
+
         }
 
         p.inline-hints {
@@ -195,6 +213,7 @@ form.formtastic {
             color: #5E5F64;
             @include single-text-shadow(rgba(255, 255, 255, 0.8), 0px, 1px, 1px);
           }
+
         } // p.inline-hints
 
         .actions {

data/app/controllers/locomotive/api/accounts_controller.rb

@@ -19,6 +19,12 @@ module Locomotive
         respond_with(@account)
       end
 
+      def update
+        @account.from_presenter(params[:account])
+        @account.save
+        respond_with(@account)
+      end
+
       def destroy
         @account.destroy
         respond_with(@account)

data/app/controllers/locomotive/content_entries_controller.rb

@@ -64,7 +64,7 @@ module Locomotive
     end
 
     def sort
-      @content_type.klass_with_custom_fields(:entries).sort_entries!(params[:entries])
+      @content_type.klass_with_custom_fields(:entries).sort_entries!(params[:entries], @content_type.sortable_column)
       respond_with @content_type
     end
 

data/app/helpers/locomotive/content_entries_helper.rb

@@ -37,5 +37,27 @@ module Locomotive
       end
     end
 
+    # Display the label related to a field of a content entry.
+    # If the field is not localized, we just display the label.
+    # If the field is localized, then we display a nice flag icon
+    # to let the end-user know about it.
+    #
+    # @param [ Object ] content_entry The content entry
+    # @param [ Object ] field The custom field
+    #
+    # @return [ String ] The label with or without the icon
+    #
+    def label_for_custom_field(content_entry, field)
+      if field.localized?
+        translated_css = content_entry.translated_field?(field) ? '' : 'untranslated'
+
+        icon  = content_tag(:i, '', class: 'icon-flag')
+        tag   = content_tag(:span, icon, class: "localized-icon #{translated_css}")
+        "#{tag}#{field.label}"
+      else
+        field.label
+      end
+    end
+
   end
 end