locomotive_cms 2.0.0.rc12 → 2.0.0

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

@@ -20,7 +20,7 @@ class Locomotive.Views.ContentEntries.IndexView extends Backbone.View
 
   call_sort: (folder) ->
     $.rails.ajax
-      url:        folder.attr('data-url')
+      url:        folder.data('url')
       type:       'post'
       dataType:   'json'
       data:

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

@@ -35,7 +35,10 @@ class Locomotive.Views.ContentTypes.FormView extends Locomotive.Views.Shared.For
     @$('#custom_fields_input').append(@custom_fields_view.render().el)
 
   slugify_name: ->
-    @$('#content_type_name').slugify(target: @$('#content_type_slug'), sep: '_')
+    @$('#content_type_name').slugify
+      target:     @$('#content_type_slug')
+      url:        window.permalink_service_url
+      underscore: true
 
   enable_liquid_editing: ->
     input = @$('#content_type_raw_item_template')

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

@@ -34,7 +34,7 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View
 
   enable_behaviours: ->
     required_input = @$('.required-input input[type=checkbox]')
-    required_input.checkToggle(on_label: required_input.attr('data-on-label'), off_label: required_input.attr('data-off-label'))
+    required_input.checkToggle(on_label: required_input.data('on-label'), off_label: required_input.data('off-label'))
     @$('li.input.toggle input[type=checkbox]').checkToggle()
     @render_select_options_view()
 
@@ -98,7 +98,7 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View
   remove: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm($(event.target).attr('data-confirm'))
+    if confirm($(event.target).data('confirm'))
       @$('.label-input input[type=text], .type-input select').editableField('destroy')
       super()
       @options.parent_view.remove_entry(@model, @)

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

@@ -51,6 +51,11 @@ class Locomotive.Views.ContentTypes.CustomFieldsView extends Backbone.View
     if labelInput.val() != ''
       custom_field = new Locomotive.Models.CustomField label: labelInput.val(), type: typeInput.val()
 
+      # slugify the name from the label asynchronously
+      params = { string: labelInput.val(), underscore: '1' }
+      $.getJSON window.permalink_service_url, params, (data, textStatus, jqXHR) ->
+        custom_field.set('name', data['value'])
+
       @model.get('entries_custom_fields').add(custom_field)
 
       @_insert_entry(custom_field)

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

@@ -4,9 +4,9 @@ class Locomotive.Views.ContentTypes.EditView extends Locomotive.Views.ContentTyp
 
   save: (event) ->
     @save_in_ajax event, on_success: (response, xhr) =>
+      @model._normalize()
 
       _.each response.entries_custom_fields, (data) =>
-
         custom_field = @model.get('entries_custom_fields').detect (entry) => entry.get('name') == data.name
 
         if custom_field.isNew() # assign an id for each new custom field

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

@@ -20,7 +20,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
   render: ->
     $(@el).html(ich.select_options_list())
 
-    @prompt_message = @$('> ul').attr('data-prompt')
+    @prompt_message = @$('> ul').data('prompt')
 
     @render_entries()
 
@@ -39,7 +39,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
 
   refresh_position_entries: ->
     @$('> ul li.entry').each (index, view_dom) =>
-      select_option = @collection.getByCid($(view_dom).attr('data-cid'))
+      select_option = @collection.getByCid($(view_dom).data('cid'))
       select_option.set position: index
 
   do_nothing: (event) ->
@@ -58,7 +58,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
 
     span          = $(event.target)
     view_dom      = span.closest('li')
-    select_option = @collection.getByCid(view_dom.attr('data-cid'))
+    select_option = @collection.getByCid(view_dom.data('cid'))
 
     if (name = prompt(@prompt_message, select_option.get('name'))) != ''
       select_option.set(name: name)
@@ -69,9 +69,9 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
 
     link          = $(event.target)
     view_dom      = link.closest('li')
-    select_option = @collection.getByCid(view_dom.attr('data-cid'))
+    select_option = @collection.getByCid(view_dom.data('cid'))
 
-    if confirm(link.attr('data-confirm'))
+    if confirm(link.data('confirm'))
       if select_option.isNew()
         @collection.remove(select_option)
       else
@@ -82,7 +82,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
   _insert_entry: (select_option) ->
     view_dom = ich.select_option_entry(select_option.toJSON())
 
