locomotive_cms 2.0.0.rc4 → 2.0.0.rc5

data/app/assets/javascripts/locomotive/application.js.coffee

@@ -4,9 +4,9 @@
 #= require_tree ./views
 
 window.Locomotive =
-  mounted_on:   '/locomotive' # default path
+  mounted_on:   window.Locomotive.mounted_on
   Models:       {}
   Collections:  {}
   Views:        {}
 
-window.Locomotive.Views.Memberships = {}
+window.Locomotive.Views.Memberships = {}

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 ['content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (key) => delete hash[key]
+      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (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/utils/core_ext.js

@@ -18,9 +18,9 @@
 
   String.prototype.slugify = function(sep) {
     if (typeof sep == 'undefined') sep = '_';
-    var alphaNumRegexp = new RegExp('[^a-zA-Z0-9\\' + sep + ']', 'g');
+    var alphaNumRegexp = new RegExp('[^\\w\\' + sep + ']', 'g');
     var avoidDuplicateRegexp = new RegExp('[\\' + sep + ']{2,}', 'g');
-    return this.replace(/\s/g, sep).replace(alphaNumRegexp, '').replace(avoidDuplicateRegexp, sep).toLowerCase()
+    return this.replace(/\s/g, sep).replace(alphaNumRegexp, '').replace(avoidDuplicateRegexp, sep).toLowerCase();
   }
 
   window.addParameterToURL = function(key, value, context) { // code from http://stackoverflow.com/questions/486896/adding-a-parameter-to-the-url-with-javascript

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

@@ -78,8 +78,10 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View
     form = @$('ol')
 
     if form.is(':hidden')
+      @$('a.toggle').addClass('open')
       form.slideDown()
     else
+      @$('a.toggle').removeClass('open')
       form.slideUp()
 
   show_error: (message) ->

data/app/assets/javascripts/locomotive/views/content_types/edit_view.coffee

@@ -11,5 +11,4 @@ class Locomotive.Views.ContentTypes.EditView extends Locomotive.Views.ContentTyp
 
         if custom_field.isNew() # assign an id for each new custom field
           custom_field.set id: data._id, _id: data._id
-          console.log(custom_field)
 

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

@@ -2,7 +2,35 @@
 
 Locomotive.Views.EditableElements ||= {}
 
-class Locomotive.Views.EditableElements.LongTextView extends Locomotive.Views.EditableElements.ShortTextView
+class Locomotive.Views.EditableElements.LongTextView extends Backbone.View
+
+  tagName: 'li'
+
+  className: 'text input html'
+
+  render: ->
+    $(@el).html(ich.editable_text_input(@model.toJSON()))
+
+    return @
+
+  after_render: ->
+    settings = _.extend {}, @tinymce_settings(),
+      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)
+
+    @$('textarea').tinymce(settings)
 
   tinymce_settings: ->
-    window.Locomotive.tinyMCE.defaultSettings
+    window.Locomotive.tinyMCE.defaultSettings
+
+  refresh: ->
+    # do nothing
+
+  remove: ->
+    @$('textarea').tinymce().destroy()
+    super

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

@@ -4,31 +4,19 @@ class Locomotive.Views.EditableElements.ShortTextView extends Backbone.View
 
   tagName: 'li'
 
-  className: 'text input html'
+  className: 'text input short'
 
   render: ->
     $(@el).html(ich.editable_text_input(@model.toJSON()))
 
+    @$('textarea').bind 'keyup', (event) =>
+      input = $(event.target)
+      @model.set(content: input.val())
+
     return @
 
   after_render: ->
-    settings = _.extend {}, @tinymce_settings(),
-      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)
-
-    @$('textarea').tinymce(settings)
-
-  tinymce_settings: ->
-    window.Locomotive.tinyMCE.minimalSettings
-
-  refresh: ->
     # do nothing
 
-  remove: ->
-    @$('textarea').tinymce().destroy()
-    super
+  refresh: ->
+    # do nothing

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

@@ -26,15 +26,13 @@ class Locomotive.Views.InlinEditor.ApplicationView extends Backbone.View
     iframe = @iframe
 
     iframe.load =>
-      console.log('iframe loading')
-
       if @_$('meta[name=inline-editor]').size() > 0
         # bind the resize event. When the iFrame's size changes, update its height
-        iframe_content = iframe.contents().find('body')
+        iframe_content = iframe.contents()
         iframe_content.resize ->
           elem = $(this)
 
-          if elem.outerHeight(true) > $('body').outerHeight(true) # Resize the iFrame.
+          if elem.outerHeight(true) > iframe.outerHeight(true) # Resize the iFrame.
             iframe.css height: elem.outerHeight(true)
 
         # Resize the iFrame immediately.
@@ -46,8 +44,6 @@ class Locomotive.Views.InlinEditor.ApplicationView extends Backbone.View
         @enhance_iframe_links()
 
   set_page: (attributes) ->
-    console.log('set_page')
-
     @page = new Locomotive.Models.Page(attributes)
 
     @toolbar_view.model = @page

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

@@ -13,8 +13,6 @@ class Locomotive.Views.InlinEditor.ToolbarView extends Backbone.View
   render: ->
     super
 
-    console.log('render toolbar')
-
     @enable_editing_mode_checkbox()
 
     @enable_content_locale_picker()
@@ -22,8 +20,6 @@ class Locomotive.Views.InlinEditor.ToolbarView extends Backbone.View
     @
 
   notify: (aloha_editable) ->
-    console.log('editable_element has been modified...')
-
     window.bar = aloha_editable
 
     element_id  = aloha_editable.obj.attr('data-element-id')
@@ -125,8 +121,6 @@ class Locomotive.Views.InlinEditor.ToolbarView extends Backbone.View
     context.find('span.text').html(values[1])
 
   refresh: ->
-    console.log('refreshing toolbar...')
-
     @$('h1').html(@model.get('title')).removeClass()
 
     if @$('.editing-mode input[type=checkbox]').is(':checked')

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

@@ -116,7 +116,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
           @$('li#page_slug_input').show()
           @$('li#page_templatized_input, li#page_target_klass_name_input').hide()
         else
-          @$('li#page_templatized_input, li#page_target_klass_name_input').show()
+          @$('li#page_templatized_input').show() unless @model.get('redirect')
 
   enable_response_type_select: ->
     @$('li#page_response_type_input').change (event) =>

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

@@ -5,10 +5,14 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
   save: (event) ->
     event.stopPropagation() & event.preventDefault()
 
+    form = $(event.target).trigger('ajax:beforeSend')
+
     @clear_errors()
 
     @model.save {},
       success: (model, response, xhr) =>
+        form.trigger('ajax:complete')
+
         model._normalize()
 
         if model.get('template_changed') == true
@@ -17,9 +21,8 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
           @refresh_editable_elements()
 
       error: (model, xhr) =>
+        form.trigger('ajax:complete')
+
         errors = JSON.parse(xhr.responseText)
 
         @show_errors errors
-
-
-

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

@@ -16,6 +16,9 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     # allow users to save with CTRL+S or CMD+s
     @enable_save_with_keys_combination()
 
+    # enable form notifications
+    @enable_form_notifications()
+
     return @
 
   save: (event) ->
@@ -24,6 +27,8 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
   save_in_ajax: (event, options) ->
     event.stopPropagation() & event.preventDefault()
 
+    form = $(event.target).trigger('ajax:beforeSend')
+
     @clear_errors()
 
     options ||= { headers: {}, on_success: null, on_error: null }
@@ -33,11 +38,15 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     @model.save {},
       headers: options.headers
       success: (model, response, xhr) =>
+        form.trigger('ajax:complete')
+
         model.attributes = previous_attributes
 
         options.on_success(response, xhr) if options.on_success
 
       error: (model, xhr) =>
+        form.trigger('ajax:complete')
+
         errors = JSON.parse(xhr.responseText)
 
         @show_errors errors
@@ -72,7 +81,10 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
         content.slideUp 100, -> parent.addClass('folded')
 
   enable_save_with_keys_combination: ->
-    $.cmd 'S', (() => @$('form').trigger('submit')), [], ignoreCase: true
+    $.cmd 'S', (() => @$('form input[type=submit]').trigger('click')), [], ignoreCase: true
+
+  enable_form_notifications: ->
+    @$('form').formSubmitNotification()
 
   after_inputs_fold: ->
     # overide this method if necessary

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

@@ -7,7 +7,7 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
   _lists_views: []
 
   initialize: ->
-    _.bindAll(@, 'add_asset')
+    _.bindAll(@, 'insert_asset')
 
   render: ->
     @build_uploader()
@@ -29,16 +29,24 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
     input = form.find('input[type=file]')
     link  = form.find('a.new')
 
+    form.formSubmitNotification()
+
     link.bind 'click', (event) ->
       event.stopPropagation() & event.preventDefault()
       input.click()
 
     input.bind 'change', (event) =>
+      form.trigger('ajax:beforeSend')
       _.each event.target.files, (file) =>
         asset = new Locomotive.Models.ThemeAsset(source: file)
-        asset.save {}, success: @add_asset, headers: { 'X-Flash': true }
-
-  add_asset: (model) ->
+        asset.save {},
+          success:  (model, response, xhr) =>
+            form.trigger('ajax:complete')
+            @insert_asset(model)
+          error:    (() => form.trigger('ajax:complete'))
+          headers:  { 'X-Flash': true }
+
+  insert_asset: (model) ->
     list_view = @pick_list_view(model.get('content_type'))
     list_view.collection.add(model)
 

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

@@ -314,6 +314,29 @@ ul.list {
   }
 }
 
