para 0.5.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19583a8f81d13b5d13e77b3ad1da83c9d9d8eae0
-  data.tar.gz: e45edc3103747e6d25ca80921f93f72552b21b2b
+  metadata.gz: 194f93e32421619179ac7bbe6ecafbca1956e001
+  data.tar.gz: 61742c2210cd54cb7081657d87bd811ee543b5cc
 SHA512:
-  metadata.gz: a7ddf6fe3c253d66a3bc6804e27ca1b849e1bb1dcb7d54d40e892d6d95b35ce806a3a24740d2d590acfde5bcd538bde20baaf2efef3bcdc52254c27c4f20117e
-  data.tar.gz: da666593dfbcc85b37e87d8fc25345486ae0875b8e144dbd7da7a5e719a86b2a64cde7f535ec445c7c48668375f9bf5c33c2767c15bc0e00d28f4e9802c93392
+  metadata.gz: 2ef54e425e19c33d6f202c6cf0615393027be98198428d53b8c656ada2d3bfc76c739b721ce8b953a9062cbd207feef849e6b6bc33ff835171135af44b60ef35
+  data.tar.gz: 2940b7949484eb38d9c0006da8b3722383767a19373eeab8bce0cc2b41a66a499edcdc0f9a38215c0d6b9492ca2f6902dc9f1733f96b85b75889408f840aabe0

data/app/assets/javascripts/para/admin/async-progress.coffee

@@ -0,0 +1,29 @@
+class Para.AsyncProgress extends Vertebra.View
+  initialize: (options) ->
+    @targetUrl = options.progressUrl || @$el.data('async-progress-url')
+    @$progressBar = @$el.find('.progress-bar')
+    @trackProgress()
+
+  trackProgress: =>
+    $.get(@targetUrl).done(@onTrackingDataReceived).fail(@onJobError)
+
+  stop: ->
+    clearTimeout(@progressTimeout)
+
+  onTrackingDataReceived: (data) =>
+    if data.status is 'completed' then @completed() else @setProgress(data.progress)
+
+  setProgress: (progress) ->
+    @$progressBar.css(width: "#{ progress }%")
+    @progressTimeout = setTimeout(@trackProgress, 1500)
+    @trigger('progress')
+
+  completed: ->
+    @$progressBar.css(width: "100%")
+    @$progressBar.removeClass('progress-bar-striped').addClass('progress-bar-success')
+    @trigger('completed')
+
+  onJobError: =>
+    @$progressBar.css(width: "100%")
+    @$progressBar.removeClass('progress-bar-striped').addClass('progress-bar-error')
+    @trigger('failed')

data/app/assets/javascripts/para/admin/filters-form.coffee

@@ -6,6 +6,6 @@ class FiltersForm
   onChange: =>
     @$el.submit()
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   $('[data-filters-form]').each (i, el) ->
     new FiltersForm($el: $(el))

data/app/assets/javascripts/para/admin/importers.coffee

@@ -0,0 +1,38 @@
+class Para.Importer extends RemoteModalForm
+  initialize: (options = {}) ->
+    super(options)
+    @refreshOnClose = false
+
+  formSuccess: (e, response) ->
+    super(e, response)
+
+    if ($progressBar = @$el.find('[data-async-progress]')).length
+      @trackProgress($progressBar)
+
+  trackProgress: ($progressBar) ->
+    @importStatusURL = @$el.data('import-status-url')
+    @progress = new Para.AsyncProgress(el: $progressBar, progressUrl: @importStatusURL)
+    @listenTo(@progress, 'completed', @onImportComplete)
+    @listenTo(@progress, 'failed', @onImportComplete)
+
+  onImportComplete: ->
+    $.ajax(
+      url: @importStatusURL
+      # Force HTTP ACCEPT header to HTML since Rails treats XHR request without
+      # a specific ACCEPT header as JS or JSON by defaut.
+      accepts:
+        'html': 'text/html'
+      dataType: 'html'
+    ).done(@onFinalModalLoaded)
+
+  onFinalModalLoaded: (response) =>
+    @formSuccess(null, response)
+    @refreshOnClose = true
+
+  modalHide: ->
+    super()
+    @progress?.stop()
+
+$(document).on 'page:change turbolinks:load', ->
+  $('body').on 'ajax:success', '[data-importer-button]', (e, response) ->
+      new Para.Importer(modalMarkup: response, $link: $(e.currentTarget))

