locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

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

@@ -37,8 +37,10 @@ class Locomotive.Views.ContentAssets.EditImageView extends Backbone.View
     @$content.find('.apply-resizing-btn').on 'click', @apply_resizing
     @$content.find('.cancel-resizing-btn').on 'click', @cancel_resizing
 
+    container = if $('.drawer').size() > 0 then '.drawer' else '.main'
+
     @$link.popover
-      container:  '.main'
+      container:  container
       placement:  'left'
       content:    @$content
       html:       true

data/app/assets/javascripts/locomotive/views/dashboard/show_view.js.coffee

@@ -2,4 +2,36 @@ Locomotive.Views.Dashboard ||= {}
 
 class Locomotive.Views.Dashboard.ShowView extends Backbone.View
 
-  el: '#content'
+  el: '.main'
+
+  infinite_activity_button: 'a[data-behavior~=load-more]'
+
+  events:
+    'ajax:beforeSend  a[data-behavior~=load-more]': 'loading_activity_feed'
+    'ajax:success     a[data-behavior~=load-more]': 'refresh_activity_feed'
+
+  render: ->
+    super
+
+    # replace the img by the name of the file
+    @$('.assets img').error ->
+      $(this).parent().html($(this).attr('alt'))
+
+  loading_activity_feed: (event) -> $(event.target).button('loading')
+
+  refresh_activity_feed: (event, data, status, xhr) ->
+    $btn      = $(event.target).button('reset')
+    $last     = @$('.activity-feed > li:last-child')
+    $response = $(data)
+
+    # add new activity items
+    $response.find('.activity-feed > li').appendTo(@$('.activity-feed'))
+
+    # display or not the load more button
+    if ($new_btn = $response.find(@infinite_activity_button)).size() > 0
+      $btn.replaceWith($new_btn)
+    else
+      @$(@infinite_activity_button).hide()
+
+    # scroll to see the new items
+    $(@el).parent().animate scrollTop: $last.offset().top + 'px', 2000

data/app/assets/javascripts/locomotive/views/developers_documentation/show_view.js.coffee

@@ -0,0 +1,9 @@
+Locomotive.Views.DevelopersDocumentation ||= {}
+
+class Locomotive.Views.DevelopersDocumentation.ShowView extends Backbone.View
+
+  el: '.main'
+
+  render: ->
+    super()
+    hljs.initHighlightingOnLoad()

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

@@ -27,7 +27,9 @@ class Locomotive.Views.EditableElements.EditView extends Locomotive.Views.Shared
       dom_id    = $(view.el).attr('id')
       $new_el   = $html.find("##{dom_id}")
 
-      view.replace $new_el if $new_el.size() > 0
+      view.replace $new_el
+
+      view
 
   filter_elements_by: (block) ->
     @$('.editable-elements .form-group.input').each ->

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

@@ -19,6 +19,7 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
 
     view_options = if $('body').hasClass('live-editing') then {} else { el: '.main' }
 
+    @startup            = true
     @edit_view          = new Locomotive.Views.EditableElements.EditView(view_options)
     @pubsub_text_token  = PubSub.subscribe('inputs.text_changed', @refresh_text)
 
@@ -33,19 +34,18 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
 
   refresh_elements: (type, view, callback) ->
     $parent_view  = $(view.el).parent()
-    element_id    = $parent_view.find('input[name*="[humanized_id]"]').val().replace(/_/g, '-')
-    dom_id        = "locomotive-editable-#{type}-#{element_id}"
+    element_id    = $parent_view.find('input[name*="[id]"]').val()
 
     $iframe_document = $($('iframe')[0].contentWindow.document)
 
-    callback($iframe_document.find("##{dom_id}"), dom_id, $iframe_document)
+    callback($iframe_document.find("*[data-element-id=#{element_id}]"), element_id, $iframe_document)
 
   refresh_image_on_remove: (msg, data) ->
     data.url = $(data.view.el).parent().find('input[name*="[default_source_url]"]').val()
     @refresh_image(msg, data)
 
   refresh_image: (msg, data) ->
