push_type_admin 0.6.0.beta.1 → 0.6.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f93ae03dc6ed6fab62b7bbf7932077fdf4f379fa
-  data.tar.gz: 19f745c42c090f9dacae3b97bdcd157c2a9a3460
+  metadata.gz: 7a34b274eeb17eccee9b3954265ab72a69c96c70
+  data.tar.gz: 3da8bebd6539ebeb37da176960110425adbe1f71
 SHA512:
-  metadata.gz: e74abb601ff2e6336e84ad7c6093da357d883687e7c564a455129ed9e0281113597ef066c52a2e61926d398c218b334f3eed5ebc740a0c4dd658acf2ffe5395a
-  data.tar.gz: 71989795eda90d361c7a33ec8a96be133a2c85b930da18d96f5d79a026714d261487116a3add425e0718ebcfdeacf8e689d59330c25752945edb7bcb439dc004
+  metadata.gz: 8a5bbf35600501b56f1e3c2211492d6d73e6d4f75002602e49e4bd7e783a50def319767726b350922d9aeae73b9a107a8976b348e0eb25853d34abf7796669ec
+  data.tar.gz: 24c744776cd98ebf4714e6e9e835359fa5dd258c19cf32512aca6b075ad46d187ee511ef3cf789dcbf462982bbe6e5e5d102addf510d8ac42e5b68af110bec1f

data/app/assets/javascripts/push_type/admin.js.coffee

@@ -33,6 +33,8 @@
 
 Turbolinks.enableProgressBar()
 
+Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
+
 @app = angular.module 'push_type', ['ui.tree']
 
 @app.run ['$http', ($http) ->
@@ -50,12 +52,13 @@ Turbolinks.enableProgressBar()
 # jQuery init
 $(document).on 'ready page:load', ->
 
-  # Bootstrap foundation
-  $(document).foundation()
-  $(document).confirmWithReveal()
+  $(document).on 'init.fndtn', (a,b,c) ->
+    $(a.target).foundation()
+    $(a.target).confirmWithReveal()
 
-  # Bootstrap Angular
+  # Bootstrap Angular and Foundation
   angular.bootstrap $('[role="main"]'), ['push_type']
+  $(document).trigger 'init.fndtn'
 
   $('.node-list.sortable').sortable
     handle: '.handle'

data/app/assets/javascripts/push_type/fields/asset_field.js.coffee

@@ -3,6 +3,7 @@
   $scope.$modal = null
   $scope.assets = []
   $scope.meta   = {}
+  $scope.uid    = 'asset-' + Math.uid()
   
   $scope.loadAssets = (page) ->
     config = if page? then { params: { page: page } } else null
@@ -47,7 +48,7 @@
 $(document).on 'ready page:load', ->
 
   $(document).on 'open.fndtn.reveal', '.asset-field-modal', ->
-    $scope  = angular.element($(this)).scope()
+    $scope = angular.element($(this)).scope()
     $scope.$modal = $(this)
     $scope.loadAssets()
     $scope.$apply()

data/app/assets/javascripts/push_type/fields/date_time_fields.js.coffee

@@ -1,13 +1,16 @@
-# jQuery init
-$(document).on 'ready page:load', ->
-
-  $('input', '.date').pickadate
+opts =
+  date:
     format: 'd mmmm yyyy'
     formatSubmit: 'yyyy-mm-dd'
     hiddenName: true
-
-  $('input', '.time').pickatime
+  time:
     format: 'h:i A'
     formatSubmit: 'HH:i'
     formatLabel: 'h:i A <sm!all>HH:i</sm!all>'
     hiddenName: true
+
+@app.directive 'pickadate', ->
+  ($scope, $el, $attrs) ->
+    switch $attrs['pickadate']
+      when 'date' then $($el).pickadate opts.date
+      when 'time' then $($el).pickatime opts.time

data/app/assets/javascripts/push_type/fields/repeater_field.js.coffee

@@ -1,15 +1,31 @@
-@app.controller 'RepeaterFieldCtrl',  ['$scope', ($scope) ->
+@app.directive 'repeaterField', ['$compile', '$timeout', ($compile, $timeout) ->
+  {
+    restrict: 'A'
+    scope: true
+    link: ($scope, $el, $attrs) ->
+      $rows     = $('.rows', $el)
+      template  = $('.template', $el).text()
 
-  $scope.rows = [null]
+      $scope.addRow = ->
+        uid   = Math.uid()
+        $row  = $(template)
+        $row.attr 'data-uid', uid
+        $rows.append $row
+        $dom = $("[data-uid='#{ uid }']", $rows)
+        $compile($dom)($scope)
+        $timeout -> $dom.trigger('init.fndtn')
+        true
 
-  $scope.initRows = (rows) ->
-    $scope.rows = rows if rows?
+      $scope.addRow() unless $rows.children().length
+  }
+]
 
-  $scope.addRow = ->
-    $scope.rows.push null
-
-  $scope.removeRow = (i) ->
-    console.log "Removeing #{i}" 
-    $scope.rows.splice(i, 1);
-
-]
+@app.directive 'repeaterRow', ->
+  {
+    restrict: 'A'
+    scope: true
+    link: ($scope, $el, $attrs) ->
+      $scope.removeRow = ->
+        $el.remove()
+        true
+  }

data/app/assets/javascripts/push_type/fields/{relation_fields.js.coffee → select_fields.js.coffee}

@@ -1,7 +1,14 @@
-# jQuery init
-$(document).on 'ready page:load', ->
+opts =
+  select:
+    plugins:      ['remove_button']
+    hideSelected: false
+
+  tag_list:
+    plugins:  ['remove_button', 'drag_drop']
+    create:   true
+    persist:  false
 
-  $('select', '.relation, .node, .taxonomy').selectize
+  relation:
     plugins:      ['remove_button']
     hideSelected: false
     onInitialize: ->
@@ -17,3 +24,11 @@ $(document).on 'ready page:load', ->
       option: (item, esc) ->
         pre = if item.depth > 0 then '- '.repeat(item.depth) else ''
         """<div class="option">#{ pre }#{ esc item.text }</div>"""
+
+
+@app.directive 'selectize', ->
+  ($scope, $el, $attrs) ->
+    switch $attrs['selectize']
+      when 'select'                       then $($el).selectize opts.select
+      when 'tag_list'                     then $($el).selectize opts.tag_list
+      when 'relation', 'node', 'taxonomy' then $($el).selectize opts.relation

data/app/helpers/push_type/fields_helper.rb

@@ -1,7 +1,8 @@
 module PushType
   module FieldsHelper
 
-    def render_field(field, f)
+    def render_field(field, f, html_options = {})
+      field.instance_variable_get(:@opts)[:html_options].merge! html_options
       content_tag :div, class: field.kind do
         render "push_type/fields/#{ field.template }", f: f, field: field
       end
@@ -11,31 +12,5 @@ module PushType
       [field.css_class, 'columns end'].compact.join(' ')
     end
 
-    def merge_repeater_html_options(object_name, field, sub_field)
-      opts = {
-        name: "#{ object_name }[#{ field.name }][]",
-        id:   "#{ object_name }_#{ field.name }_{{ $index }}"
-      }
-      if [:text_area, :select].include?(sub_field.form_helper)
-        opts.merge!(:'ng-model' => "rows[$index]")
-      else
-        opts.merge!(:'ng-value' => "rows[$index]")
-      end
-      sub_field.instance_variable_get(:@opts)[:html_options].merge! opts
-    end
-
-    def merge_matrix_html_options(object_name, field, sub_field)
-      opts = {
-        name:   "#{ object_name }[#{ field.name }][][#{ sub_field.name }]",
-        id:     "#{ object_name }_#{ field.name }_{{ $index }}_#{ sub_field.name }"
-      }
-      if [:text_area, :select].include?(sub_field.form_helper)
-        opts.merge!(:'ng-model' => "row.#{ sub_field.name }")
-      else
-        opts.merge!(:'ng-value' => "row.#{ sub_field.name }")
-      end
-      sub_field.instance_variable_get(:@opts)[:html_options].merge! opts
-    end
-
   end
 end

data/app/views/push_type/fields/_asset.html.haml

@@ -1,5 +1,5 @@
 .asset-field{ class: ('error' if f.object.errors[field.name].present?), ng: { controller: 'AssetFieldCtrl', init: "assetsPath='#{ push_type.assets_path }'; asset=#{ asset_hash(f.object.send(field.relation_name.to_sym)).to_json }" } }
-  = f.hidden_field field.name, value: '{{ asset.id }}'
+  = f.hidden_field field.name, field.html_options.merge(value: '{{ asset.id }}')
 
   .row{ ng: { show: 'asset' } }
     .small-4.medium-3.columns
@@ -17,9 +17,9 @@
           %td {{ asset.mime_type }}
       %a.button.secondary.small.radius{ ng: { click: 'deselectAsset()' } } Remove media
   %div{ ng: { hide: 'asset' } }
-    %a.button.success.small.radius{ data: { reveal: { id: field.id_attr } } } Pick media
+    %a.button.success.small.radius{ data: { reveal: { id: '{{ uid }}' } } } Pick media
 
-  .reveal-modal.asset-field-modal{ id: field.id_attr, data: { reveal: true } }
+  .reveal-modal.asset-field-modal{ id: '{{ uid }}', data: { reveal: true } }
 
     %ul.tabs{ data: { tab: true } }
       %li.tab-title.active= link_to ficon(:thumbnails, 'Media'), '#media', data: { success: true }

data/app/views/push_type/fields/_date.html.haml

@@ -1 +1 @@
-= f.send field.form_helper, field.name, field.html_options.merge(data: { value: field.json_value })
+= f.send field.form_helper, field.name, field.html_options.merge(data: { value: field.json_value }, pickadate: field.kind)

data/app/views/push_type/fields/_matrix.html.haml

@@ -1,17 +1,27 @@
-.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ field.json_value.to_json })" } }
+.repeater-field.mat{ repeater: { field: true } }
   %table
     %thead
       %tr
         - field.fields.keys.each do |name|
           %th= name.to_s.humanize
         %th  
