effective_assets 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160c04b9bda2f5142520959215381c7b8d8b2f2b
-  data.tar.gz: 5bbf8413fae92e984a7a7477afbce819cfd7ea86
+  metadata.gz: bb33f2ef8638072c3300c00659ca6af982cf8150
+  data.tar.gz: 864b3908b3ad1adf4983f2bd083ba4562a5af4ed
 SHA512:
-  metadata.gz: e7bed61b177038a1b442b8d1e3495d27b29b51f696dc49109c58dd596ba42da5fbbadfcce20cf1f45c91bac46f9dbaa4b656e3438894bdb286ff03cb0b7e4f17
-  data.tar.gz: 41995bd175a697e1cb2ba902519982575b9a425128e59d5739eed7fa4414a953ca915dbc05503c7d4503c061b0495c6cc09e706420867f49a6566db8d15ac77c
+  metadata.gz: 534454d49182cc1316444677a002a23503f3f9f87406e2f1513697c9ca140329e6f6fbcc952b5fd1b55d3e2d24df0bb5f275fb4da512ad19145726377a3106ae
+  data.tar.gz: 218cb573efe04b1a23162f26328d081922e4d4a7e55de1f11c4d46a6f3a6d35cf1108b74a2450201da1f9c919e39eb2a535348e45695c62535fe7fc82310911c

data/app/models/inputs/asset_box.rb

@@ -84,7 +84,9 @@ module Inputs
           :file_types => @options[:file_types],
           :progress_bar_partial => @options[:progress_bar_partial],
           :drop_files => @options[:uploader_drop_files],
-          :aws_acl => @options[:aws_acl]
+          :drop_files_help_text => @options[:drop_files_help_text],
+          :aws_acl => @options[:aws_acl],
+          :btn_label => @options[:btn_label]
         }
       ).html_safe
     end
@@ -138,6 +140,7 @@ module Inputs
       {
         :uploader => true, # :top, :bottom, true or false
         :uploader_drop_files => false,
+        :drop_files_help_text => 'Drop files here',
         :progress_bar_partial => 'asset_box_input/progress_bar_template',
         :attachment_style => :thumbnail,  # :thumbnail, :table, or :list
         :attachment_add_to => :bottom, # :bottom or :top (of attachments div)
@@ -147,7 +150,8 @@ module Inputs
         :dialog_url => @template.effective_assets.effective_assets_path,
         :disabled => false,
         :file_types => [:any],
-        :aws_acl => EffectiveAssets.aws_acl
+        :aws_acl => EffectiveAssets.aws_acl,
+        :btn_label => "Upload files..."
       }.merge(opts).tap do |options|
         options[:method] = method.to_s
         options[:box] = method.to_s.pluralize

data/app/views/asset_box_input/_uploader.html.haml

@@ -3,11 +3,11 @@
   = s3_uploader_fields(:aws_acl => aws_acl)
 
   - if drop_files
-    %p Drop files here
+    %p= drop_files_help_text
 
   %span.btn.btn-success.fileinput-button
     %i.glyphicon.glyphicon-upload
-    %span Upload files...
+    %span= btn_label
     - if limit > 1
       %input{:type => 'file', :name => 'file', :multiple => 'multiple', :disabled => disabled}
     - else

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails