Merge pull request #29 from scream4ik/master

added drag’n’drop file uploads instead of flash uploader
miguelramos · Mar 8, 2017 · 171aff9 · 171aff9
2 parents 1271117 + 43d7b6e
commit 171aff9
Show file tree

Hide file tree

Showing 96 changed files with 275 additions and 11,169 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@ At the moment i'm without time to maintain this great project. To all the people
 
 # Changelog
 
+### 08-03-2017 v3.5.0
+*   Removed flash uploader. Instead of this added drag’n’drop file uploads with image previews.
+
 ### 06-10-2016 v3.4.1
 *   Mandatory django version >= 1.8
 

diff --git a/filebrowser/decorators.py b/filebrowser/decorators.py
diff --git a/filebrowser/static/filebrowser/css/filebrowser.css b/filebrowser/static/filebrowser/css/filebrowser.css
@@ -207,3 +207,33 @@ ul.pulldown-actions a {
     font-weight: bold;
     white-space: nowrap;
 }
+
+.dropzone{
+    border: 2px dashed #79aec8;
+    font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+}
+
+.dropzone.dz-clickable .dz-message{
+    font-size: 18px;
+    color: #417690;
+}
+
+.dropzone .dz-preview .dz-image{
+    border-radius: 5px;
+    margin-bottom: 5px;
+    border: 1px solid #eee;
+}
+
+.dropzone .dz-preview .dz-progress{
+    height: 5px;
+    top: 110px;
+    margin-top: 0;
+}
+
+.dropzone .dz-preview .dz-remove{
+    color: #ba2121;
+    font-size: 12px;
+    font-weight: 100;
+    text-transform: uppercase;
+}
+
diff --git a/filebrowser/static/filebrowser/css/suit-filebrowser.css b/filebrowser/static/filebrowser/css/suit-filebrowser.css
@@ -20,3 +20,32 @@ body .redactor_toolbar li a.redactor_btn_browser {
     max-width: 100px;
     word-break: break-all;
 }
+
+.dropzone{
+    border: 2px dashed #79aec8;
+    font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+}
+
+.dropzone.dz-clickable .dz-message{
+    font-size: 18px;
+    color: #417690;
+}
+
+.dropzone .dz-preview .dz-image{
+    border-radius: 5px;
+    margin-bottom: 5px;
+    border: 1px solid #eee;
+}
+
+.dropzone .dz-preview .dz-progress{
+    height: 5px;
+    top: 110px;
+    margin-top: 0;
+}
+
+.dropzone .dz-preview .dz-remove {
+    color: #ba2121;
+    font-size: 12px;
+    font-weight: 100;
+    text-transform: uppercase;
+}
diff --git a/filebrowser/static/filebrowser/dropzone b/filebrowser/static/filebrowser/dropzone
diff --git a/filebrowser/static/filebrowser/jquery/jquery-3.1.1.min.js b/filebrowser/static/filebrowser/jquery/jquery-3.1.1.min.js
diff --git a/filebrowser/static/filebrowser/jquery/jquery-3.1.1.min.map b/filebrowser/static/filebrowser/jquery/jquery-3.1.1.min.map
diff --git a/filebrowser/static/filebrowser/uploadify/Uploadify v2.1.0 Manual.pdf b/filebrowser/static/filebrowser/uploadify/Uploadify v2.1.0 Manual.pdf
diff --git a/filebrowser/static/filebrowser/uploadify/cancel.png b/filebrowser/static/filebrowser/uploadify/cancel.png
diff --git a/filebrowser/static/filebrowser/uploadify/check.php b/filebrowser/static/filebrowser/uploadify/check.php
diff --git a/filebrowser/static/filebrowser/uploadify/com/adobe/air/logging/FileTarget.as b/filebrowser/static/filebrowser/uploadify/com/adobe/air/logging/FileTarget.as
diff --git a/filebrowser/static/filebrowser/uploadify/com/adobe/crypto/HMAC.as b/filebrowser/static/filebrowser/uploadify/com/adobe/crypto/HMAC.as