From 0f5f1c98cae1becdbd303a85005fd5381eefe1b0 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 25 Jul 2016 01:46:40 -0700
Subject: revert cloud acl selector (branched so as to continue development)

---
 view/js/mod_cloud.js            |  4 ++--
 view/tpl/cloud_actionspanel.tpl | 24 ++++++------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js
index 8f08c7fe9..71e916446 100644
--- a/view/js/mod_cloud.js
+++ b/view/js/mod_cloud.js
@@ -90,9 +90,9 @@ function DragDropUploadFile(file, idx) {
     }
   });
   // POST to the entire cloud path 
-  xhr.open('post', 'file_upload', true);
+  xhr.open('post', window.location.pathname, true);
 
   var data = new FormData(document.getElementById("ajax-upload-files"));
-  data.append('userfile', file);
+  data.append('file', file);
   xhr.send(data);
 }
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 913522c87..fba457fdc 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -2,37 +2,25 @@
   <label for="files-mkdir">{{$folder_header}}</label>
   <form method="post" action="">
     <input type="hidden" name="sabreAction" value="mkcol">
-    <input id="files-mkdir" type="text" name="dirname" class="form-control form-group">
+    <input id="files-mkdir" type="text" name="name" class="form-control form-group">
     <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
   </form>
   <div class="clear"></div>
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper">
   {{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="file_upload" enctype="multipart/form-data">
-	<input type="hidden" name="channick" value="{{$channick}}" />
-	<input type="hidden" name="return_url" value="{{$return_url}}" />
+  <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 id="filedrag" style="height: 7em;"><br>{{$dragdroptext}}</div>
     </div>
     <div id="file-upload-list"></div>
     <div class="clear"></div>
-    {{$aclselect}}
     <label for="files-upload">{{$upload_header}}</label>
     <div class="clear"></div>
-    <input class="form-group pull-left" id="files-upload" type="file" name="userfile" style="width: 70%;">
-	<div class="pull-right btn-group">
-		<div class="btn-group">
-			{{if $lockstate}}
-			<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-				<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-			</button>
-			{{/if}}
-			<button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
-		</div>
-	</div>
+    <input class="form-group pull-left" id="files-upload" type="file" name="file" style="width: 70%;">
+    <button 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