locomotive_cms 2.4.1 → 2.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056a1926af08cec148104a15758876016a135d9e
-  data.tar.gz: 3ff975e241eebd6b02dea709ef718c772e9008a3
+  metadata.gz: f6b5fd84b77a2c1027f2f3a0ef2ff655bc31f775
+  data.tar.gz: 884301132a77dc7822611d9291582d7688f3afc2
 SHA512:
-  metadata.gz: 9c39801b29f1a9d1cec5d07dfdaab516e95ee3a26f5f0257ab7f548dc1580f010de21dcf61114853ea557735a02c190695bdd082c55805dc04825133d6e67cad
-  data.tar.gz: 4a24a6c374c4f15fccc56090d4d180b14a3365958b68bbc41cb19d2cb173ef82ae6287159eec444bfef0044de4602eca5a8cb7ab779d5aa30f85b2ebf39a42a1
+  metadata.gz: cd423925ab81601ff850d0d784d7b34ac48cf70509c8a9b2b2fbb19ef45721c0ba35b30673d37c914586c73fa8d7b66877067f5034aac529370e7c91e11634fa
+  data.tar.gz: 3bdfce2c8125d5e1690ebe4f266bc50a0a1603de461692c61299f920ee2ecdd82c44a86b1ac602283ee670569a3b7a62b34161ec8cefdbf591d3670dd2e83df5

data/Gemfile

@@ -34,7 +34,7 @@ group :development do
   gem 'thor'
   gem 'github_api'
 
-  gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
+  gem 'unicorn-rails' # Using unicorn_rails instead of webrick (default server)
 
 end
 

data/README.textile

@@ -27,9 +27,9 @@ h2. Gems
 
 Here is a short list of main gems / technologies used in the application.
 
-* Ruby 2.0
-* Rails 3.2.16 (Rails 4.0 planned for the beginning of 2014)
-* Mongoid 3.1.3 (with MongoDB 2.x)
+* Ruby 2.x
+* Rails 3.2.17 (Rails 4.0 planned for the beginning of 2014)
+* Mongoid 3.1.5 (with MongoDB 2.x)
 * Liquid
 * Devise
 * Carrierwave

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

