locomotive_cms 2.0.0.rc12 → 2.0.0

data/Gemfile

@@ -1,57 +1,64 @@
 #!/usr/bin/env bundle
 # encoding: utf-8
 
-source :rubygems
+source "https://rubygems.org"
 
-gemspec # Include gemspec dependencies
+# net-scp 1.0.6 was yanked
+gem 'net-scp', '1.0.4'
 
-# The rest of the dependencies are for use when in the locomotive development environment
+gemspec # Include gemspec dependencies
 
-group :development do
-  # gem 'custom_fields', :path => '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
+group :assets do
+  gem 'sass-rails',   '~> 3.2.4'
+  gem 'coffee-rails', '~> 3.2.2'
+  gem 'uglifier',     '~> 1.2.4'
+  gem 'compass-rails'
+end
 
-  # gem 'locomotive-aloha-rails', :path => '../gems/aloha-rails' # for Developers
-  # gem 'locomotive-tinymce-rails', '~> 3.4.7.3', :path => '../gems/tinymce-rails' # for Developers  
-  # gem 'locomotive_liquid', :path => '../gems/liquid' # for Developers
+# The rest of the dependencies are for use when in the locomotive development / test environments
 
-  gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators
+group :test, :development do
+  gem 'rspec-rails', '~> 2.13.0' # In order to have rspec tasks and generators
   gem 'rspec-cells'
+end
+
+group :development do
+  # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
+  # gem 'custom_fields', git: 'git://github.com/locomotivecms/custom_fields.git', branch: '2.0.0.rc' # Branch on Github
+
+  # gem 'locomotive-aloha-rails', path: '../gems/aloha-rails' # for Developers
+  # gem 'locomotive-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
+  # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
 
   gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
-end
 
-group :assets do
-  gem 'sass-rails',   '~> 3.2.4'
-  gem 'coffee-rails', '~> 3.2.2'
-  gem 'uglifier',     '~> 1.2.4'
-  gem 'compass-rails'
 end
 
 group :test do
   gem 'launchy'
 
-  # gem 'autotest', :platforms => :mri
-  # gem 'ZenTest', :platforms => :mri
+  gem 'cucumber-rails', require: false
 
-  # gem 'growl-glue'
+  # gem 'autotest', platforms: :mri
+  # gem 'ZenTest', platforms: :mri
 
-  gem 'cucumber-rails',     :require => false
-  gem 'poltergeist',        '~> 0.7.0'
-  gem 'rspec-rails',        '~> 2.8.0'
-  gem 'shoulda-matchers'
+  # gem 'growl-glue'
+  gem 'poltergeist',        '~> 1.1.0'
+  gem 'shoulda-matchers',   '~> 1.5.2'
 
-  gem 'factory_girl_rails', '~> 1.6.0'
+  gem 'factory_girl_rails', '~> 4.2.1'
   gem 'pickle'
-  gem 'mocha',              '0.9.12' # :git => 'git://github.com/floehopper/mocha.git'
 
-  gem 'capybara'
+  gem 'capybara',           '~> 2.0.2' #, require: false
 
-  gem 'xpath',              '~> 0.1.4'
+  # gem 'xpath',              '~> 0.1.4'
 
   gem 'json_spec'
 
   gem 'database_cleaner'
 
-  # gem 'debugger', :git => 'git://github.com/cldwalker/debugger.git'
+  gem 'mocha', '~> 0.13.0', require: false
+
+
+  # gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
 end

data/LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2010-2012, Didier Lafforgue.
+Copyright (c) 2010-2013, Didier Lafforgue.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.textile

@@ -2,6 +2,9 @@ h1. Locomotive CMS
 
 "!https://secure.travis-ci.org/locomotivecms/engine.png!":http://travis-ci.org/locomotivecms/engine
 
