effective_assets 1.1.2 → 1.2.0

data/app/assets/stylesheets/effective_assets/_input_bootstrap.scss

@@ -47,7 +47,7 @@ table {
   font-weight: bold;
 }
 .table thead th {
-  vertical-align: bottom;
+  vertical-align: middle;
 }
 .table caption + thead tr:first-child th,
 .table caption + thead tr:first-child td,

data/app/assets/stylesheets/effective_assets_iframe.scss

@@ -4,20 +4,10 @@ body {
   padding: 10px;
 }
 
-.form-control.filter-attachments {
-  display: inline;
-  font-weight: normal;
-  width: auto;
-  min-width: 50%;
-  margin-left: 10px;
-}
-
-.asset-box-input.dragin {
-  border: 1px solid blue;
-  border-radius: 4px;
-  border-color: #66afe9;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px rgba(102, 175, 233, 0.6);
-  outline: 0 none;
+.asset-box-input {
+  td.attachment-title {
+    max-width: 400px;
+  }
 }
 
 @import "effective_assets/iframe_bootstrap";

data/app/controllers/effective/assets_controller.rb

@@ -16,7 +16,7 @@ module Effective
         @aws_acl = 'public-read' # The CKEditor Insert Image functionality needs a public-read image here
       elsif params[:only] == 'nonimages'
         @assets = @assets.nonimages
-        @file_types = [:pdf, :zip, :doc, :docx, :xls, :xlsx, :txt, :avi, :m4v, :m2v, :mov, :mp3, :mp4]
+        @file_types = [:pdf, :zip, :doc, :docx, :xls, :xlsx, :txt, :csv, :avi, :m4v, :m2v, :mov, :mp3, :mp4, :eml]
       end
 
       @user_uploads = UserUploads.new(@assets)

data/app/models/effective/snippets/effective_asset.rb

@@ -5,6 +5,7 @@ if defined?(EffectiveRegions)
         attribute :asset_id, Integer
         attribute :html_class, String
         attribute :link_title, String
+        attribute :private_url, Boolean
 
         def asset
           @asset ||= (Effective::Asset.where(:id => asset_id).first if asset_id)
@@ -14,6 +15,10 @@ if defined?(EffectiveRegions)
           :span
         end
 
+        def is_private?
+          private_url == true || (asset.try(:aws_acl) == 'authenticated-read')
+        end
+
       end
     end
   end

data/app/models/inputs/asset_box.rb

@@ -12,10 +12,16 @@ module Inputs
     def to_html
       output = ''
       output += header_html
-      output += attachments_html
 
-      output += dialog_html if @options[:dialog]
-      output += uploader_html if @options[:uploader]
+      if @options[:uploader] == :top
+        output += uploader_html
+        output += attachments_html
+        output += dialog_html if @options[:dialog]
+      else
+        output += attachments_html
+        output += dialog_html if @options[:dialog]
+        output += uploader_html if @options[:uploader]
+      end
 
       output += footer_html
 
@@ -33,6 +39,7 @@ module Inputs
         data-attachable-type='#{@options[:attachable_type]}'
         data-attachable-object-name='#{@object_name}'
         data-attachment-style='#{@options[:attachment_style]}'
+        data-attachment-add-to='#{@options[:attachment_add_to]}'
         data-attachment-actions='#{@options[:attachment_actions].to_json()}'
         data-aws-acl='#{@options[:aws_acl]}'
       >".html_safe
@@ -44,10 +51,9 @@ module Inputs
           content_tag(:thead) do
             content_tag(:tr) do
               [
-                content_tag(:th, 'Thumbnail'),
-                content_tag(:th, 'Title'.html_safe + (@options[:table_filter_bar] ? filter_bar_html : '')),
-                content_tag(:th, 'Size'),
-                content_tag(:th)
+                content_tag(:th, ''),
+                content_tag(:th, ''),
+                content_tag(:th, (@options[:table_filter_bar] ? filter_bar_html : ''), :colspan => 2)
               ].join().html_safe
             end
           end + content_tag(:tbody, build_values_html, :class => 'attachments')
@@ -77,6 +83,7 @@ module Inputs
           :disabled => @options[:disabled],
           :file_types => @options[:file_types],
           :progress_bar_partial => @options[:progress_bar_partial],
+          :drop_files => @options[:uploader_drop_files],
           :aws_acl => @options[:aws_acl]
         }
       ).html_safe