-    view_dom.attr('data-cid', select_option.cid)
+    view_dom.data('cid', select_option.cid)
 
     @$('> ul').append(view_dom)
 

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

@@ -67,7 +67,8 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
         onChange: (editor) => @model.set(robots_txt: editor.getValue())
 
   save: (event) ->
-    if @model.includes_domain(window.location.host)
+    # if @model.includes_domain(window.location.host)
+    if !@model.get('subdomain') || @model.includes_domain(window.location.host)
       @save_in_ajax(event)
 
   show_error: (attribute, message, html) ->

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

@@ -62,7 +62,7 @@ class Locomotive.Views.EditableElements.EditAllView extends Backbone.View
       event.stopPropagation() & event.preventDefault()
 
       link  = $(event.target)
-      index = parseInt(link.attr('href').match(/block-(.+)/)[1])
+      index = parseInt(link.prop('href').match(/block-(.+)/)[1])
 
       @$('.wrapper ul li.block').hide()
       @$("#block-#{index}").show()

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

@@ -56,14 +56,14 @@ class Locomotive.Views.EditableElements.FileView extends Backbone.View
     event.stopPropagation() & event.preventDefault()
 
     button  = $(event.target)
-    label   = button.attr('data-alt-label')
+    label   = button.data('alt-label')
 
     unless @states[state]
       options.on_change()
     else
       options.on_cancel()
 
-    button.attr('data-alt-label', button.html())
+    button.data('alt-label', button.html())
 
     button.html(label)
 

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

@@ -57,12 +57,20 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
     @toolbar_view.refresh()
 
   enhance_iframe: ->
-    _window = @iframe[0].contentWindow
+    _window = @_window()
+
     _window.Aloha.settings.locale = window.locale
 
     # set main window title
     window.document.title = _window.document.title
 
+    # allow to hit the refresh button and still stay on the same page
+    window.history.replaceState('OBJECT', 'TITLE', _window.location.href.replace('_edit', '_admin'))
+
+    # only but dirty way to handle back buttons with webkit.
+    if $.browser.webkit
+      window.history.pushState('OBJECT', 'TITLE', _window.location.href.replace('_edit', '_admin'))
+
     # keep the user in the admin mode
     @enhance_iframe_links _window.Aloha.jQuery
 
@@ -71,25 +79,35 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
       @toolbar_view.notify editable.editable
 
   enhance_iframe_links: (_jQuery) ->
+    toolbar_view  = @toolbar_view
+    _jQuery       ||= @_$
+    _window       = @_window()
 
-    toolbar_view = @toolbar_view
-    _jQuery     ||= @_$
-
-    _jQuery('a').each ->
-      link  = _jQuery(this)
+    _jQuery('a[class!="ui-tabs-anchor"]').live 'click', (event) ->
+      link  = _jQuery(event.target)
       url   = link.attr('href')
+
       if url? && url.indexOf('#') != 0 && /^(www|http)/.exec(url) == null && /(\/_edit)$/.exec(url) == null && /^\/sites\//.exec(url) == null
-        url = '/index' if url == '/'
+        # change the url only if aloha is enabled
+        unless link.parents('div.editable-long-text, div.editable-short-text').hasClass('aloha-editable')
 
-        unless url.indexOf('_edit') > 0
-          if url.indexOf('?') > 0
-            link.attr('href', url.replace('?', '/_edit?'))
-          else
-            link.attr('href', "#{url}/_edit")
+          url = '/index' if url == '/'
 
-        link.bind 'click', ->
+          unless url.indexOf('_edit') > 0
+            if url.indexOf('?') > 0
+              url = url.replace('?', '/_edit?')
+            else
+              url = "#{url}/_edit"
+
+          # let the editor know that we are redirecting her/him to the target page
           toolbar_view.show_status 'loading'
-          window.history.pushState('Object', 'Title', link.attr('href').replace('_edit', '_admin'))
+
+          # redirection now !
+          link.attr('href', url)
+      else
+        # force the opening of a new window because we are in an iframe (security)
+        event.preventDefault()
+        window.open url
 
   unique_dialog_zindex: ->
     # returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
