push_type_admin 0.6.0 → 0.7.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9197a9796ce49be3a1ecc251176b9ebb901e90
-  data.tar.gz: 85909f826bbc8ce0ed41ca6e4e229124e39a8337
+  metadata.gz: 1e4a9cb0bc803b41f06066c0d9ba503bee5e470a
+  data.tar.gz: 7a9520586ecae81da4225410a8464b2dd80c6d28
 SHA512:
-  metadata.gz: 47f1b15d216357a368f0aa7f391e3fe4bb4da222f7cead13c69cc3569e0fd3d627d1db15749160bfc36df35abe9cf97c5fa78f21446c0226d4a1ff551255cfb9
-  data.tar.gz: d4e4359a9ea2580652896e7838fd9b12b9eb92b766f7638e767f750581dd531e5b6821e709da9547f046ee495542c3e7795e5b9c67fa8fa585db4b51e4908ab8
+  metadata.gz: 0879e42465471dd1d157ecf9c3df6c207b355e26196b4920d430e790cad25eff9a7b74d097705e725c70ecbb4b7ba284d4827d42d8108dafd52f2c7933b3eccb
+  data.tar.gz: 635dd4fc4e0b0995d1b86ec0ee1d71471e24bd8129af519e09beae2d44545f55cc30751c3267a10019e69aef91835d5f4cb4d868cf548955b1055bcecbd2f3fb

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

@@ -22,8 +22,9 @@
 #= require jquery.sortable
 #= require jquery.filedrop
 #= require jquery.simplePagination
-#= require selectize
 #= require moment
+#= require numeral
+#= require selectize
 #= require pickadate/picker
 #= require pickadate/picker.date
 #= require pickadate/picker.time
@@ -42,6 +43,10 @@ Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
   $http.defaults.headers.common['Content-Type'] = 'application/json'
 ]
 
+@app.filter 'kb', ->
+   (input) ->
+      numeral(input).format('0 b')
+
 @app.directive 'sidePanel', ->
   (scope, $el, attrs) ->
     $el.sticky

data/app/views/push_type/assets/_form.html.haml

@@ -26,7 +26,7 @@
                     %td {{ asset.file_name }}
                   %tr
                     %th File size
-                    %td {{ asset.file_size }} kb
+                    %td {{ asset.file_size | kb }}
                   %tr
                     %th Content type
                     %td {{ asset.mime_type }}

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

@@ -11,7 +11,7 @@
           %td {{ asset.file_name }}
         %tr
           %th File size
-          %td {{ asset.file_size }} kb
+          %td {{ asset.file_size | kb }}
         %tr
           %th Content type
           %td {{ asset.mime_type }}

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

@@ -1,16 +1,28 @@
-.repeater-field.mat{ repeater: { field: true } }
+.repeater-field{ repeater: { field: true } }
   %table
-    %thead
-      %tr
-        - field.fields.keys.each do |name|
-          %th= name.to_s.humanize
-        %th  
+    - if field.grid?
+      %thead
+        %tr
+          - field.fields.each do |(_, fd)|
+            %th= label_tag fd.label
+          %th  
+
     %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
+            - if field.grid?
+              - row.fields.each do |name, sub_field|
+                %td= render_field sub_field, r, id: nil
+            - else
+              %td
+                .repeater-field
+                  %table
+                    %tbody
+                      - row.fields.each do |key, sub_field|
+                        %tr
+                          %th= r.label sub_field.name, sub_field.label
+                          %td= render_field sub_field, r
             %td.remove
               %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)
 
@@ -21,7 +33,17 @@
   %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
+        - if field.grid?
+          - field.fields.each do |name, sub_field|
+            %td= render_field sub_field, r, id: nil
+        - else
+          %td
+            .repeater-field
+              %table
+                %tbody
+                  - field.fields.each do |key, sub_field|
+                    %tr
+                      %th= r.label sub_field.name, sub_field.label
+                      %td= render_field sub_field, r, id: nil
         %td.remove
           %a.alert{ ng: { click: 'removeRow()' } }= ficon(:x)

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

@@ -1,4 +1,4 @@
-.repeater-field.rep{ repeater: { field: true } }
+.repeater-field{ repeater: { field: true } }
   %table
     %tbody.rows
       - field.rows.each do |row|

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 = '28b84cb2df93e7b94beeecd7d2c663cc7ea81f8cc70392a057275df273645e85'
+  # config.dragonfly_secret = '986953e57db5d4d7c116fc74f3e6aa3e04e664ae6735388258b436f58755de39'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 392dd754cb56a66d34411882268f2abaf7d0c6d4b11dd6cc980df62c302e3048c788e26b4f3e14b34fd4add3201cc9e5b392141820cf954047f6a6d46ad63c2a
+  secret_key_base: 05323b47b156d7c0de1df4ceba950b201bbc0c6aaa457d958f5de9d05874324970ff46f4a91d95b85bda59d70a4f16764d193260e35f1604e2fa6748e32a28aa
 
 test:
-  secret_key_base: 66d03cb9877ccf21e9893c5dd1be30bda1059cd95c8f7d5356becdc4b4dd24a7024edd6b243d33f0c1f5c805e2825ffe51f6aec0c9760aba625d6fa4794ae8df
+  secret_key_base: 61e722280f63a9684202f02c3b319a0add578ee749ea41ae14fa0b1cc9b1649746a1fedeb61f3cfa3ed6656189be3908df35aad189ef893e03f090a5325b54d6
 
 # 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: 20151108150820) do
+ActiveRecord::Schema.define(version: 20160108132413) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"