uploadbox 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f836cae407afd0efd7deeb07384addf19e9b9dce
-  data.tar.gz: 53ad4ff8b967f0b9e7d2345ccb70b0e0165a07db
+  metadata.gz: d912686ada135705f14bfc97ee37a94e33d3dd35
+  data.tar.gz: 243b0106d9f5dadba7c043d65f9ec4ac759e85ba
 SHA512:
-  metadata.gz: 92d197f8f76b8d9dd57e436e6ec09eb7d3107aa02666e7e2f80d88c6bc6c824cb54e550f31fca1c4fcf6072bbfbcc89a8c07f4045d7b5b30192e97d4a83634a7
-  data.tar.gz: 0c7c864ef01588ca0ccb7722112454d9ac0ef99a936a6c2a1c4d92ee233ac1d69583a848b7006220b9bd580decfe771fb98d2dd1610439467af8d9737fa2aeea
+  metadata.gz: 1be0a1a86f1ef35c00df7c0c97a56793ab201b5d8b694d958af8b287c2adfc9123650915499331ef5586066e98c47b9b2f80297af5a886e511bc94d17cc01879
+  data.tar.gz: 5082e057fa011c399043364cf571d418c967e2c945860a3e211c8f800096983ecf69b2cf68bcaf9ec9998b18abff82d2295659741af08e19dea2840ed3d23983

data/app/assets/font/fontello.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2013 by original authors @ fontello.com</metadata>
+<defs>
+<font id="fontello" horiz-adv-x="1000" >
+<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="picture-1" unicode="&#xe800;" d="m357 529q0-45-31-76t-76-32t-76 32t-31 76t31 75t76 32t76-32t31-75z m572-215v-250h-786v107l178 179l90-89l285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 7-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
+</font>
+</defs>
+</svg>

data/app/assets/stylesheets/fontello.scss