-    @refresh_elements 'image', data.view, ($elements, dom_id, $iframe_document) ->
+    @refresh_elements 'image', data.view, ($elements, element_id, $iframe_document) ->
       current_image_url = data.view.$('input[name*="[content]"]').val()
       image_url         = data.url || current_image_url
 
@@ -57,11 +57,11 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
             $(this).css("background-image", "url('" + image_url + "')")
       else
         # looking for DIVs with background-url property matching the previous image url
-        $el = $iframe_document.find("*[style*='#{current_image_url}']").attr('id', dom_id)
+        $el = $iframe_document.find("*[style*='#{current_image_url}']").attr('data-element-id', element_id)
         $el.css("background-image", "url('" + image_url + "')")
 
         # looking for IMGs with src attribute matching the previous image url
-        $el = $iframe_document.find("img[src*='#{current_image_url}']").attr('id', dom_id)
+        $el = $iframe_document.find("img[src*='#{current_image_url}']").attr('data-element-id', element_id)
         $el.attr('src', image_url)
 
   refresh_text: (msg, data) ->
@@ -86,11 +86,11 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     # store the url
     @preview_url = $('.preview iframe')[0].contentWindow.document.location.href
 
-    if editable_elements_path?
-      unless editable_elements_path == (window.location.pathname + window.location.search)
-        History.replaceState({ live_editing: true, url: @preview_url }, '', editable_elements_path)
-
-        @replace_edit_view(editable_elements_path)
+    if editable_elements_path? && @startup == false
+      History.replaceState({ live_editing: true, url: @preview_url }, '', editable_elements_path)
+      @replace_edit_view(editable_elements_path)
+    else
+      @startup = false
 
   replace_edit_view: (url) ->
     $(@edit_view.el).load url, =>

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

@@ -0,0 +1,16 @@
+Locomotive.Views.Inputs ||= {}
+
+class Locomotive.Views.Inputs.TextView extends Backbone.View
+
+  events:
+    'change input[type=text]':  'content_change'
+    'paste input[type=text]':   'content_change'
+    'keyup input[type=text]':   'content_change'
+    'change textarea':          'content_change'
+    'paste textarea':           'content_change'
+    'keyup textarea':           'content_change'
+
+  content_change: (event) ->
+    PubSub.publish 'inputs.text_changed',
+      view:     @
+      content:  $(event.target).val()

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

@@ -13,161 +13,3 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     @$('#page_redirect').on 'switchChange.bootstrapSwitch', (event, state) ->
       $inputs = $('.locomotive_page_redirect_url, .locomotive_page_redirect_type')
       $inputs.toggleClass('hide')
