locomotive_cms 2.1.4 → 2.2.0

data/Gemfile

@@ -45,16 +45,13 @@ group :test do
   # gem 'autotest', platforms: :mri
   # gem 'ZenTest', platforms: :mri
 
-  # gem 'growl-glue'
   gem 'poltergeist',        '~> 1.1.0'
   gem 'shoulda-matchers',   '~> 1.5.2'
 
   gem 'factory_girl_rails', '~> 4.2.1'
   gem 'pickle'
 
-  gem 'capybara',           '~> 2.0.2' #, require: false
-
-  # gem 'xpath',              '~> 0.1.4'
+  gem 'capybara',           '~> 2.0.2'
 
   gem 'json_spec'
 
@@ -62,6 +59,5 @@ group :test do
 
   gem 'mocha', '~> 0.13.0', require: false
 
-
   # gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
 end

data/app/assets/javascripts/aloha/plugins/custom/inputcontrol/css/inputcontrol.css

@@ -0,0 +1,3 @@
+.aloha-input-invalid {
+  border: 1px solid red;
+}

data/app/assets/javascripts/aloha/plugins/custom/inputcontrol/lib/inputcontrol-plugin.js

@@ -0,0 +1,94 @@
+/*!
+* Aloha Editor
+* Copyright (c) 2010 Gentics Software GmbH
+* aloha-sales@gentics.com
+* Author Nicolas Karageuzian
+* Licensed unter the terms of http://www.aloha-editor.com/license.html
+# https://github.com/temistokles/Aloha-Plugin-InputControl
+*/
+
+define(
+['aloha/plugin', 'aloha'],
+function (plugin, Aloha) {
+  "use strict";
+
+  /**
+   * register the plugin with unique name
+   */
+  return plugin.create('inputcontrol', {
+    _constructor: function(){
+      this._super('inputcontrol');
+    },
+    /**
+     * Initialize the plugin and set initialize flag on true
+     */
+    init: function () {
+      var inputmask = this;
+      inputmask.bindEvents();
+    },
+
+    config: {
+      "enableFilter": false,
+      "allowchars": new RegExp('.'), // allows any character (default)
+      "enableMask": false
+    },
+    bindEvents: function() {
+      var inputmask = this;
+      Aloha.bind('aloha-editable-created', function(event, editable){
+        var edConfig = inputmask.getEditableConfig(editable.obj);
+        if (edConfig.enableFilter) {
+        //filtering is enabled, watching keypress (to get the unicode charcode)
+          editable.obj.keypress(function(event){ // listen for keypress (then get the unicode char)
+            var
+              k = event.which, chr,
+              result = true;
+            chr = String.fromCharCode(k);
+            if (edConfig.allowchars instanceof RegExp){
+              Aloha.Log.debug(Aloha, "Keycode : [" + k + "] char : '" + chr + "'");
+              result = result && edConfig.allowchars.test(chr);
+            }
+            return result;
+          });
+        }
+        if (edConfig.disableEnter) {
+          editable.obj.unbind('keydown'); // unbinding aloha preprocess
+          editable.obj.keydown(function(event) {
+            if (event.keyCode === 13) {
+              return false;
+             }
+            return true; //Aloha.Markup.preProcessKeyStrokes();
+          });
+        }
+        if (edConfig.enableMask) { // TODO: debug in here
+          editable.obj.blur(function (event){
+            var $this = $(this);
+            if (edConfig.type === Number) {
+              if (new Number($this.text()).toString() === "NaN") {
+                $this.addClass('aloha-input-invalid');
+              } else {
+                $this.removeClass('aloha-input-invalid');
+              }
+            }
+            if (typeof edConfig.maxlength === "number") {
+              if (edConfig.striphtml) {
+                if ($this.text().length >= edConfig.maxlength) {
+                  $this.addClass('aloha-input-invalid');
+                } else {
+                  $this.removeClass('aloha-input-invalid');
+                }
+              } else {
+                if ($this.html().length >= edConfig.maxlength) {
+                  $this.addClass('aloha-input-invalid');
+                } else {
+                  $this.removeClass('aloha-input-invalid');
+                }
+              }
+            }
+            return true;
+          });
+        }
+      });
+    }
+
+  });
+});

