locomotive_cms 2.2.3 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 243b2783fdaefcb54415d93da1d0918dd81890f7
+  data.tar.gz: 4652d77c5a747fa2fdf429eef59b7ef2f56b3642
+SHA512:
+  metadata.gz: 864e756b9dfab5708b8e89ae55229879518a44fb2f91ed207537e19e4f0a3189948d60ad0f93b66d4f757dfa765866b00df1000bacdcd60cdfc9b1c663939d44
+  data.tar.gz: 3268fb0c1d076f4084208593ffe762f360c496304ea9d911b5dfc92655ae3cbe794286e502386dfd658e6d1c91b7f229c0b9520b35313b75ba27aa7579cd23ad

data/Gemfile

@@ -27,6 +27,7 @@ group :development do
   # 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 'locomotivecms_solid', path: '../gems/solid' # for Developers
 
   # gem 'carrierwave-mongoid', git: 'git://github.com/locomotivecms/carrierwave-mongoid.git'
 

data/README.textile

@@ -27,7 +27,8 @@ h2. Gems
 
 Here is a short list of main gems / technologies used in the application.
 
-* Rails 3.2.13
+* Ruby 2.0
+* Rails 3.2.14 (Rails 4.0 in the next months)
 * Mongoid 3.1.3 (with MongoDB 2.x)
 * Liquid
 * Devise

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

@@ -19,7 +19,7 @@ class Locomotive.Models.Page extends Backbone.Model
       _.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
+      hash.editable_elements_attributes = @get('editable_elements').toJSONForSave() if @get('editable_elements')? && @get('editable_elements').length > 0
 
       delete hash['target_klass_name']
       hash.target_klass_name = @get('target_klass_name') if @get('templatized') == true

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

@@ -39,7 +39,7 @@ window.Aloha.settings =
         crop:   false
 
   i18n:
-    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja']
+    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja', 'cs', 'bg']
 
   sidebar:
     disabled: true
@@ -62,4 +62,4 @@ window.Aloha.settings =
             ]
           ]
         }
-      ]
+      ]

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

@@ -99,5 +99,5 @@ class Locomotive.Views.ApplicationView extends Backbone.View
     # Each modal window should have a different zIndex, otherwise there will be conflicts between them.
     window.Locomotive.jQueryModals ||= 0
 
-    998 + window.Locomotive.jQueryModals++
-
+    # 998 + window.Locomotive.jQueryModals++
+    300000 + window.Locomotive.jQueryModals++

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

@@ -20,6 +20,8 @@ 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

@@ -37,6 +37,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
     @enable_datepickers()
 
+    @enable_datetimepickers()
+
     @enable_richtexteditor()
 
     @enable_select_fields()
@@ -62,6 +64,11 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
   enable_datepickers: ->
     @$('li.input.date input[type=text]').datepicker()
 
+  enable_datetimepickers: ->
+    @$('li.input.date-time input[type=text]').datetimepicker
+      controlType: 'select'
+      showTime: false
+
   enable_richtexteditor: ->
     _.each @$('li.input.rte textarea.html'), (textarea) =>
       settings = _.extend {}, @tinyMCE_settings(),
@@ -162,6 +169,7 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
   remove: ->
     @$('li.input.date input[type=text]').datepicker('destroy')