-
-
-
-#   events:
-#     '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')
-
-#     @model = new Locomotive.Models.Page(@options.page)
-
-#     @touched_url = false
-
-#     @image_picker_view = new Locomotive.Views.ThemeAssets.ImagePickerView
-#       collection: new Locomotive.Models.ThemeAssetsCollection()
-#       on_select:  @insert_image
-
-#     @image_picker_view.render()
-
-#     Backbone.ModelBinding.bind @
-
-#     @editable_elements_view = new Locomotive.Views.EditableElements.EditAllView(collection: @model.get('editable_elements'))
-
-#   render: ->
-#     super()
-
-#     # slugify the slug field from title
-#     @slugify_title()
-
-#     # the url gets modified by different ways so reflect the changes in the UI
-#     @listen_for_url_changes()
-
-#     # enable response type to be changed (xml, json, ...etc)
-#     @enable_response_type_select()
-
-#     # enable check boxes
-#     @enable_templatized_checkbox()
-
-#     @enable_redirect_checkbox()
-
-#     @enable_other_checkboxes()
-
-#     # liquid code textarea
-#     @enable_liquid_editing()
-
-#     # editable elements
-#     @render_editable_elements()
-
-#     return @
-
-#   open_image_picker: (event) ->
-#     event.stopPropagation() & event.preventDefault()
-#     @image_picker_view.editor = @editor
-#     @image_picker_view.fetch_assets()
-
-#   insert_image: (path) ->
-#     text = "{{ '#{path}' | theme_image_url }}"
-#     @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')
-
-#     if input.size() > 0
-#       @editor = CodeMirror.fromTextArea input.get()[0],
-#         mode:             'liquid'
-#         autoMatchParens:  false
-#         lineNumbers:      true
-#         passDelay:        50
-#         tabMode:          'shift'
-#         theme:            'default'
-
-#       @editor.on 'change', (editor, change) => @model.set(raw_template: editor.getValue())
-
-#   after_inputs_fold: ->
-#     @editor.refresh() if @editor?
-
-#   render_editable_elements: ->
-#     @$('.formtastic fieldset.inputs:first').before(@editable_elements_view.render().el)
-#     @editable_elements_view.after_render()
-
-#   # Remove the editable elements and rebuild them
-#   reset_editable_elements: ->
-#     @editable_elements_view.remove()
-#     @editable_elements_view.collection = @model.get('editable_elements')
-#     @render_editable_elements()
-
-#   # Just re-connect the model and the views (+ redraw the file fields)
-#   refresh_editable_elements: ->
-#     @editable_elements_view.unbind_model()
-#     @editable_elements_view.collection = @model.get('editable_elements')
-#     @editable_elements_view.refresh()
-
-#   slugify_title: ->
-#     @$('#page_title').slugify(target: @$('#page_slug'), url: window.permalink_service_url)
-#     @$('#page_slug').bind 'change', ((event) => @touched_url = true)
-
-#   listen_for_url_changes: ->
-#     setInterval (=> (@change_page_url() & @touched_url = false) if @touched_url), 1200
-
-#   change_page_url: ->
-#     $.rails.ajax
-#       url:        @$('#page_slug').data('url')
-#       type:       'get'
-#       dataType:   'json'
-#       data:       { parent_id:  @$('#page_parent_id').val(), slug: @$('#page_slug').val() }
-#       success:    (data) =>
-#         @$('#page_slug_input .inline-hints').html(data.url).effect('highlight')
-#         if data.templatized_parent
-#           @$('li#page_slug_input').show()
-#           @$('li#page_templatized_input, li#page_target_klass_name_input').hide()
-#         else
-#           @$('li#page_templatized_input').show() unless @model.get('redirect')
-
-#   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, li#page_redirect_type_input').show()
-#       else
-#         @model.set redirect: false
-#         @$('li#page_redirect_input, li#page_redirect_url_input, li#page_redirect_type_input').hide()
-
-#   enable_templatized_checkbox: ->
-#     @_enable_checkbox 'templatized',
-#       features:     ['slug', 'redirect', 'listed']
-#       on_callback:  =>
-#         @$('li#page_target_klass_name_input').show()
-#       off_callback: =>
-#         @$('li#page_target_klass_name_input').hide()
-
-#     @$('li#page_templatized_input').hide() if @model.get('templatized_from_parent') == true
-
-#   enable_redirect_checkbox: ->
-#     @_enable_checkbox 'redirect',
-#       features:     ['templatized', 'cache_strategy']
-#       on_callback:  =>
-#         @$('li#page_redirect_url_input, li#page_redirect_type_input').show()
-#       off_callback: =>
-#         @$('li#page_redirect_url_input, li#page_redirect_type_input').hide()
-
-#   enable_other_checkboxes: ->
-#     @$('li.toggle input[type=checkbox].simple-toggle').checkToggle()
-#     @$('li.toggle.simple-toggle input[type=checkbox]').checkToggle()

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

@@ -5,44 +5,3 @@ Locomotive.Views.Pages ||= {}
 class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
 
   el: '.main'