@@ -129,9 +136,11 @@ module Inputs
 
     def initialize_options(method, opts)
       {
-        :uploader => true,
+        :uploader => true, # :top, :bottom, true or false
+        :uploader_drop_files => false,
         :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)
         :attachment_actions => [:remove], # or :insert, :delete, :remove
         :table_filter_bar => false,
         :dialog => false,

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

@@ -20,10 +20,11 @@
 
     - if attachment_actions.include?('remove')
       %a.attachment-remove{:href => '#', :title => 'Remove'}
-        %img{:src => asset_path('effective_assets/icon_close.png'), :alt => 'Remove'}
+        %i.glyphicon.glyphicon-remove
 
     - if attachment_actions.include?('delete')
-      = link_to 'Delete', effective_assets.effective_asset_path(attachment.asset), :class => 'btn btn-danger attachment-delete', :data => {:method => :delete, :confirm => "Are you sure? This cannot be undone!"}
+      = link_to effective_assets.effective_asset_path(attachment.asset), :class => 'btn btn-danger attachment-delete', :data => {:method => :delete, :confirm => "Are you sure you want to delete this file? This cannot be undone!"} do
+        %i.glyphicon.glyphicon-trash
 
     - if attachment.persisted?
       = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][id]", attachment.id)

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

@@ -1,11 +1,17 @@
 .uploads
-.asset-box-uploader{:id => "s3_#{uid}"}
+.asset-box-uploader{:id => "s3_#{uid}", :class => ('drop-files' if drop_files) }
   = s3_uploader_fields(:aws_acl => aws_acl)
 
-  - if limit > 1
-    %input{:type => 'file', :name => 'file', :multiple => 'multiple', :disabled => disabled}
-  - else
-    %input{:type => 'file', :name => 'file', :disabled => disabled}
+  - if drop_files
+    %p Drop files here
+
+  %span.btn.btn-success.fileinput-button
+    %i.glyphicon.glyphicon-upload
+    %span Upload files...
+    - if limit > 1
+      %input{:type => 'file', :name => 'file', :multiple => 'multiple', :disabled => disabled}
+    - else
+      %input{:type => 'file', :name => 'file', :disabled => disabled}
 
   = render :partial => progress_bar_partial
 

data/app/views/effective/assets/iframe.html.haml

@@ -14,4 +14,4 @@
 
   %body
     = simple_form_for @user_uploads, :url => '/' do |f|
-      = f.input :uploads, :as => :asset_box, :label => false, :uploader => true, :attachment_style => :table, :table_filter_bar => true, :attachment_actions => [:insert, :delete], :file_types => (@file_types || :any), :aws_acl => (@aws_acl || 'public-read')
+      = f.input :uploads, :as => :asset_box, :label => false, :uploader => :top, :uploader_drop_files => true, :attachment_style => :table, :table_filter_bar => true, :attachment_actions => [:insert, :delete], :attachment_add_to => :top, :file_types => (@file_types || :any), :aws_acl => (@aws_acl || 'public-read')

data/app/views/effective/snippets/_effective_asset.html.haml

@@ -1,4 +1,5 @@
 - asset = effective_asset.asset
+- asset.aws_acl = 'authenticated-read' if effective_asset.is_private?
 
 - if asset.nil?
   %img{:src => '#'}

data/lib/effective_assets/engine.rb

@@ -26,7 +26,7 @@ module EffectiveAssets
     end
 
     initializer "effective_assets.append_precompiled_assets" do |app|
-      Rails.application.config.assets.precompile += ['effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css']
+      Rails.application.config.assets.precompile += ['effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css', 'spinner.gif']
     end
 
     # ActiveAdmin (optional)

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

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