+    @$('li.input.date_time input[type=text]').datetimepicker('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/editable_elements/text_view.js.coffee

@@ -31,11 +31,11 @@ class Locomotive.Views.EditableElements.TextView extends Backbone.View
       height:   @model.get('rows') * @default_line_height
       oninit:   ((editor) =>
           $.cmd 'S', (() =>
-            @model.set(content: editor.getBody().innerHTML)
+            @model.set(content: editor.getContent())
             $(@el).parents('form').trigger('submit')
           ), [], ignoreCase: true, document: editor.dom.doc),
       onchange_callback: (editor) =>
-        @model.set(content: editor.getBody().innerHTML)
+        @model.set(content: editor.getContent())
 
   refresh: ->
     # do nothing

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

@@ -5,6 +5,8 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
   save: (event) ->
     event.stopPropagation() & event.preventDefault()
 
+    @trigger_change_event_on_focused_inputs()
+
     form = $(event.target).trigger('ajax:beforeSend')
 
     @clear_errors()

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

@@ -15,6 +15,8 @@ class Locomotive.Views.Shared.Fields.BelongsToView extends Backbone.View
       width:                '50%'
       minimumInputLength:   1
       quietMillis:          100
+      allowClear:           true
+      placeholder:          ' '
       ajax:
         url: options.url
         data: (term, page) ->

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

@@ -29,6 +29,8 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
   save_in_ajax: (event, options) ->
     event.stopPropagation() & event.preventDefault()
 
+    @trigger_change_event_on_focused_inputs()
+
     form = $(event.target).trigger('ajax:beforeSend')
 
     @clear_errors()
@@ -85,16 +87,16 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
       else
         content.slideUp 100, -> parent.addClass('folded')
 
+  trigger_change_event_on_focused_inputs: ->
+    # make sure that the current text field gets saved too
+    input = @$('form input[type=text]:focus, form input[type=password]:focus, form textarea:focus')
+    input.trigger('change') if input.size() > 0
+
   enable_save_with_keys_combination: ->
     $.cmd 'S', (() =>
-      # make sure that the current text field gets saved too
-      input = @$('form input[type=text]:focus, form input[type=password]:focus, form textarea:focus')
-      input.trigger('change') if input.size() > 0
-
       @$('form input[type=submit]').trigger('click')
     ), [], ignoreCase: true
 
-
   enable_form_notifications: ->
     @$('form').formSubmitNotification()
 

data/app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js

@@ -21,14 +21,18 @@
     el = ed.selection.getNode();
 
     if (el && (el.nodeName == 'IMG' || el.nodeName == 'A')) {
-     ed.dom.setAttribs(el, args);
+      ed.dom.setAttribs(el, args);
     } else {
       if (asset.get('image')) {
         ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', { skip_undo: 1 });
       } else {
         var html = ed.selection.getContent();
-        if (html == '') html = asset.get('filename');
-        ed.execCommand('mceInsertContent', false, '<a id="__mce_tmp" >' + html + '</a>', { skip_undo: 1 });
+        if (html == '') {
+          html = asset.get('filename');
+          ed.execCommand('mceInsertContent', false, '<a id="__mce_tmp" href="#">' + html + '</a>', { skip_undo: 1 });
+        } else {
+          ed.execCommand('mceReplaceContent', false, ' <a id="__mce_tmp" href="#">' + html + '</a>', { skip_undo: 1 });
+        }
       }
 
       ed.dom.setAttribs('__mce_tmp', args);

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

@@ -0,0 +1 @@
+tinyMCE.addI18n('cs.locomotive_media',{"image_desc": "Vložit obrázek"});

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

@@ -2,10 +2,13 @@
 @import "compass/css3/border-radius";
 @import "compass/css3/images";
 @import "compass/css3/text-shadow";
+@import "compass/css3/box-shadow";
 
 // Note: http://www.west-wind.com/weblog/posts/2009/Sep/12/jQuery-UI-Datepicker-and-zIndex
 #ui-datepicker-div {
   z-index: 9999999 !important;
+
+  @include box-shadow(rgba(0, 0, 0, 0.2) 4px 4px 10px 2px);
 }
 
 .ui-datepicker {
@@ -181,3 +184,66 @@
   }
 }
 
+.ui-timepicker-div {
+
+  border-top: 1px solid #bcbfc2;
+
+  .ui-widget-header {
+    margin-bottom: 8px;
+  }
+
+  dl {
+    margin: 0px;
+  }
+
+  // dl { text-align: left; }
+  // dl dt { height: 25px; margin-bottom: -25px; }
+  // dl dd { margin: 0 10px 10px 65px; }
+  // td { font-size: 90%; }
+
+  .ui_tpicker_hour_label {
+    display: none;
+  }
+
+  .ui_tpicker_minute_label {
+    display: none;
+  }
+
+  .ui_tpicker_hour, .ui_tpicker_minute {
+    display: inline-block;
+    width: 50%;
+    text-align: right;
+    margin: 4px 0px 6px 0px;
+
+    select {
+      margin: 0 3px;
+      font-size: 11px;
+      font-family: Verdana, Arial, sans-serif;
+    }
+
+    &.ui_tpicker_minute {
+      text-align: left;
+      .ui_tpicker_minute_slider {
+        &:before { font-size: 14px; font-weight: bold; content: ':'; }
+      }
+    }
+  }
+}
+
+.ui-tpicker-grid-label {
+  background: none;
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+.ui-timepicker-rtl {
+  direction: rtl;
+
+  dl { text-align: right; }
+  dl dd { margin: 0 65px 10px 10px; }
+}
+
+.ui-datepicker-buttonpane {
+  display: none;
+}

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

@@ -60,7 +60,7 @@
 
   .ui-dialog-content {
     position: relative;
-    z-index: 1200;
+    // z-index: 1200;
 
     text-align: left;
 
@@ -90,6 +90,12 @@
               width: 90px;
             }
           } // li.string