-    %tbody
-      %tr{ ng: { repeat: 'row in rows track by $index' } }
-        = fields_for :matrix do |m|
-          - field.fields.each do |name, sub_field|
-            - merge_matrix_html_options f.object_name, field, sub_field
-            %td= render_field sub_field, m
-          %td.remove
-            %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
+    %tbody.rows
+      - field.rows.each do |row|
+        = f.fields_for "#{ field.name }[]", row do |r|
+          %tr{ repeater: { row: true } }
+            - row.fields.each do |name, sub_field|
+              %td= render_field sub_field, r, id: nil
+            %td.remove
+              %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)
+
   .plus
-    %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }= ficon :plus, 'Add row'
+    %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }
+      = ficon :plus, 'Add row'
+
+  %script{:type => 'html/template', :class => 'template' }
+    = f.fields_for "#{ field.name }[]", field.structure do |r|
+      %tr{ repeater: { row: true } }
+        - field.fields.each do |name, sub_field|
+          %td= render_field sub_field, r, id: nil
+        %td.remove
+          %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)

data/app/views/push_type/fields/_relation.html.haml

@@ -1 +1 @@
-= f.select field.name, [], field.field_options, field.html_options.merge(data: { options: field.choices.to_json, items: field.json_value })
+= f.select field.name, [], field.field_options, field.html_options.merge(data: { options: field.choices.to_json, items: field.json_value }, selectize: field.kind)

data/app/views/push_type/fields/_repeater.html.haml

@@ -1,12 +1,20 @@
-.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ field.json_value.to_json })" } }
+.repeater-field.rep{ repeater: { field: true } }
   %table
-    %tbody
-      %tr{ ng: { repeat: 'row in rows track by $index' } }
-        = f.fields_for field.name do |m|
-          %td
-            - merge_repeater_html_options f.object_name, field, field.field
-            = render_field field.field, m
-          %td.remove
-            %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
+    %tbody.rows
+      - field.rows.each do |row|
+        = f.fields_for field.name, row do |r|
+          %tr{ repeater: { row: true } }
+            %td= render_field row.f, r, name: "#{ f.object_name }[#{ field.name }][]", id: nil
+            %td.remove
+              %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)
+
   .plus
-    %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }= ficon :plus, 'Add row'
+    %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }
+      = ficon :plus, 'Add row'
+
+  %script{:type => 'html/template', :class => 'template' }
+    = f.fields_for field.name, field.structure do |r|
+      %tr{ repeater: { row: true } }
+        %td= render_field field.structure.f, r, name: "#{ f.object_name }[#{ field.name }][]", id: nil
+        %td.remove
+          %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)

data/app/views/push_type/fields/_select.html.haml

@@ -1 +1 @@
-= f.select field.name, field.choices, field.field_options, field.html_options
+= f.select field.name, field.choices, field.field_options, field.html_options.merge(selectize: field.kind)

data/test/dummy/config/initializers/push_type.rb

@@ -50,6 +50,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '2542d62d66fa7ca4238bb61e6f4dfcd1a0234b025752343ee31f606926ec829e'
+  # config.dragonfly_secret = 'd2cf92edc302f046840548786fbb0965b055bb82fc5c0daf0b3488ed8ab5a623'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 082dfbae4ce05ff87db8dc7406a2ab20ecb6a191996319e045568be651276c49bf0d5b90552a812e7cd73fa131f4d58890248602378520e174710ac788052db5
+  secret_key_base: e89cd103f737dab6d4cdaad964f0421191509fccbd3477bd234e6a8a5c3436ae2195372a17d11f3a8f3a9982b050dd72cac42d8f9770b96c2ff0242ec9f0422f
 
 test:
-  secret_key_base: c305599cd12060dcffe2fedee9935d508e193115b6c91f0a6217b191c014c1dd9254a5d30944cb98be2b985d097b1fbe25d3edfdbc3a342c8fe459647cb548b3
+  secret_key_base: d2cd4dc8c57a758eda7618eb22e3acaace8ac2dd36755724aa39deef622c8c628425b77f20d79a25cce7ea820b5b19474c9c1d9edfa1d8c00b08c13651a07621
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151015181718) do
+ActiveRecord::Schema.define(version: 20151102165861) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"