diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-12-04 08:58:19 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-12-04 08:58:19 +0100 |
| commit | 657ec75c3da0deef3f388ffd016c9fbabb1d049c (patch) | |
| tree | 9ac0a996ae0a00bbf545bbed880967338a80edb1 /view/tpl | |
| parent | a79b268438b242eac02d75130d03fde88d6949cd (diff) | |
| parent | 91e3c5c34e93004b9641d906c9f512b42f9c4a7a (diff) | |
| download | volse-hubzilla-657ec75c3da0deef3f388ffd016c9fbabb1d049c.tar.gz volse-hubzilla-657ec75c3da0deef3f388ffd016c9fbabb1d049c.tar.bz2 volse-hubzilla-657ec75c3da0deef3f388ffd016c9fbabb1d049c.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 6b876d2ac..292452cca 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -20,7 +20,7 @@ <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}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</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}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}} <form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="directory" value="{{$path}}" /> <input type="hidden" name="channick" value="{{$channick}}" /> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 58b843bf0..678e790ac 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -9,7 +9,7 @@ <i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> {{/if}} {{if $can_post}} - <button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> + <button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); {{if $album_edit.1}}closeMenu('photo-album-edit-wrapper');{{/if}}"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} </div> </div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 46b1d3fd0..ea173049b 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,7 @@ <div id="photo-upload-form"> + <input id="invisible-photos-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple data-nickname='{{$nickname}}' > <div class="section-content-tools-wrapper"> - <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> + <form action="#" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div class="form-group"> @@ -15,9 +16,9 @@ </datalist> </div> {{if $default}} - <div class="form-group"> + <!-- div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> - </div> + </div --> {{include file="field_input.tpl" field=$caption}} {{include file="field_checkbox.tpl" field=$visible}} <div id="body-textarea"> @@ -30,7 +31,7 @@ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm">{{$submit}}</button> </div> </div> @@ -57,7 +58,7 @@ </form> </div> <table id="upload-index"> - <tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}} + <tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}} </table> {{$aclselect}} <div id="photos-upload-end" class="clear"></div> |