@@ -49,7 +49,7 @@ define(
         */
         insertLink: function(asset) {
           var range = Aloha.Selection.getRangeObject(),
-          linkText  = asset.get('filename'),
+          linkText  = asset.get('full_filename'),
           linkUrl   = asset.get('url'),
           linktag, newLink;
 

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

@@ -8,11 +8,17 @@ class Locomotive.Models.ContentAsset extends Backbone.Model
     @prepare()
 
   prepare: ->
+    @set(filename: @get('source').name.truncate(15)) if @get('uploading')
+
     @set
-      image:  @get('content_type') == 'image'
+      image:          @get('content_type') == 'image'
+      with_thumbnail: @get('content_type') == 'image' || @get('content_type') == 'pdf'
 
     return @
 
+  toJSONForSave: ->
+    { source: @get('source') }
+
 class Locomotive.Models.ContentAssetsCollection extends Backbone.Collection
 
   model: Locomotive.Models.ContentAsset

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', 'cs', 'bg']
+    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja', 'cs', 'bg', 'sk']
 
   sidebar:
     disabled: true

data/app/assets/javascripts/locomotive/utils/core_ext.js

@@ -10,7 +10,7 @@
 
   String.prototype.truncate = function(length) {
     if (this.length > length) {
-      return this.slice(0, length - 3) + "...";
+      return this.slice(0, length - 3) + '...';
     } else {
       return this;
     }

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

@@ -15,6 +15,18 @@ class Locomotive.Views.ContentAssets.PickerItemView extends Backbone.View
 
     return @
 
+  refresh: ->
+    $(@el).html(ich.content_asset(@model.toJSON()))
+
+  uploaded_at: (loaded, total) ->
+    percentage = (loaded / total) * 100
+
+    # for UI reasons, it's better to have it begin at 20%.
+    percentage = 20 if percentage < 20
+
+    # update the progress bar
+    @$('.uploading .progress-bar').css('width', "#{percentage}%")
+
   select_asset: (event) ->
     event.stopPropagation() & event.preventDefault()
     @on_select(@model)

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

@@ -6,45 +6,166 @@ class Locomotive.Views.ContentAssets.PickerView extends Locomotive.Views.Shared.
 
   number_items_per_row: 4
 
-  _item_views: []
+  page:                 1
+
+  per_page:             12
+
+  total_pages:          null
+
+  uploading:            false
+
+  _item_views:          []
+
+  events:
+    'click .btn':                 'toggle_filter_by_type'
+    'change input[name=query]':   'fetch_assets'
+
+  render: ->
+    super
+
+    @enable_dropzone()
+
+    @enable_infinite_scroll()
+
+    @
 
   template: ->
     ich.content_asset_picker
 
-  fetch_assets: ->
+  fetch_assets: (event) ->
     @_reset()
-    @collection.fetch
-      success: () =>
-        @open()
+    xhr = @collection.fetch
+      data:     @_fetch_options()
+      reset:    true
+      success:  => @open()
+
+    xhr.done => @_get_pagination_info(xhr)
+
+  toggle_filter_by_type: (event) ->
+    $(event.target).toggleClass('on')
+    @fetch_assets()
 
   build_uploader: (el, link) ->
     link.bind 'click', (event) ->
       event.stopPropagation() & event.preventDefault()
       el.click()
 
-    el.bind 'change', (event) =>
-      _.each event.target.files, (file) =>
-        asset = new Locomotive.Models.ContentAsset(source: file)
-        asset.save {},
-          headers:  { 'X-Flash': true }
-          success:  (model, response) => @collection.add(model.prepare())
-          error:    => @shake()
+    el.bind 'change', (event) => @_persist_files(event)
 
   add_asset: (asset, first) ->
     view = new Locomotive.Views.ContentAssets.PickerItemView model: asset, parent: @
 
     (@_item_views ||= []).push(view)
-    @$('ul.list .clear').before(view.render().el)
 
-    @_refresh()
+    if @uploading
+      @$('ul.list').prepend(view.render().el)
+      @_refresh()
+    else
+      @$('ul.list .clear').before(view.render().el)
+      @_refresh()
+      @_move_to_last_asset() unless first == true
+
+
+  enable_dropzone: ->
+    # make sure it works for the browser
+    return unless window.File && window.FileList && window.FileReader
+
+    dropzone = @$('ul.list').parent()
+
+    dropzone.on 'dragover',   (event) => @_stop_event(event); dropzone.addClass('hovered')
+    dropzone.on 'dragleave',  (event) => @_stop_event(event); dropzone.removeClass('hovered')
+    dropzone.on 'dragenter',  (event) => @_stop_event(event)
+    dropzone.on 'drop',       (event) =>
+      @_stop_event(event)
+      dropzone.removeClass('hovered')
+      @_persist_files(event)
+
+  enable_infinite_scroll: ->
+    $list = @$('ul.list')
+
+    $list.on 'scroll', (event) =>
+      clearTimeout(@throttle_timer) if @throttle_timer?
+
+      @throttle_timer = setTimeout =>
+        height = $list[0].scrollHeight - $list.innerHeight()
+        scroll = $list.scrollTop()
+
+        isScrolledToEnd = (scroll >= height)
 
-    @_move_to_last_asset() unless first == true
+        if isScrolledToEnd && @page < @total_pages
+          @page += 1
+          xhr = @collection.fetch
+            data: { page: @page, per_page: @per_page }
+            success: () =>
+              @_refresh()
+              $list.scrollTop(scroll)
+          xhr.done => @_get_pagination_info(xhr)
+      , 100
 
   remove_asset: (asset) ->
     view = _.find @_item_views, (tmp) -> tmp.model == asset
     view.remove() if view?
     @_refresh()
 
+  dialog_class: ->
+    'content-asset-picker-dialog'
+
+  _fetch_options: ->
+    _.tap { per_page: @per_page }, (options) =>
+      options.types = []
+
+      @$('.asset-types .btn.on').each ->
+        options.types.push $(this).data('type')
+
+      options.query = @$('input[name=query]').val()
+
+  _persist_files: (event) ->
+    files = event.target.files || event.originalEvent.dataTransfer.files
+
+    @_move_to_top()
+    @uploading = true
+
+    _.each files, (file) =>
+      # create a new asset
+      asset = new Locomotive.Models.ContentAsset(uploading: true, source: file)
+      @collection.add(asset.prepare(), at: 0)
+
+      # create the view at first
+      view = @_find_view_by_asset(asset)
+
+      # async save
+      asset.save {},
+        headers:  { 'X-Flash': true }
+        success:  (model, response) =>
+          asset.set(uploading: false)
+          asset.prepare()
+          view.refresh()
+        error:    => @shake()
+        progress: (loaded, total) => view.uploaded_at(loaded, total)
+
+    @uploading = false
+
+    # what's the total pages now ?
+    @_recalculate_pagination(_.size(files))
+
+  _recalculate_pagination: (number_assets_added) ->
+    previous_total_pages = @total_pages
+
+    # not on the last page ?
+    if @page < @total_pages
+      number_assets_to_delete = number_assets_added % @per_page
+
+      while number_assets_to_delete -= 1
+        @collection.pop()
+
+    # not a problem if the total pages is not super accurate because it will
+    # be recalculated at the next scroll
+    @total_entries  += number_assets_added
+    @total_pages    = Math.ceil(@total_entries / @per_page)
+
+    # move the current page to the new last one if we already were at the last page
+    @page = @total_pages if @page == previous_total_pages || previous_total_pages == 0
+
   _on_refresh: ->
     self = @
     @$('ul.list li.asset').each (index) ->
@@ -53,6 +174,19 @@ class Locomotive.Views.ContentAssets.PickerView extends Locomotive.Views.Shared.
       else
         $(@).removeClass('last')
 
+  _find_view_by_asset: (asset) ->
+    _.find @_item_views || [], (view) -> view.model.cid == asset.cid
+
+  _stop_event: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+  _get_pagination_info: (xhr) ->
+    @total_pages    = parseInt(xhr.getResponseHeader('X-Total-Pages'))
+    @per_page       = parseInt(xhr.getResponseHeader('X-Per-Page'))
+    @total_entries  = parseInt(xhr.getResponseHeader('X-Total-Entries'))
+
   _reset: ->
+    @page = 1
+    @total_pages = null
     _.each @_item_views || [], (view) -> view.remove()
     super()

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

@@ -28,10 +28,12 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
 
   create_dialog: ->
     @dialog ||= $(@el).dialog
-      autoOpen: false
-      modal:    true
-      zIndex:   window.application_view.unique_dialog_zindex()
-      width:    650,
+      autoOpen:     false
+      modal:        true
+      zIndex:       window.application_view.unique_dialog_zindex()
+      dialogClass:  @dialog_class()
+      width:        615
+      minHeight:    520
       create: (event, ui) =>
         $(@el).prev().find('.ui-dialog-title').html(@$('h2').html())
         @$('h2').remove()
@@ -46,6 +48,10 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
 
       open: (event, ui, extra) =>
         $(@el).dialog('overlayEl').bind 'click', => @close()
+        $(document.body).addClass('stop-scrolling')
+
+      close: (event, ui, extra) =>
+        $(document.body).removeClass('stop-scrolling')
 
   open: ->
     $(@el).dialog('open')
@@ -73,10 +79,16 @@ class Locomotive.Views.Shared.AssetPickerView extends Backbone.View
   remove_asset: (asset) ->
     # please overide remove_asset
 
+  dialog_class: ->
+    'asset-picker-dialog'
+
   _move_to_last_asset: ->
     limit = @$('ul.list li.clear').position()
     @$('ul.list').animate(scrollTop: limit.top, 100) if limit?
 
+  _move_to_top: ->
+    @$('ul.list').animate(scrollTop: 0, 100)
+
   _refresh: ->
     if @collection.length == 0
       @$('ul.list').hide() & @$('p.no-items').show()

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

@@ -89,7 +89,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
 
   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 = @$('form input[type=text]:focus, form input[type=password]:focus, form input[type=number]:focus, form textarea:focus')
     input.trigger('change') if input.size() > 0
 
   enable_save_with_keys_combination: ->

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

@@ -18,5 +18,5 @@ class Locomotive.Views.Shared.ListItemView extends Backbone.View
   remove_item: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm $(event.target).data('confirm')
+    if confirm $(event.target).closest('a').data('confirm')
       @model.destroy()

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

@@ -28,7 +28,7 @@
       } else {
         var html = ed.selection.getContent();
         if (html == '') {
-          html = asset.get('filename');
+          html = asset.get('full_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 });

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

@@ -175,4 +175,60 @@
   &:active {
     top: 1px;
   }
+}
+
+.button-groups {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+
+  .btn {
+    display: inline-block;
+    position: relative;
+    float: left;
+    white-space: nowrap;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    outline: none;
+    padding: 0px 5px;
+    margin: 0px;
+    margin-left: -1px;
+    border: 1px solid transparent;
+    color: #fff;
+
+    &:first-child {
+      @include border-top-left-radius(16px);
+      @include border-bottom-left-radius(16px);
+    }
+
+    &:last-child {
+      @include border-top-right-radius(16px);
+      @include border-bottom-right-radius(16px);
+    }
+
+    padding: 0px 12px 0px 12px;
+    line-height: 26px;
+    outline: none;
+    text-decoration: none;
+
+    color: #fff;
+    font-size: 12px;
+    font-weight: normal;
+    @include single-text-shadow(rgba(0, 0, 0, 1), 1px, 1px, 1px);
+
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.6);
+    @include box-shadow(rgba(255, 255, 255, 0.1) 0 1px 0 0 inset, rgba(255, 255, 255, 0.1) 0 1px 0 0);
+    @include background-image(linear-gradient(#303138, #1e1e24));
+
+    &.on, &:active {
+      border: 1px solid rgba(0, 0, 0, 0.4);
+      border-top: 1px solid rgba(0, 0, 0, 0.6);
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+      @include background-image(linear-gradient(#1e1e24, #212229));
+      @include box-shadow(rgba(0, 0, 0, 0) 0 1px 0 0 inset, rgba(255, 255, 255, 0.1) 0 1px 0 0);
+    }
+  }
 }

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

@@ -244,6 +244,12 @@ ul.list {
         left: 5px;
       }
 
+      span.content-type {
+        @include label;
+        top: -1px;
+        left: 5px;
+      }
+
       .more {
         position: absolute;
         top: 0px;