-
-# Locomotive.Views.Pages ||= {}
-
-# 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()
-
-#     # store the previous editable elements in case we
-#     # need to use the content of these elements for
-#     # the new ones (same block and slug).
-#     editable_elements = _.clone @model.get('editable_elements')
-
-#     @model.save {},
-#       success: (model, response) =>
-#         form.trigger('ajax:complete')
-
-#         model._normalize()
-
-#         if model.get('template_changed') == true
-#           model.get('editable_elements').update_content_from(editable_elements)
-#           @reset_editable_elements()
-#         else
-#           @refresh_editable_elements()
-
-#         # refresh the show link
-#         fullpath = @model.get('localized_fullpaths')[window.content_locale]
-#         @$('#local-actions-bar > a.show').attr('href', "/#{fullpath}")
-
-#       error: (model, xhr) =>
-#         form.trigger('ajax:complete')
-
-#         errors = JSON.parse(xhr.responseText)
-
-#         @show_errors errors

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

@@ -0,0 +1,7 @@
+#= require ../shared/form_view
+
+Locomotive.Views.PublicSubmissionAccounts ||= {}
+
+class Locomotive.Views.PublicSubmissionAccounts.EditView extends Locomotive.Views.Shared.FormView
+
+  el: '.main'

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

@@ -6,12 +6,12 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
 
   namespace: null
 
-  inputs: []
-
   events:
     'submit form': 'save'
 
   render: ->
+    @inputs = []
+
     @display_active_nav()
 
     @enable_hover()
@@ -21,6 +21,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     @enable_toggle_inputs()
     @enable_date_inputs()
     @enable_datetime_inputs()
+    @enable_text_inputs()
     @enable_rte_inputs()
     @enable_tags_inputs()
     @enable_document_picker_inputs()
@@ -95,6 +96,13 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
         useseconds: false
         format: $(@).data('format')
 
+  enable_text_inputs: ->
+    self = @
+    @$('.input.text').each ->
+      view = new Locomotive.Views.Inputs.TextView(el: $(@))
+      view.render()
+      self.inputs.push(view)
+
   enable_rte_inputs: ->
     self = @
     @$('.input.rte').each ->
@@ -116,7 +124,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
       self.inputs.push(view)
 
   remove: ->
-    _.each @inputs.each, (view) -> view.remove()
+    _.each @inputs, (view) -> view.remove()
     @$('.input.tags input[type=text]').tagsinput('destroy')
     @$('.input.select select').select2('destroy')
 

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

@@ -34,7 +34,9 @@ class Locomotive.Views.Shared.ListView extends Backbone.View
       error:      @.on_failed_sort
 
   on_successful_sort: (data, status, xhr) ->
-    # $.growl('success', decodeURIComponent $.parseJSON xhr.getResponseHeader('X-Message'))
+    message = xhr.getResponseHeader('X-Message')
+    Locomotive.notify decodeURIComponent($.parseJSON(message)), 'success'
 
   on_failed_sort: (data, status, xhr) ->
-    # $.growl('error', decodeURIComponent $.parseJSON xhr.getResponseHeader('X-Message'))
+    message = if _.isObject(xhr) then $.parseJSON(xhr.getResponseHeader('X-Message')) else xhr
+    Locomotive.notify decodeURIComponent(message), 'danger'

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

@@ -0,0 +1,5 @@
+Locomotive.Views.Translations ||= {}
+
+class Locomotive.Views.Translations.IndexView extends Backbone.View
+
+  el: '.main'

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

@@ -4,6 +4,7 @@
 //= require locomotive/bootstrap-switch
 //= require locomotive/bootstrap-datetimepicker
 //= require locomotive/bootstrap-tagsinput
+//= require locomotive/highlightjs/github
 
 @import "font-awesome-sprockets";
 @import "font-awesome";
@@ -30,6 +31,9 @@
 @import "components/main";
 @import "components/list";
 @import "components/content_assets";
+@import "components/translations";
 @import "components/live_editing";
+@import "components/activity_feed";
+@import "components/developers";
 
 @import "components/sites";