+
+          li.tags {
+            ul.tagit {
+              width: 530px;
+            }
+          }
         }
       }
     } // .form.formtastic
@@ -131,7 +137,7 @@
       }
 
       input[type=file] {
-        z-index: 1203;
+        z-index: 400000; // thanks to tinymce modal z-index
       }
 
     } // .button-wrapper

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

@@ -435,6 +435,14 @@ form.formtastic {
 
         } // li.date
 
+        &.date-time {
+
+          input[type=text] {
+            width: 120px;
+          }
+
+        } // li.date-time
+
         &.file {
           span.file {
             a:first-child {

data/app/assets/stylesheets/locomotive/backoffice/menu/_colors.css.scss

@@ -14,7 +14,7 @@
 
     span, i {
       color: #fff;
-      @include single-text-shadow(transparent, 0px, 0px, 0px);
+      @include single-text-shadow(rgba(0, 0, 0, 0.2), 0px, 1px, 0px);
     }
   }
 

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

@@ -3,10 +3,13 @@ module Locomotive
     class BaseController < ApplicationController
 
       include Locomotive::Routing::SiteDispatcher
+      include Locomotive::ActionController::Timezone
       include Locomotive::ActionController::LocaleHelpers
 
       skip_before_filter :verify_authenticity_token
 
+      around_filter :set_timezone
+
       before_filter :require_account
 
       before_filter :require_site

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

@@ -4,13 +4,13 @@ module Locomotive
 
       load_and_authorize_resource({
         class:                Locomotive::ContentEntry,
-        through:              :content_type,
+        through:              :get_content_type,
         through_association:  :entries,
         find_by:              :find_by_id_or_permalink
       })
 
       def index
-        @content_entries = @content_entries.order_by([content_type.order_by_definition])
+        @content_entries = @content_entries.order_by([get_content_type.order_by_definition])
         respond_with @content_entries
       end
 
@@ -37,10 +37,10 @@ module Locomotive
 
       protected
 
-      def content_type
+      def get_content_type
         @content_type ||= current_site.content_types.where(slug: params[:slug]).first
       end
 
     end
   end
-end
+end

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

@@ -24,6 +24,10 @@ module Locomotive
 
       protected
 
+      def set_locale
+        I18n.locale = Locomotive.config.locales.first
+      end
+
       def self.description
         {
           overall: %{Manage a session token which will be passed to all the other REST calls},

data/app/controllers/locomotive/base_controller.rb

@@ -6,6 +6,7 @@ module Locomotive
     include Locomotive::ActionController::SectionHelpers
     include Locomotive::ActionController::UrlHelpers
     include Locomotive::ActionController::Ssl
+    include Locomotive::ActionController::Timezone
 
     layout '/locomotive/layouts/application'
 
@@ -15,13 +16,15 @@ module Locomotive
 
     before_filter :require_site
 
+    before_filter :set_back_office_locale
+
+    before_filter :set_current_content_locale
+
     before_filter :validate_site_membership
 
     load_and_authorize_resource
 
-    before_filter :set_back_office_locale
-
-    before_filter :set_current_content_locale
+    around_filter :set_timezone
 
     before_filter :set_current_thread_variables
 

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

@@ -6,9 +6,12 @@ module Locomotive
       include Locomotive::ActionController::LocaleHelpers
       include Locomotive::ActionController::SectionHelpers
       include Locomotive::ActionController::UrlHelpers
+      include Locomotive::ActionController::Timezone
 
       skip_load_and_authorize_resource
 
+      around_filter :set_timezone
+
       before_filter :require_site
 
       protected

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

@@ -13,7 +13,7 @@ module Locomotive
       respond_to :html, :json
 
       def create
-        @entry = @content_type.entries.create(params[:entry] || params[:content])
+        @entry = @content_type.entries.safe_create(params[:entry] || params[:content])
 
         respond_with @entry, {
           location:   self.callback_url,
@@ -25,6 +25,7 @@ module Locomotive
 
       def set_locale
         ::I18n.locale = params[:locale] || current_site.default_locale
+        ::Mongoid::Fields::I18n.locale = ::I18n.locale
       end
 
       def set_content_type