harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert cloud acl selector (branched so as to continue development)

Browse Source
This commit is contained in:
redmatrix 2016-07-25 01:46:40 -07:00
parent 01338a7610
commit 0f5f1c98ca
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/js/mod_cloud.js
View File

@ -90,9 +90,9 @@ function DragDropUploadFile(file, idx) {
} }
}); });
// POST to the entire cloud path // 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")); var data = new FormData(document.getElementById("ajax-upload-files"));
data.append('userfile', file); data.append('file', file);
xhr.send(data); xhr.send(data);
} }

22
view/tpl/cloud_actionspanel.tpl
View File

@ -2,37 +2,25 @@
<label for="files-mkdir">{{$folder_header}}</label> <label for="files-mkdir">{{$folder_header}}</label>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="sabreAction" value="mkcol"> <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> <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
</form> </form>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="files-upload-tools" class="section-content-tools-wrapper"> <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}} {{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"> <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data">
<input type="hidden" name="channick" value="{{$channick}}" /> <input type="hidden" name="sabreAction" value="put">
<input type="hidden" name="return_url" value="{{$return_url}}" />
<div> <div>
<div id="filedrag" style="height: 7em;"><br>{{$dragdroptext}}</div> <div id="filedrag" style="height: 7em;"><br>{{$dragdroptext}}</div>
</div> </div>
<div id="file-upload-list"></div> <div id="file-upload-list"></div>
<div class="clear"></div> <div class="clear"></div>
{{$aclselect}}
<label for="files-upload">{{$upload_header}}</label> <label for="files-upload">{{$upload_header}}</label>
<div class="clear"></div> <div class="clear"></div>
<input class="form-group pull-left" id="files-upload" type="file" name="userfile" style="width: 70%;"> <input class="form-group pull-left" id="files-upload" type="file" name="file" style="width: 70%;">
<div class="pull-right btn-group"> <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
<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>
</form> </form>
<div class="clear"></div> <div class="clear"></div>
<hr/> <hr/>
</div> </div>