@@ -0,0 +1,53 @@
+@font-face {
+  font-family: 'fontello';
+  src: url('fontello.eot?99792958');
+  src: url('fontello.eot?99792958#iefix') format('embedded-opentype'),
+       url('fontello.woff?99792958') format('woff'),
+       url('fontello.ttf?99792958') format('truetype'),
+       url('fontello.svg?99792958#fontello') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
+/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
+/*
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: 'fontello';
+    src: url('../font/fontello.svg?99792958#fontello') format('svg');
+  }
+}
+*/
+ 
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: "fontello";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+ 
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+ 
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+     
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+ 
+  /* Animation center compensation - margins should be symmetric */
+  /* remove if not needed */
+  margin-left: .2em;
+ 
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+ 
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+ 
+.icon-picture-1:before { content: '\e800'; } /* '' */

data/app/assets/stylesheets/uploadbox.sass

@@ -1,11 +1,65 @@
 @import bootstrap/progress
+@import fontello
 
 .uploadbox-image-uploader
+  position: relative
+  padding-bottom: 30px
+
   .btn
     background-color: #f7f7f7
-    padding: 10px
     text-align: center
     text-decoration: none
+    box-sizing: border-box
+    border: 1px solid #f7f7f7
+  &:hover
+    .btn
+      border: 1px solid darken(#f7f7f7, 20%)
+
+    .icon-picture-1
+      opacity: .5
+
+  .fileupload-exists
+    .icon-picture-1
+      display: none
+
+  .icon-picture-1
+    position: absolute
+    top: 0
+    left: 0
+    font-size: 40px
+    width: 100%
+    height: 100%
+    opacity: .3
+
+
+  .fileupload
+    &:before
+      box-sizing: border-box
+      z-index: 5
+      font-size: 10px
+      line-height: 12px
+      display: block
+      text-align: center
+      font-weight: 500
+      color: #fff
+      background-color: rgba(#000, .6)
+      padding: 2px
+      position: absolute
+      width: 100%
+      top: 10px
+
+    &.uploading:before
+      content: 'Enviando...'
+
+    &.processing:before
+      content: 'Processando... Quase lá.'
+
+
+  .fileupload-new .btn.fileupload-exists
+    display: none
+
+  .fileupload-new .btn-file
+    background: #f7f7f7
 
   .clearfix
     *zoom: 1
@@ -37,6 +91,7 @@
     position: relative
     vertical-align: middle
     display: block
+    background: transparent
     > input
       position: absolute
       top: 0
@@ -50,6 +105,9 @@
       cursor: pointer
       width: 100%
 
+    .fileupload-exists, .fileupload-new
+      margin-left: -9999px
+
   .fileupload
     position: relative
     background-color: #eee
@@ -65,7 +123,7 @@
       vertical-align: middle
       text-align: center
       > img
-        display: inline-block
+        display: block
         vertical-align: middle
         max-height: 100%
     .btn
@@ -82,7 +140,6 @@
 
   .thumbnail-borderless .thumbnail
     border: none
-    padding: 0
     border-radius: 0
     box-shadow: none
 
@@ -127,9 +184,36 @@
     right: 0
 
   .fileupload-actions
-    position: relative
+    position: absolute
+    top: 0
+    left: 0
+    width: 100%
 
   .progress
-    height: 14px
+    height: 10px
+    width: 100%
     margin-bottom: 0
-    border-radius: 0
+    border-radius: 0
+    position: absolute
+    z-index: 5
+    top: 0
+    left: 0
+
+  .btn.fileupload-exists
+    position: absolute
+    top: -10px
+    right: -10px
+    z-index: 3
+    padding: 0
+    border-radius: 100%
+    width: 20px
+    height: 20px
+    line-height: 20px
+    font-size: 16px
+    background: lighten(black, 20%)
+    color: darken(white, 20%)
+    display: block
+    border: 0
+    &:hover
+      background: black
+      color: white

data/app/views/uploadbox/images/_uploader.html.slim

@@ -1,6 +1,6 @@
 = form.fields_for :image do
   - secure_random = SecureRandom.uuid
-  .uploadbox-image-uploader data-component="ImageUploader"
+  .uploadbox-image-uploader data-component="ImageUploader" style="width: #{width}px; height: #{height}px;"
     - if namespace
       input name="[#{namespace}]#{upload_name}_id" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
     - else
@@ -13,11 +13,11 @@
           = image_tag default, width: width, height: height
 
       .fileupload-actions
-        span.btn.btn-file
+        span.btn.btn-file style="width: #{width}px; height: #{height}px;"
           span.fileupload-new = choose_label
           span.fileupload-exists = update_label
-    
-          input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" data-secure-random="#{secure_random}" accept="image/x-png, image/gif, image/jpeg" style="display: none"
+          i.icon-picture-1 style="line-height: #{height}px"
+          input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" data-secure-random="#{secure_random}" accept="image/x-png, image/gif, image/jpeg" style="display: none; width: #{width}px; height: #{height}px;"
           input type="hidden" name="policy" value="#{s3_policy}"
           input type="hidden" name="signature" value="#{s3_signature}"
           input type="hidden" name="AWSAccessKeyId" value="#{ENV['S3_KEY']}"

data/lib/uploadbox/engine.rb

@@ -35,7 +35,7 @@ class ActionView::Helpers::FormBuilder
                            default: false,
                            update_label: 'Alterar',
                            choose_label: 'Escolher',
-                           destroy_label: 'Excluir')
+                           destroy_label: '×'.html_safe)
     dimensions = upload_model_class.versions[options[:preview]]
     @template.render partial: 'uploadbox/images/uploader', locals: {
       upload_name: upload_name,

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -341,6 +341,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/font/fontello.eot
+- app/assets/font/fontello.svg
+- app/assets/font/fontello.ttf
+- app/assets/font/fontello.woff
 - app/assets/javascripts/_image_uploader.coffee
 - app/assets/javascripts/cors/jquery.postmessage-transport.js
 - app/assets/javascripts/cors/jquery.xdr-transport.js
@@ -349,6 +353,7 @@ files:
 - app/assets/javascripts/jquery.ui.widget.js
 - app/assets/javascripts/uploadbox.coffee
 - app/assets/stylesheets/bootstrap/_progress.css
+- app/assets/stylesheets/fontello.scss
 - app/assets/stylesheets/uploadbox.sass
 - app/controllers/uploadbox/application_controller.rb
 - app/controllers/uploadbox/images_controller.rb