From f808f1601b548ee4830f7a16b479eadce3b66094 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 27 Jul 2016 16:49:55 +0200
Subject: rework drag and drop to drag directly into files area, implement the
 default upload button to work with the same mechanism as drag and drop,
 revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well
 with the new cloud upload mechanism

---
 view/tpl/cloud_actionspanel.tpl | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'view/tpl/cloud_actionspanel.tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 9cdd73b31..8976b3007 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -11,16 +11,10 @@
   {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
   <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data">
     <input type="hidden" name="sabreAction" value="put">
-    <div>
-      <div id="filedrag" style="height: 7em;"><br>{{$dragdroptext}}</div>
-    </div>
-    <div id="file-upload-list"></div>
-    <div class="clear"></div>
     <label for="files-upload">{{$upload_header}}</label>
     <div class="clear"></div>
-    <input class="form-group pull-left" id="files-upload" type="file" name="file[]" multiple>
-    <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
+    <input class="form-group pull-left" id="files-upload" type="file" name="file" multiple>
+    <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
   </form>
   <div class="clear"></div>
-  <hr/>
 </div>
-- 
cgit v1.2.3


From fc105cf1415cf4124f69d40419b5c52307e993a2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 28 Jul 2016 15:35:45 +0200
Subject: reusing the original form did not work so well via xhr upload - let
 us create a new form for this action. revert progressbar- only works nice in
 firefox

---
 view/tpl/cloud_actionspanel.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/cloud_actionspanel.tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 8976b3007..eaa613dc4 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -13,7 +13,7 @@
     <input type="hidden" name="sabreAction" value="put">
     <label for="files-upload">{{$upload_header}}</label>
     <div class="clear"></div>
-    <input class="form-group pull-left" id="files-upload" type="file" name="file" multiple>
+    <input class="form-group pull-left" id="files-upload" type="file" name="file">
     <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
   </form>
   <div class="clear"></div>
-- 
cgit v1.2.3