+/* ___ form notification ___ */
+
+#form-submit-notification {
+  position: fixed;
+  top: 0px;
+  right: 0px;
+  z-index: 9999;
+
+  > div {
+    padding: 5px 10px;
+
+    background-color: #fffbe5;
+    border-left: 4px solid #efe4a5;
+    border-bottom: 4px solid #efe4a5;
+
+    text-align: center;
+    @include single-text-shadow(rgba(255, 255, 255, 1), 0px, 1px, 0px);
+    font-weight: bold;
+    font-size: 12px;
+    color: #aa9a79;
+  }
+}
+
 /* ___ paragraph (for help for example) ___ */
 
 p span.code {

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

@@ -157,6 +157,10 @@ form.formtastic {
               &:hover {
                 background-image: image-url("locomotive/list/icons/toggle.png");
               }
+              &.open {
+                @include rotate(180deg);
+              }
+              @include single-transition(transform, 0.5s);
             }
 
             &.drag {
@@ -291,6 +295,17 @@ form.formtastic {
           }
         } // li.string, li.password
 
+        &.text {
+
+          &.short textarea {
+            padding: 5px;
+            height: 28px;
+            width: 696px;
+            overflow-y: hidden;
+          }
+
+        } // li.text
+
         &.locale, &.locales {
           .list {
             margin-left: 150px;

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

@@ -176,7 +176,7 @@ body {
         }
       }
 
-      input[type=submit] {
+      input[type=submit], button[type=submit] {
         @include light-button;
       }
 

data/app/mailers/locomotive/notifications.rb

@@ -4,7 +4,7 @@ module Locomotive
     default :from => Locomotive.config.mailer_sender
 
     def new_content_entry(account, entry)
-      @account, @entry, @type = account, entry.to_presenter, entry.content_type
+      @account, @entry, @type = account, entry, entry.content_type
 
       subject = t('locomotive.notifications.new_content_entry.subject', :type => @type.name, :locale => account.locale)
 

data/app/models/locomotive/content_entry.rb

@@ -146,7 +146,7 @@ module Locomotive
       return if !self.content_type.public_submission_enabled? || self.content_type.public_submission_accounts.blank?
 
       self.site.accounts.each do |account|
-        next unless self.content_type.public_submission_accounts.include?(account._id)
+        next unless self.content_type.public_submission_accounts.map(&:to_s).include?(account._id.to_s)
 
         Locomotive::Notifications.new_content_entry(account, self).deliver
       end

data/app/models/locomotive/extensions/site/locales.rb

@@ -10,8 +10,12 @@ module Locomotive
           ## fields ##
           field :locales, :type => 'RawArray', :default => []
 
+          ## validations ##
+          validate :can_not_remove_default_locale
+
           ## callbacks ##
-          after_validation :add_default_locale
+          after_validation  :add_default_locale
+          before_update     :verify_localized_default_pages_integrity
 
         end
 
@@ -48,6 +52,10 @@ module Locomotive
           self.locales.first || Locomotive.config.site_locales.first
         end
 
+        def default_locale_was
+          self.locales_was.first || Locomotive.config.site_locales.first
+        end
+
         def locale_fallbacks(locale)
           [locale.to_s] + (locales - [locale.to_s])
         end
@@ -58,6 +66,29 @@ module Locomotive
           self.locales = [Locomotive.config.site_locales.first] if self.locales.blank?
         end
 
+        def can_not_remove_default_locale
+          if self.persisted? && !self.locales.include?(self.default_locale_was)
+            self.errors.add :locales, I18n.t(:default_locale_removed, :scope => [:errors, :messages, :site])
+          end
+        end
+
+        def verify_localized_default_pages_integrity
+          if self.persisted? && self.locales_changed?
+            self.pages.where(:"slug.#{self.default_locale_was}".in => %w(index 404), :depth => 0).each do |page|
+              modifications = { 'title' => {}, 'slug' => {} }
+
+              self.locales.each do |locale|
+                slug = page.attributes['slug'][self.default_locale_was]
+
+                modifications['slug'][locale]  = slug
+                modifications['title'][locale] = page.attributes['title'][locale] || ::I18n.t("attributes.defaults.pages.#{slug}.title", :locale => locale)
+              end
+
+              page.collection.update({ :_id => page._id }, { '$set' => modifications })
+            end
+          end
+        end
+
       end
 
     end