@@ -98,6 +116,9 @@ class Locomotive.Views.InlineEditor.ApplicationView extends Backbone.View
 
     1050 + window.Locomotive.jQueryModals++
 
+  _window: ->
+     @iframe[0].contentWindow
+
   _$: (selector) ->
-    $(selector, @iframe[0].contentWindow.document)
+    $(selector, @_window().document)
 

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

@@ -20,7 +20,7 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
     @
 
   notify: (aloha_editable) ->
-    element_id  = aloha_editable.obj.attr('data-element-id')
+    element_id  = aloha_editable.obj.data('element-id')
     @model.get('editable_elements').get(element_id).set
       content: aloha_editable.getContents()
 
@@ -44,7 +44,7 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
     previous_attributes = _.clone @model.attributes
 
     @model.save {},
-      success: (model, response, xhr) =>
+      success: (model, response) =>
         model.attributes = previous_attributes
         @$('.element-actions').hide()
         @show_editing_mode_block()
@@ -99,26 +99,40 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
       picker.toggle()
 
     picker.find('li').bind 'click', (event) =>
-      current   = @get_locale_attributes(link)
-      selected  = @get_locale_attributes($(event.target).closest('li'))
-
-      @set_locale_attributes(link, selected)
-      @set_locale_attributes($(event.target).closest('li'), current)
+      selected  = $(event.target).closest('li')
+      locale    = selected.find('span.text').html()
 
       picker.toggle()
 
-      window.content_locale = selected[1]
+      window.content_locale = locale
+
+      url = @model.get('localized_fullpaths')[locale]
+      url = 'index' if url == ''
+      url = "/#{url}/_edit"
+
+      _window.location.href = url
+
+  select_locale: (locale) ->
+    _window = @options.target[0].contentWindow
+    link    = @$('#content-locale-picker-link')
+    picker  = $('#content-locale-picker')
 
-      _window.location.href = '/' + @model.get('localized_fullpaths')[selected[1]] + '/_edit'
+    # get the information about the locale
+    entry  = picker.find("li[data-locale=#{locale}]")
+    image  = entry.find('img').attr('src')
+    label  = entry.find('span.text').html()
 
-  get_locale_attributes: (context) ->
-    [context.find('img').attr('src'), context.find('span.text').html()]
+    # refresh the current entry
+    link.find('img').attr('src', image)
+    link.find('span.text').html(label)
 
-  set_locale_attributes: (context, values) ->
-    context.find('img').attr('src', values[0])
-    context.find('span.text').html(values[1])
+    # refresh the list of locales
+    picker.find('li.selected').removeClass('selected')
+    entry.addClass('selected')
 
   refresh: ->
+    @select_locale(@model.get('lang'))
+
     @$('h1').html(@model.get('title')).removeClass()
 
     if @$('.editing-mode input[type=checkbox]').is(':checked')
@@ -127,3 +141,5 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
     @$('.element-actions').hide()
 
     @show_editing_mode_block()
+
+

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

@@ -7,9 +7,10 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
   el: '#content'
 
   events:
-    'change   #page_parent_id':     'change_page_url'
-    'click    a#image-picker-link': 'open_image_picker'
-    'submit':                       'save'
+    'change   #page_parent_id':       'change_page_url'
+    'click    a#image-picker-link':   'open_image_picker'
+    'click    a#copy-template-link':  'replace_template'
+    'submit':                         'save'
 
   initialize: ->
     _.bindAll(@, 'insert_image')
@@ -37,7 +38,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     # the url gets modified by different ways so reflect the changes in the UI
     @listen_for_url_changes()
 
-    # enable response type
+    # enable response type to be changed (xml, json, ...etc)
     @enable_response_type_select()
 
     # enable check boxes
@@ -65,6 +66,18 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     @editor.replaceSelection(text)
     @image_picker_view.close()
 
+  replace_template: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+    link = $(event.target).closest('a')
+
+    $.rails.ajax
+      url:       link.attr('href')
+      type:      'get'
+      dataType:  'json'
+      success:  (data) =>
+        @editor.setValue(data.raw_template)
+
   enable_liquid_editing: ->
     input = @$('#page_raw_template')
 
@@ -72,7 +85,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
       @editor = CodeMirror.fromTextArea input.get()[0],
         mode:             'liquid'
         autoMatchParens:  false