data/app/assets/javascripts/aloha/plugins/custom/inputcontrol/package.json

@@ -0,0 +1 @@
+{}

data/app/assets/javascripts/locomotive.js

@@ -11,7 +11,8 @@
 //= require backbone
 //= require codemirror
 //= require tinymce-jquery
-//= require codemirror/utils/overlay
+//= require select2/select2
+//= require codemirror/addons/mode/overlay
 //= require codemirror/modes/css
 //= require codemirror/modes/javascript
 //= require codemirror/modes/xml

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

@@ -8,8 +8,12 @@ class Locomotive.Models.ContentType extends Backbone.Model
     @_normalize()
 
   _normalize: ->
-    @set
-      entries_custom_fields: new Locomotive.Models.CustomFieldsCollection(@get('entries_custom_fields'))
+    fields = @get('entries_custom_fields')
+    fields = [] if !fields?
+
+    if _.isArray(fields)
+      @set
+        entries_custom_fields: new Locomotive.Models.CustomFieldsCollection(fields)
 
   find_entries_custom_field: (name) ->
     @get('entries_custom_fields').find((field) => field.get('name') == name)

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

@@ -16,7 +16,7 @@ class Locomotive.Models.Page extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
-      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text', 'translated_in'], (key) => delete hash[key]
+      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'template_changed', 'escaped_raw_template', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text', 'translated_in'], (key) => delete hash[key]
 
       delete hash['editable_elements']
       hash.editable_elements = @get('editable_elements').toJSONForSave() if @get('editable_elements')? && @get('editable_elements').length > 0

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

@@ -20,7 +20,7 @@ class Locomotive.Models.Site extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
-      _.each ['locales_text'], (key) => delete hash[key]
+      _.each ['locales_text', 'timezone_name_text'], (key) => delete hash[key]
       delete hash.memberships
       hash.memberships_attributes = @get('memberships').toJSONForSave() if @get('memberships')? && @get('memberships').length > 0
       delete hash.domains

data/app/assets/javascripts/locomotive/utils/aloha_settings.js.coffee

@@ -9,19 +9,29 @@ window.Aloha.settings =
   plugins:
 
     format:
-      config: [ 'b', 'i', 'u','del','sub','sup', 'p', 'title', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'removeFormat']
+      config: ['b', 'i', 'u', 'del', 'sub', 'sup', 'p', 'title', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'removeFormat']
       editables:
-        '.editable-short-text' : [ 'b', 'i', 'u' ]
+        '.editable-single-text': ['b', 'i', 'u', 'del', 'sub', 'sup']
 
-    link:
-      config: [ 'a' ]
+    inputcontrol:
       editables:
-        '.editable-short-text': [ ]
+        '.editable-single-text':
+          disableEnter: true
+
+    link:
+      config: ['a']
 
     list:
-      config: [ 'ul' ]
+      config: ['ul']
+      editables:
+        '.editable-single-text': []
+
+    align:
+      config:
+        alignment: ['right','left','center','justify']
       editables:
-        '.editable-short-text': [ ]
+        '.editable-single-text':
+          alignment: []
 
     image:
       ui:

data/app/assets/javascripts/locomotive/utils/tinymce_settings.js.coffee

@@ -26,9 +26,15 @@ window.Locomotive.tinyMCE =
     theme_advanced_buttons3: ''
     theme_advanced_toolbar_location: 'top'
     theme_advanced_toolbar_align: 'left'
+    theme_advanced_resizing_min_height: 20
+    theme_advanced_path: false
+    theme_advanced_statusbar_location: false
     height: '20'
     width: '709'
     convert_urls: false
