assetable 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI1MmU4NTY3MGVhOWIxNDJiNTllMGE0NDQ3Mzc3YTNkM2QwMmQ0Yw==
+    MDZjYTk0MWJjYWE4ZDkxMjVkNGNiOWQ5ODk2MDZkMjQ5M2E3ZTBlZA==
   data.tar.gz: !binary |-
-    MDZjZTliMGY5NDdjMjUyZjdjYTY3ZmQ4NjMxNzQzYTIzMjBkODdlMg==
+    OTAxMTQ4M2YxZjFkYzFlODQ5MTY3MGNmODkzNTBkODJlNjY1OWE4ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjIwMmU1NWQzNTExM2RiMjUzZjg0Mjc4N2FkN2QwMDJiY2NhNjE5ZjE1ZTY3
-    ZTc0OTc3YjhhMjE5ZjY4ZmU2NzVlYzUwYmVkZmU1MjY3YmIxMWJkN2I5ZWVi
-    N2Q0MjEzNmJhYWZkNDIwYmUzNDQyZTdkMGYxYmM3OTg3Y2EyM2U=
+    N2E3YThjNTcyOGYxNGY3NDQ2OTBjNTNhNGRlZjJlYjNmNzc2ZWE2ZmU2YTI1
+    ZmI3NGU2MTVlOWYzZGQzMjlmOWIxMjY4NTQ1ZTkzOTU3OGRjYWFiMzM5YWE3
+    MmZiYmIwMTQwOWUzNjE0NzVjYjAxNmFiYmZkYmE0NDQxYzU2NTc=
   data.tar.gz: !binary |-
-    ZjQwNWVmOTQ2MjkxZmEzZTZjYzkzZGYxNzc3MGMzZjAyN2QwYWIwYzU2NDRl
-    MmI1MjQ4MmZjODQxNjgyZjRjMzIzNTUwZjYxMTYxNTRmYWIwMzJkMjFjODZk
-    YzkxMzc0YmQwZjc4ZjExZmUxNTEzMTgxYjU1ZGY1MDM3ZDhkYzk=
+    MDc1YWUwNDlkMjNkNjY3NDE1MjkzYzA3YWVkNzRkY2IzM2RhNmFjODViY2E5
+    NGM5YWYxOGFlYWE5ZWZmZjMxZmY1MzIxMzEyNGM1MDE3Njc5NTMxOGU1ZDc4
+    MWI1MzM5NGQyZDgwZmZkMmU1NjA2MWMwNzM3NDBiOTM4MmM3NWE=

data/app/assets/javascripts/assetable/assetable_uploader.js.coffee

@@ -5,6 +5,7 @@
     defaults =
       allow_select_mg: true
       authenticity_token: null
+      directions: 'or <a href="/assetable/external_services/new" class="btn-third-party-service">add third party service</a>'
       drag_drop: true
       fieldname: null
       FileUploaded: options.onUploaded
@@ -33,7 +34,7 @@
       # Create our extra HTML for the copy and queu
       # upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy">Drag and drop files or <a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">add them manually</a></div></div>'
       # upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy"><a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">select file</a> or <a href="#" class="btn-open-asset-gallery">open gallery</a></div></div>'
-      upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy"><a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">select file</a> or <a href="/assetable/external_services/new" class="btn-third-party-service">add third party service</a></div></div>'
+      upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy"><a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">select file</a> ' + assetable_uploader.options.directions + '</div></div>'
       upload_queue = '<ul class="upload-queue"></ul>'
       # Add to the uploader
       $(assetable_uploader).append(upload_directions)
@@ -211,6 +212,7 @@ bind_uploaders = ->
         multi_selection: false
         url: "/assetable/assets"
         fieldname: field
+        directions: $this.attr('data-uploader-directions')
         authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
         onUploaded: (resp) ->
           $this.find('.uploader-data-wrapper').html(resp.html)

data/config/initializers/uploader_input.rb

@@ -7,6 +7,8 @@ class ActionView::Helpers::FormBuilder
   include ActionView::Helpers::AssetTagHelper
   include ActionView::Helpers::NumberHelper
 
+  # = cf.uploader :attachment, select_file: true, text: "or drag and drop your PO"
+
   def uploader method, options = {}
     # add an ID to the options
     options[:id] = field_id(method, options[:index]) unless options[:id].present?
@@ -14,6 +16,8 @@ class ActionView::Helpers::FormBuilder
     # Set the fieldname
     fieldname = @object_name + "[#{method}_association_attributes][asset_id]"
 
+    directions = options[:directions] || ''
+
     # Create the uploader
     value = @object.nil? ? nil : @object.send(method)
 
@@ -28,7 +32,7 @@ class ActionView::Helpers::FormBuilder
     uploader_html = content_tag(:div, (asset_preview), class: "uploader-data-wrapper")
 
     # Create and return the uploader html
-    uploader_wrapper = content_tag(:div, uploader_html, class: "uploader #{'uploader-has-asset' if asset} #{options[:class]}", id: options[:id], :'data-uploader-input-name' => fieldname)
+    uploader_wrapper = content_tag(:div, uploader_html, class: "uploader #{'uploader-has-asset' if asset} #{options[:class]}", id: options[:id], :'data-uploader-input-name' => fieldname, :'data-uploader-directions' => directions)
     return uploader_wrapper
   end
 

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -293,6 +293,7 @@ files:
 - app/assets/images/assetable/icons/icon-xls.png
 - app/assets/images/assetable/icons/icon-xlsx.png
 - app/assets/images/assetable/icons/icon-xml.png
+- app/assets/images/assetable/icons/icon-zip.png
 - app/assets/javascripts/assetable/asset_gallery.js.coffee
 - app/assets/javascripts/assetable/assetable_uploader.js.coffee
 - app/assets/javascripts/assetable/gallery.js.coffee