-        lineNumbers:      false
+        lineNumbers:      true
         passDelay:        50
         tabMode:          'shift'
         theme:            'default'
@@ -98,7 +111,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     @editable_elements_view.refresh()
 
   slugify_title: ->
-    @$('#page_title').slugify(target: @$('#page_slug'))
+    @$('#page_title').slugify(target: @$('#page_slug'), url: window.permalink_service_url)
     @$('#page_slug').bind 'change', ((event) => @touched_url = true)
 
   listen_for_url_changes: ->
@@ -106,7 +119,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
 
   change_page_url: ->
     $.rails.ajax
-      url:        @$('#page_slug').attr('data-url')
+      url:        @$('#page_slug').data('url')
       type:       'get'
       dataType:   'json'
       data:       { parent_id:  @$('#page_parent_id').val(), slug: @$('#page_slug').val() }
@@ -121,10 +134,10 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
   enable_response_type_select: ->
     @$('li#page_response_type_input').change (event) =>
       if $(event.target).val() == 'text/html'
-        @$('li#page_redirect_input, li#page_redirect_url_input').show()
+        @$('li#page_redirect_input, li#page_redirect_url_input, li#page_redirect_type_input').show()
       else
         @model.set redirect: false
-        @$('li#page_redirect_input, li#page_redirect_url_input').hide()
+        @$('li#page_redirect_input, li#page_redirect_url_input, li#page_redirect_type_input').hide()
 
   enable_templatized_checkbox: ->
     @_enable_checkbox 'templatized',
@@ -140,9 +153,9 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     @_enable_checkbox 'redirect',
       features:     ['templatized', 'cache_strategy']
       on_callback:  =>
-        @$('li#page_redirect_url_input').show()
+        @$('li#page_redirect_url_input, li#page_redirect_type_input').show()
       off_callback: =>
-        @$('li#page_redirect_url_input').hide()
+        @$('li#page_redirect_url_input, li#page_redirect_type_input').hide()
 
   enable_other_checkboxes: ->
     _.each ['published', 'listed'], (exp) =>

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

@@ -10,7 +10,7 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
     @clear_errors()
 
     @model.save {},
-      success: (model, response, xhr) =>
+      success: (model, response) =>
         form.trigger('ajax:complete')
 
         model._normalize()

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

@@ -12,7 +12,7 @@ class Locomotive.Views.Pages.ListView extends Backbone.View
     return @
 
   make_foldable: ->
-    @$('ul.folder img.toggler').toggleMe()
+    @$('ul.folder .toggler').toggleMe()
 
   make_sortable: ->
     self = @
@@ -24,7 +24,7 @@ class Locomotive.Views.Pages.ListView extends Backbone.View
 
   call_sort: (folder) ->
     $.rails.ajax
-      url:        folder.attr('data-url')
+      url:        folder.data('url')
       type:       'post'
       dataType:   'json'
       data:

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

@@ -16,7 +16,8 @@ class Locomotive.Views.Shared.Fields.FileView extends Backbone.View
     'click a.delete': 'toggle_delete'
 
   template: ->
-    ich["#{@options.name}_file_input"]
+    prefix = if @options.namespace? then "#{@options.namespace}_" else ''
+    ich["#{prefix}#{@options.name}_file_input"]
 
   render: ->
     url   = @model.get("#{@options.name}_url") || ''
@@ -31,7 +32,7 @@ class Locomotive.Views.Shared.Fields.FileView extends Backbone.View
       input = $(event.target)[0]
 
       if input.files?
-        name  = $(input).attr('name')
+        name  = $(input).prop('name')
         hash  = {}
         hash[name.replace("#{@model.paramRoot}[", '').replace(/]$/, '')] = input.files[0]
         @model.set(hash)
@@ -70,14 +71,14 @@ class Locomotive.Views.Shared.Fields.FileView extends Backbone.View
     event.stopPropagation() & event.preventDefault()
 
     button  = $(event.target)
-    label   = button.attr('data-alt-label')
+    label   = button.data('alt-label')
 
     unless @states[state]
       options.on_change()
     else
       options.on_cancel()
 
-    button.attr('data-alt-label', button.html())
+    button.data('alt-label', button.html())
 
     button.html(label)