+    forced_root_block: false
+    force_br_newlines: true
+    force_p_newlines: false
 
   popupSettings:
     theme: 'advanced'

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

@@ -13,8 +13,7 @@ class Locomotive.Views.ApplicationView extends Backbone.View
 
     @enable_content_locale_picker()
 
-    window.Locomotive.tinyMCE.defaultSettings.language = window.locale # set the default tinyMCE language
-    window.Locomotive.tinyMCE.minimalSettings.language = window.locale
+    @set_locale_for_tinymce_widgets()
 
     # render page view
     if @options.view?
@@ -83,6 +82,18 @@ class Locomotive.Views.ApplicationView extends Backbone.View
       locale = $(@).data('locale')
       window.addParameterToURL 'content_locale', locale
 
+  set_locale_for_tinymce_widgets: ->
+    # tinyMCE likes only lowercase locales
+    tinymce_locale = window.locale.toLowerCase()
+
+    # pt-BR does not exist, pt does though
+    tinymce_locale = 'pt' if tinymce_locale == 'pt-br'
+
+    # set the default tinyMCE language
+    window.Locomotive.tinyMCE.defaultSettings.language  = tinymce_locale
+    window.Locomotive.tinyMCE.minimalSettings.language  = tinymce_locale
+    window.Locomotive.tinyMCE.popupSettings.language    = tinymce_locale
+
   unique_dialog_zindex: ->
     # returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
     # Each modal window should have a different zIndex, otherwise there will be conflicts between them.

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

@@ -10,6 +10,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
   _file_field_views: []
 
+  _belongs_to_field_views: []
+
   _has_many_field_views: []
 
   _many_to_many_field_views: []
@@ -39,6 +41,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
     @enable_select_fields()
 
+    @enable_belongs_to_fields()
+
     @enable_file_fields()
 
     @enable_has_many_fields()
@@ -93,14 +97,27 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
             unless option.destroyed()
               $select.append(new Option(option.get('name'), option.get('id'), false, option.get('id') == @model.get("#{name}_id")))
 
+  enable_belongs_to_fields: ->
+    prefix = if @namespace? then "#{@namespace}_" else ''
+
+    _.each @model.get('belongs_to_custom_fields'), (name) =>
+      $el = @$("##{prefix}#{@model.paramRoot}_#{name}_id")
+
+      if $el.length > 0
+        view = new Locomotive.Views.Shared.Fields.BelongsToView model: @model, name: name, el: $el
+
+        @_belongs_to_field_views.push(view)
+
+        view.render()
+
   enable_file_fields: ->
+    prefix = if @namespace? then "#{@namespace}_" else ''
+
     _.each @model.get('file_custom_fields'), (name) =>
       view = new Locomotive.Views.Shared.Fields.FileView model: @model, name: name, namespace: @namespace
 
       @_file_field_views.push(view)
 
-      prefix = if @namespace? then "#{@namespace}_" else ''
-
       @$("##{prefix}#{@model.paramRoot}_#{name}_input label").after(view.render().el)
 
   enable_has_many_fields: ->

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

@@ -88,4 +88,4 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     # disabled in a popup form
 
   tinyMCE_settings: ->
-    _.extend { language: window.locale }, window.Locomotive.tinyMCE.popupSettings
+    window.Locomotive.tinyMCE.popupSettings

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

@@ -30,7 +30,7 @@ class Locomotive.Views.ContentEntries.IndexView 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/content_types/_form_view.js.coffee

@@ -49,7 +49,8 @@ class Locomotive.Views.ContentTypes.FormView extends Locomotive.Views.Shared.For
       passDelay:        50
       tabMode:          'shift'
       theme:            'default'
-      onChange: (editor) => @model.set(raw_item_template: editor.getValue())
+
+    @editor.on 'change', (editor, change) => @model.set(raw_item_template: editor.getValue())
 
   after_inputs_fold: ->
     @editor.refresh()

data/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee

@@ -49,7 +49,10 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View
       when 'belongs_to'
         @$('li.input.localized').hide()
         @$('li.input.class-name').show()
+      when 'image'
+        @$('li.input.unique').hide()
       when 'has_many', 'many_to_many'
+        @$('li.input.unique').hide()
         @$('li.input.localized').hide()
         @$('li.input.class-name').show()
         @$('li.input.inverse-of').show()

data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee

@@ -64,7 +64,8 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
         passDelay:        50
         tabMode:          'shift'
         theme:            'default'
-        onChange: (editor) => @model.set(robots_txt: editor.getValue())
+
+      @editor.on 'change', (editor, change) => @model.set(robots_txt: editor.getValue())
 
   save: (event) ->
     # if @model.includes_domain(window.location.host)

data/app/assets/javascripts/locomotive/views/editable_elements/edit_all_view.js.coffee

@@ -9,8 +9,6 @@ class Locomotive.Views.EditableElements.EditAllView extends Backbone.View
   _editable_elements_views: []
 
   render: ->
-    window.bar = @
-
     if @collection.isEmpty()
       $(@el).hide()
     else
@@ -45,10 +43,9 @@ class Locomotive.Views.EditableElements.EditAllView extends Backbone.View
         element.set(index: index)
 
         view_class = switch element.get('type')
-          when 'EditableShortText' then Locomotive.Views.EditableElements.ShortTextView
-          when 'EditableLongText' then Locomotive.Views.EditableElements.LongTextView
-          when 'EditableFile' then Locomotive.Views.EditableElements.FileView
-          when 'EditableControl' then Locomotive.Views.EditableElements.ControlView
+          when 'EditableText'       then Locomotive.Views.EditableElements.TextView
+          when 'EditableFile'       then Locomotive.Views.EditableElements.FileView
+          when 'EditableControl'    then Locomotive.Views.EditableElements.ControlView
 
         view = new view_class(model: element)
         @$("#block-#{block.index} > fieldset > ol").append(view.render().el)

data/app/assets/javascripts/locomotive/views/editable_elements/text_view.js.coffee

@@ -0,0 +1,47 @@
+Locomotive.Views.EditableElements ||= {}
+
+class Locomotive.Views.EditableElements.TextView extends Backbone.View
+
+  tagName: 'li'
+
+  className: 'text input html'
+
+  default_line_height: 20
+
+  render: ->
+    $(@el).html(ich.editable_text_input(@model.toJSON()))
+
+    return @
+
+  after_render: ->
+    if @model.get('format') == 'html'
+      @$('textarea').tinymce(@tinymce_settings())
+    else
+      @$('textarea').bind 'keyup', (event) =>
+        input = $(event.target)
+        @model.set(content: input.val())
+
+  tinymce_settings: ->
+    base_settings = window.Locomotive.tinyMCE.defaultSettings
+
+    if @model.get('line_break') == false
+      base_settings = window.Locomotive.tinyMCE.minimalSettings
+
+    _.extend {}, base_settings,
+      height:   @model.get('rows') * @default_line_height
+      oninit:   ((editor) =>
+          $.cmd 'S', (() =>
+            @model.set(content: editor.getBody().innerHTML)
+            $(@el).parents('form').trigger('submit')
+          ), [], ignoreCase: true, document: editor.dom.doc),
+      onchange_callback: (editor) =>
+        @model.set(content: editor.getBody().innerHTML)
+
+  refresh: ->
+    # do nothing
+
+  remove: ->
+    if @model.get('format') == 'html'
+      @$('textarea').tinymce().remove()
+
+    super

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

@@ -78,7 +78,7 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
 
   editable_elements: ->
     if @options.target[0].contentWindow.Aloha
-      @options.target[0].contentWindow.Aloha.jQuery('.editable-long-text, .editable-short-text')
+      @options.target[0].contentWindow.Aloha.jQuery('.editable-text')
     else
       null
 

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

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