+"!https://codeclimate.com/github/locomotivecms/engine.png!":https://codeclimate.com/github/locomotivecms/engine
+
+"!https://gemnasium.com/locomotivecms/engine.png(Dependency Status)!":https://gemnasium.com/locomotivecms/engine
 
 Locomotive is a simple but powerful CMS based on liquid templates and mongodb database. At my company ("NoCoffee":http://www.nocoffee.fr), we use it for our clients when they request a simple website.
 
@@ -24,7 +27,7 @@ h2. Gems
 
 Here is a short list of main gems / technologies used in the application.
 
-* Rails 3.2.5
+* Rails 3.2.13
 * Mongoid 2.4.9 (with MongoDB 2.0)
 * Liquid
 * Devise
@@ -36,7 +39,7 @@ Here is a short list of main gems / technologies used in the application.
 
 h2. Installation
 
-See the "official website":http://www.locomotivecms.com
+See the "installation documentation on the official website":http://doc.locomotivecms.com/installation/requirements
 
 h2. Upgrading
 
@@ -44,7 +47,7 @@ We work on the procedure to upgrade from a previous version of the engine (below
 
 h2. Community
 
-* Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms or the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ (deprecated)
+* Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms
 * Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/
 * "Follow us on twitter":http://twitter.com/locomotivecms
 
@@ -80,9 +83,11 @@ h2. Credits
 
 "Emmanuel Grard":http://www.grardesign.com designed the awesome locomotive illustration in the locomotivecms.com landing page.
 
+"Font Awesome":http://fortawesome.github.com/Font-Awesome for providing the best icons. Make the whole back-office Retina-ready.
+
 h2. Contact
 
 Feel free to contact me at didier at nocoffee dot fr.
 
-Copyright (c) 2012 NoCoffee, released under the MIT license
+Copyright (c) 2013 NoCoffee, released under the MIT license
 ...

data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/css/image.css

@@ -1,3 +1,3 @@
-button.aloha-locomotive-media-insert {
+.aloha-button.aloha-locomotive-media-insert {
   background: url(../img/image.gif) !important;
 }

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

@@ -1,15 +1,13 @@
 define(
-  ['aloha/jquery', 'aloha/plugin', 'aloha/floatingmenu', 'i18n!aloha/nls/i18n', 'i18n!locomotive_media/nls/i18n', 'css!locomotive_media/css/image.css'],
-  function(aQuery, Plugin, FloatingMenu, i18nCore, i18n) {
+  ['aloha/jquery', 'aloha/plugin', 'ui/ui', 'ui/button', 'i18n!aloha/nls/i18n', 'i18n!locomotive_media/nls/i18n', 'css!locomotive_media/css/image.css'],
+  function(aQuery, Plugin, Ui, Button, i18nCore, i18n) {
       var jQuery = aQuery;
       var $ = aQuery;
       var GENTICS = window.GENTICS, Aloha = window.Aloha;
 
       return Plugin.create('locomotive_media', {
         init: function() {
-          FloatingMenu.createScope(this.name, 'Aloha.continuoustext');
-
-          this._addUIInsertButton(i18nCore.t('floatingmenu.tab.insert'));
+          this._addUIInsertButton();
         },
 
         openDialog: function() {
@@ -72,24 +70,15 @@ define(
         /**
          * Adds the insert button to the floating menu
          */
-        _addUIInsertButton: function(tabId) {
+        _addUIInsertButton: function() {
           var that = this;
-          this.insertMediaButton = new Aloha.ui.Button({
-            'name' : 'insertlocomotivemedia',
-            'iconClass': 'aloha-button aloha-locomotive-media-insert',
-            'size' : 'small',
-            'onclick' : function () { that.openDialog(); },
-            'tooltip' : i18n.t('button.addimg.tooltip'),
-            'toggle' : false
+          var button = Ui.adopt('insertlocomotivemedia', Button, {
+            tooltip: i18n.t('button.addimg.tooltip'),
+            icon: 'aloha-button aloha-locomotive-media-insert',
+            scope: 'Aloha.continuoustext',
+            click: function(){ that.openDialog(); }
           });
-
-          FloatingMenu.addButton(
-            'Aloha.continuoustext',
-            this.insertMediaButton,
-            tabId,
-            1
-          );
-        },
+        }
 
       });
   }

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

@@ -24,7 +24,7 @@ class Locomotive.Models.ContentEntry extends Backbone.Model
     @set data
 
   update_attributes: (attributes) ->
-    _.each attributes.file_custom_fields, (field) => # special treatment for files
+    _.each @get('file_custom_fields'), (field) => # special treatment for files
       attribute = "#{field}_url"
       @set_attribute attribute, attributes[attribute]
       @set_attribute "remove_#{field}", false

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

@@ -11,11 +11,17 @@ class Locomotive.Models.ContentType extends Backbone.Model
     @set
       entries_custom_fields: new Locomotive.Models.CustomFieldsCollection(@get('entries_custom_fields'))
 
+  find_entries_custom_field: (name) ->
+    @get('entries_custom_fields').find((field) => field.get('name') == name)
+
   toJSON: ->
     _.tap super, (hash) =>
+      _.each ['label_field_id_text', 'group_by_field_id_text', 'public_submission_accounts_text', 'target_klass_name_text', 'content_type_id_text', 'public_submission_account_emails'], (key) => delete hash[key]
       delete hash.entries_custom_fields
       hash.entries_custom_fields_attributes = @get('entries_custom_fields').toJSONForSave() if @get('entries_custom_fields')? && @get('entries_custom_fields').length > 0
 
+      hash.public_submission_accounts = [''] unless @get('public_submission_accounts')?
+
 class Locomotive.Models.ContentTypesCollection extends Backbone.Collection
 
   model: Locomotive.Models.ContentType

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

@@ -0,0 +1,5 @@
+class Locomotive.Models.Translation extends Backbone.Model
+
+  paramRoot: 'translation'
+
+  urlRoot: "#{Locomotive.mounted_on}/translations"

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

@@ -29,9 +29,27 @@ window.Aloha.settings =
         crop:   false
 
   i18n:
-    available: ['en', 'fr', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl']
+    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl']
 
   sidebar:
     disabled: true
 
-
+  toolbar:
+    tabs:
+      [
+        {
+          label: 'tab.format.label'
+        },
+        {
+          label: 'tab.insert.label',
+          showOn: { scope: 'Aloha.continuoustext' },
+          exclusive: true,
+          components: [
+            [
+              'createTable', 'characterPicker', 'insertLink',
+              'insertAbbr', 'insertToc','insertHorizontalRule',
+              'insertTag', 'insertlocomotivemedia'
+            ]
+          ]
+        }
+      ]

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

@@ -3,9 +3,9 @@ window.Locomotive.tinyMCE =
   defaultSettings:
     theme: 'advanced'
     skin: 'locomotive'
-    plugins: 'safari,jqueryinlinepopups,table,locomotive_media,fullscreen'    
+    plugins: 'safari,jqueryinlinepopups,table,locomotive_media,fullscreen,paste'
     extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
-    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,table,|,locomotive_media'
+    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,table,|,locomotive_media,|,pasteword'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'
     theme_advanced_buttons3: ''
     theme_advanced_toolbar_location: 'top'
@@ -20,8 +20,8 @@ window.Locomotive.tinyMCE =
   minimalSettings:
     theme: 'advanced'
     skin: 'locomotive'
-    plugins: 'safari,jqueryinlinepopups,locomotive_media'
-    theme_advanced_buttons1: 'code,|,bold,italic,strikethrough,|,fontselect,fontsizeselect,|,link,unlink,|,locomotive_media'
+    plugins: 'safari,jqueryinlinepopups,locomotive_media,paste'
+    theme_advanced_buttons1: 'code,|,bold,italic,strikethrough,|,fontselect,fontsizeselect,|,link,unlink,|,locomotive_media,|,pasteword'
     theme_advanced_buttons2: ''
     theme_advanced_buttons3: ''
     theme_advanced_toolbar_location: 'top'
@@ -33,9 +33,9 @@ window.Locomotive.tinyMCE =
   popupSettings:
     theme: 'advanced'
     skin: 'locomotive'
-    plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen'    
+    plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen,paste'
     extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
-    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,locomotive_media'
+    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,locomotive_media,|,pasteword'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'
     theme_advanced_buttons3: ''
     theme_advanced_toolbar_location: 'top'

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

@@ -13,14 +13,14 @@ 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
+
     # render page view
     if @options.view?
       @view = new @options.view(@options.view_data || {})
       @view.render()
 
-    window.Locomotive.tinyMCE.defaultSettings.language = window.locale # set the default tinyMCE language
-    window.Locomotive.tinyMCE.minimalSettings.language = window.locale
-
     return @
 
   render_flash_messages: (messages) ->
@@ -80,7 +80,7 @@ class Locomotive.Views.ApplicationView extends Backbone.View
       picker.toggle()
 
     picker.find('li').bind 'click', (event) ->
-      locale = $(@).attr('data-locale')
+      locale = $(@).data('locale')
       window.addParameterToURL 'content_locale', locale
 
   unique_dialog_zindex: ->

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

@@ -25,6 +25,6 @@ class Locomotive.Views.ContentAssets.PickerItemView extends Backbone.View
   remove_asset: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    message = $(event.target).attr('data-confirm') || $(event.target).parent().attr('data-confirm')
+    message = $(event.target).data('confirm') || $(event.target).parent().data('confirm')
 
     @model.destroy() if confirm(message)

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

@@ -22,6 +22,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
     @model ||= new Locomotive.Models.ContentEntry(@options.content_entry)
 
+    @namespace = @options.namespace
+
     Backbone.ModelBinding.bind @
 
   render: ->
@@ -88,11 +90,13 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
   enable_file_fields: ->
     _.each @model.get('file_custom_fields'), (name) =>
-      view = new Locomotive.Views.Shared.Fields.FileView model: @model, name: name
+      view = new Locomotive.Views.Shared.Fields.FileView model: @model, name: name, namespace: @namespace
 
       @_file_field_views.push(view)
 
-      @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
+      prefix = if @namespace? then "#{@namespace}_" else ''
+
+      @$("##{prefix}#{@model.paramRoot}_#{name}_input label").after(view.render().el)
 
   enable_has_many_fields: ->
     unless @model.isNew()
@@ -117,7 +121,9 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
         @$("##{@model.paramRoot}_#{name}_input label").after(view.render().el)
 
   slugify_label_field: ->
-    @$('li.input.highlighted > input[type=text]').slugify(target: @$('#content_entry__slug'))
+    @$('li.input.highlighted > input[type=text]').slugify
+      target: @$('#content_entry__slug')
+      url:    window.permalink_service_url
 
   refresh_file_fields: ->
     _.each @_file_field_views, (view) => view.refresh()
@@ -133,6 +139,7 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
     @$('li.input.toggle input[type=checkbox]').checkToggle('sync')
 
   remove: ->
+    @$('li.input.date input[type=text]').datepicker('destroy')
     @_select_field_view.remove()
     _.each @_file_field_views, (view) => view.remove()
     _.each @_has_many_field_views, (view) => view.remove()

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

@@ -18,16 +18,17 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     @save_in_ajax event,
       headers:  { 'X-Flash': true }
       on_success: (response, xhr) =>
-        entry = new Locomotive.Models.ContentEntry(response)
+        entry = new Locomotive.Models.ContentEntry(JSON.parse(xhr.responseText))
         @options.parent_view.insert_or_update_entry(entry)
         @close()
 
   create_dialog: ->
     @dialog = $(@el).dialog
-      autoOpen: false
-      modal:    true
-      zIndex:   window.application_view.unique_dialog_zindex()
-      width:    770,
+      autoOpen:     false
+      modal:        true
+      dialogClass:  'content-entry-popup'
+      zIndex:       window.application_view.unique_dialog_zindex()
+      width:        770,
       create: (event, ui) =>
         $(@el).prev().find('.ui-dialog-title').html(@$('h2').html())
         @$('h2').remove()
@@ -36,7 +37,7 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
         actions.find('#close-link').click (event) => @close(event)
         actions.find('input[type=submit]').click (event) =>
           # since the submit buttons are outside the form, we have to mimic the behaviour of a basic form
-          $form = @el.find('form'); $buttons_pane = $(event.target).parent()
+          $form = @$el.find('form'); $buttons_pane = $(event.target).parent()
 
           $.rails.disableFormElements($buttons_pane)