diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 9cdd73b31..eaa613dc4 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"> + <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> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 870f7e9e1..5a84028c1 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -<div class="section-content-wrapper-np"> +<div id="cloud-drag-area" class="section-content-wrapper-np"> <table id="cloud-index"> <tr> <th width="1%"></th> @@ -18,6 +18,7 @@ <td class="hidden-xs"></td> </tr> {{/if}} + <tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}} {{foreach $entries as $item}} <tr id="cloud-index-{{$item.attachId}}"> <td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td> @@ -38,6 +39,7 @@ <tr id="cloud-tools-{{$item.attachId}}"> <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> </tr> + {{/foreach}} </table> </div> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ee00e25e6..c0d524764 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -511,10 +511,10 @@ function enableOnUser(){ xhr.addEventListener('load', function (e) { //console.log('xhr upload complete', e); window.fileUploadsCompleted = window.fileUploadsCompleted + 1; + addeditortext(xhr.responseText); + $('#jot-media').val($('#jot-media').val() + xhr.responseText); // When all the uploads have completed, refresh the page - if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { - addeditortext(xhr.responseText); - $('#jot-media').val($('#jot-media').val() + xhr.responseText); + if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { $('#profile-rotator').spin(false); window.fileUploadsCompleted = window.filesToUpload = 0; } |