data/app/assets/javascripts/para/admin/table.coffee

@@ -41,6 +41,6 @@ class Para.ResourceTable
   orderUpdated: ->
     # TODO: Add flash message to display ordering success
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   $('.para-component-relation-table').each (i, el) ->
     new Para.ResourceTable($(el))

data/app/assets/javascripts/para/admin/tabs.coffee

@@ -17,5 +17,5 @@ class Para.Tabs
   $: (args...) ->
     $.fn.find.apply(@$el, args)
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   $('[data-form-tabs]').each (i, el) -> new Para.Tabs(el: el)

data/app/assets/javascripts/para/admin/theme_actions.coffee

@@ -11,7 +11,7 @@ responsive_sidebar_navigation = ->
   $('.component-item').on 'click', 'a', (e) ->
     scrollToComponentSection($(e.currentTarget), 150)
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   responsive_sidebar_navigation()
 
   $(".selectize-tags").selectize

data/app/assets/javascripts/para/admin/tree.coffee

@@ -38,16 +38,16 @@ class Para.ResourceTree
     data = {}
     $(".node").each (index) ->
       $this = $(this)
-      data[index] = { 
-        id: $this.data("id"), 
-        position: index, 
-        parent_id: $this.parent().parent().data("id") 
+      data[index] = {
+        id: $this.data("id"),
+        position: index,
+        parent_id: $this.parent().parent().data("id")
       }
     data
 
   orderUpdated: ->
     # TODO: Add flash message to display ordering success
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   $('.root-tree').each (i, el) ->
     new Para.ResourceTree($(el))

data/app/assets/javascripts/para/admin.coffee

@@ -2,12 +2,13 @@
 #= require jquery_ujs
 #= require turbolinks
 #= require bootstrap
-#= require selectize
+#= require vertebra
 #= require jasny.bootstrap.min
 #= require simple_form_extension
 #= require jquery.scrollto
 #= require html5-sortable
 #= require cocoon
+#= require jquery.remote-modal-form
 #= require_self
 #= require_tree ./lib
 #= require_tree ./inputs

data/app/assets/javascripts/para/inputs/nested_many.coffee

@@ -54,5 +54,5 @@ class Para.NestedManyField
     $target.find('input, textarea, select').eq('0').focus()
 
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   $('.nested-many-field').each (i, el) -> new Para.NestedManyField($(el))

data/app/assets/javascripts/para/lib/remote-file-forms.coffee

@@ -0,0 +1,60 @@
+# This class handles rails' remote form 'ajax:aborted:file' event to serialize
+# forms with files and send them through ajax using the `FormData` HTML5
+# feature.
+#
+# The general approach and request implementation respects the same lifecycle
+# of original rails' remote form requests, to allow existing handling code
+# to run without any modification.
+#
+class RemoteFileForm
+  constructor: (options = {}) ->
+    @$el = $(options.el)
+    @submitForm() if $.rails.fire(@$el, 'ajax:before')
+
+  submitForm: ->
+    formData = new FormData(@$el[0])
+    url = @$el.attr('action')
+    method = @$el.attr('method')
+
+    Para.ajax
+      url: url
+      method: method
+      data: formData
+      cache: false
+      contentType: false
+      processData: false
+      xhr: @buildXHR
+      beforeSend: @beforeSend
+      success: @success
+      complete: @complete
+      error: @error
+      crossDomain: $.rails.isCrossDomain(url)
+
+  buildXHR: =>
+    xhr = $.ajaxSettings.xhr()
+    $(xhr.upload).on('progress', @progress) if xhr.upload
+    xhr
+
+  beforeSend: (xhr, settings) =>
+    if $.rails.fire(@$el, 'ajax:beforeSend', [xhr, settings])
+      @$el.trigger('ajax:send', xhr)
+    else
+      return false
+
+  success: (data, status, xhr) =>
+    @$el.trigger('ajax:success', [data, status, xhr])
+
+  complete: (xhr, status) =>
+    @$el.trigger('ajax:complete', [xhr, status])
+
+  error: (xhr, status, error) =>
+    @$el.trigger('ajax:error', [xhr, status, error])
+
+  # TODO : Implement an upload progress bar for heavy files
+  #
+  progress: (e) =>
+    # console.log e.loaded, '/', e.total if e.lengthComputable
+
+$(document).on 'ajax:aborted:file', (e) ->
+  new RemoteFileForm(el: e.target)
+  return false

data/app/assets/javascripts/para/lib/turbolinks-loading.coffee

@@ -20,6 +20,6 @@ Para.loadingManager = new Para.TurbolinksLoading()
 
 $(document).on('page:fetch', Para.loadingManager.start)
 
-$(document).on 'page:change', ->
+$(document).on 'page:change turbolinks:load', ->
   Para.loadingManager.stop()
   $('body').on('submit', '[data-para-form]', Para.loadingManager.start)

data/app/assets/javascripts/para/lib/turbolinks-reloader.coffee

@@ -0,0 +1,19 @@
+class TurbolinksReloader
+  run: (options = {}) ->
+    options.keepScrollPosition ?= true
+
+    if options.keepScrollPosition
+      $(document).one('page:before-unload', $.proxy(@beforeUnload, this))
+      $(document).one('page:load', $.proxy(@onChange, this))
+
+    Turbolinks.visit(window.location.href)
+
+  beforeUnload: ->
+    @scrollPosition = $(document).scrollTop()
+
+  onChange: ->
+    $(document).scrollTop(@scrollPosition)
+
+$ ->
+  Turbolinks.reloadPage = (options = {}) ->
+    new TurbolinksReloader().run(options)

data/app/assets/stylesheets/para/admin/src/datetimepicker.sass

@@ -1,5 +1,7 @@
 @import "para/admin/theme/variables"
 
+@import "compass/css3/box-shadow"
+
 /* Bootstrap Datetimepiker */
 .xdsoft_datetimepicker
   .xdsoft_calendar td.xdsoft_default,
@@ -7,7 +9,7 @@
   .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current,
   .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current
     background: $brand-primary
-    box-shadow: darken($brand-primary, 10%) 0px 1px 3px 0px inset
+    +box-shadow(darken($brand-primary, 10%) 0px 1px 3px 0px inset)
 
   .xdsoft_calendar td:hover,
   .xdsoft_timepicker .xdsoft_time_box >div >div:hover,

data/app/assets/stylesheets/para/admin/src/fuelux.sass

@@ -1,5 +1,7 @@
 @import "para/admin/theme/variables"
 
+@import "compass/css3/box-shadow"
+
 input[type=number]::-webkit-inner-spin-button,
 input[type=number]::-webkit-outer-spin-button
   -webkit-appearance: none
@@ -19,7 +21,7 @@ input[type=number]::-webkit-outer-spin-button
     top: 0px
     margin-left: -1px !important
     border-color: $input-border
-    box-shadow: none
+    +box-shadow(none)
     z-index: 2
     .fa
       font-size: 1em
@@ -29,7 +31,7 @@ input[type=number]::-webkit-outer-spin-button
       cursor: not-allowed
     &:hover,
     &:focus
-      box-shadow: none
+      +box-shadow(none)
   .spinner-up,
   .spinbox-up
     border-top-left-radius: 0 !important

data/app/assets/stylesheets/para/admin/src/nested_many.sass

@@ -0,0 +1,5 @@
+@import "para/admin/theme/variables"
+
+.nested-many-field
+  .panel
+    z-index: 1

data/app/assets/stylesheets/para/admin/src/redactor.sass

@@ -1,5 +1,8 @@
 @import "para/admin/theme/variables"
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/border-radius"
+
 .redactor-button-disabled
   &:hover,
   &:focus
@@ -19,8 +22,8 @@
     /* Override z-index because we don't whant */
     /* redactor_toolbar fixed somewhere or on top of everythink ..*/
     z-index: 1 !important
-    box-shadow: none
-    border-radius: $input-border-radius $input-border-radius 0 0
+    +box-shadow(none)
+    +border-radius($input-border-radius $input-border-radius 0 0)
     border: 1px solid $input-border
     li a
       &:hover,
@@ -32,7 +35,7 @@
     background-color: $input-bg
     border: 1px solid $input-border
     border-top-width: 0px
-    border-radius: 0 0 $input-border-radius $input-border-radius
+    +border-radius(0 0 $input-border-radius $input-border-radius)
     &:focus
       border-color: $input-border-focus
       background: #FFF
@@ -71,11 +74,11 @@
     border-color: $input-border
     background-color: $input-bg
     color: $input-color
-    box-shadow: none
+    +box-shadow(none)
     &:focus
       background-color: #fff
       border-color: $input-border-focus
-      box-shadow: none
+      +box-shadow(none)
 
   footer
     button.redactor-modal-action-btn

data/app/assets/stylesheets/para/admin/src/selectize.sass

@@ -1,18 +1,21 @@
 @import "para/admin/theme/variables"
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/border-radius"
+
 .selectize-dropdown, 
 .selectize-dropdown.form-control
-  border-radius: $border-radius-base
+  +border-radius($border-radius-base)
 
 .selectize-input,
 .selectize-input.full
   border-color: $input-border
-  border-radius: $input-border-radius
+  +border-radius($input-border-radius)
   &.focus
     border-color: $input-border-focus
-    box-shadow: none
+    +box-shadow(none)
   &.dropdown-active
-    border-radius: $input-border-radius
+    +border-radius($input-border-radius)
 
 .selectize-dropdown, 
 .selectize-input, 

data/app/assets/stylesheets/para/admin/theme/_breadcrumb.sass

@@ -1,25 +1,19 @@
 @import 'variables'
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/border-radius"
+
 .breadcrumb
   width: 100%
   margin-bottom: 0px
   padding: 0
-  border-radius: 0
+  +border-radius(0)
   overflow: hidden
   border: none
   border-bottom: 1px solid $gray-light
   li + li:before
     display: none
   li
-    &:first-child
-      padding-left: 27px
-      a
-        padding: 0
-    &:last-child
-      background-color: transparent !important
-      pointer-events: none
-      cursor: default
-      padding: 11px 10px 11px 30px
     a
       font-size: 1em
       color: $breadcrumb-color
@@ -61,7 +55,21 @@
         margin-left: 2px
         left: 100%
         z-index: 1
-    
+
     &:hover, &:last-child
-      color: $breadcrumb-active-color
+      a
+        color: $breadcrumb-active-color
+
+    &:first-child
+      a
+        padding-left: 20px
+
+    &:last-child
+      a
+        &:after,
+        &:before
+          content: none
+          border: none
+        &:hover
+          background-color: transparent
 

data/app/assets/stylesheets/para/admin/theme/_buttons.sass

@@ -3,8 +3,12 @@
 .btn
   .fa, .glyphicon
     font-size: 14px
-    margin-right: 3px 
-  
+    margin-right: 3px
+
+    &.fa-stack-2x
+      font-size: 2em
+      margin-right: inherit
+
   // Social network color
   &.btn-twitter
     background: #1AB2E8

data/app/assets/stylesheets/para/admin/theme/_checkable.sass

@@ -1,5 +1,7 @@
 @import 'variables'
 
+@import "compass/css3/inline-block"
+
 @mixin fontAwesome
   font-family: FontAwesome
   font-weight: normal
@@ -98,9 +100,9 @@ input[type=radio]:focus + .radio-icon:before
     border: none
     background-color: transparent
     background: none
-    display: inline-block
+    +inline-block
     &:hover
       cursor: pointer
     &:before
-      display: inline-block
+      +inline-block
       width: 20px

data/app/assets/stylesheets/para/admin/theme/_commonds.sass

@@ -1,5 +1,8 @@
 @import "variables"
 
+@import "compass/css3/border-radius"
+@import "compass/css3/box-shadow"
+
 // Typographi
 // -------------------------
 .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6
@@ -151,7 +154,7 @@
   background: #fcfbf4
   border: 1px dashed $gray-dark
   margin-bottom: 20px
-  border-radius: 3px
+  +border-radius(3px)
   float: left
   width: 100%
 
@@ -187,9 +190,9 @@
 
 .img-text
   border: 3px solid #FFF
-  border-radius: 3px
+  +border-radius(3px)
   margin: 0 10px 5px 0
-  box-shadow: 1px 1px 0 0 rgba(0, 0, 0, 0.1)
+  +box-shadow(1px 1px 0 0 rgba(0, 0, 0, 0.1))
 
 .mail-checkall
   margin-right: 5px

data/app/assets/stylesheets/para/admin/theme/_dropdown.sass

@@ -1,8 +1,10 @@
 @import 'variables'
 
+@import "compass/css3/box-shadow"
+
 .dropdown-menu
   font-size: 12px
-  box-shadow: 0 2px 1px 0 rgba(0, 0, 0, 0.1)
+  +box-shadow(0 2px 1px 0 rgba(0, 0, 0, 0.1))
   border: 1px solid $dropdown-border
   padding: 0
   margin: 8px 0 0

data/app/assets/stylesheets/para/admin/theme/_form.sass

@@ -1,10 +1,12 @@
 @import "variables"
 
+@import "compass/css3/box-shadow"
+
 .form-control
-  box-shadow: none
+  +box-shadow(none)
   -webkit-appearance: none
   &:focus
-    box-shadow: none
+    +box-shadow(none)
     border-color: $input-border-focus
     background: #FFF
   &[disabled], &[readonly]

data/app/assets/stylesheets/para/admin/theme/_list.sass

@@ -1,5 +1,7 @@
 @import 'variables'
 
+@import "compass/css3/border-radius"
+
 // List with progress bar
 .progress-list
   float: left
@@ -26,7 +28,7 @@
       float: left
       background: $btn-default-bg
       border: 1px solid $gray-lighter
-      border-radius: 3px
+      +border-radius(3px)
       line-height: 23px
       font-size: 11px
       margin: 0 5px 5px 0
@@ -67,13 +69,13 @@
     .list-group-item
       border-left: 0
       border-right: 0
-      border-radius: 0
+      +border-radius(0)
 
 .padding-0 .list-group
   border: 0
   .list-group-item
     border-width: 1px 0 0
-    border-radius: 0
+    +border-radius(0)
     &:first-child
       border-top: 0
 
@@ -95,7 +97,7 @@ a.list-group-item
   padding: 10px
   img
     border: 2px solid $btn-default-bg
-    border-radius: 50%
+    +border-radius(50%)
     width: 40px
     margin-right: 10px
   .contacts-title
@@ -127,7 +129,7 @@ a.list-group-item
     top: 15px
     width: 10px
     height: 10px
-    border-radius: 50%
+    +border-radius(50%)
     content: " "
   &.status-online:after
     background: $brand-success