diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
| commit | cd526139fb0440938971261c0502006e9d212fbf (patch) | |
| tree | 9cc3e0ed340283fe168bb904c911248a2f7fd661 /view | |
| parent | d83f12e883e79b7268677f8981579102c48ca00b (diff) | |
| parent | 459ec78a5e3cb09ee908fd7810bbb0b80b2e4713 (diff) | |
| download | volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.gz volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.bz2 volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index acb9b462f..3e24e8177 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1057,7 +1057,9 @@ function doprofilelike(ident, verb) { $.get('like/' + ident + '?verb=' + verb, function() { window.location.href=window.location.href; }); } + function dropItem(url, object) { + var confirm = confirmDelete(); if(confirm) { $('body').css('cursor', 'wait'); diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 1f0addc95..51178a9ba 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -65,10 +65,10 @@ <td class="cloud-index-tool">{{$item.attachIcon}}</td> <td class="cloud-index-tool"><div id="file-edit-{{$item.attachId}}" class="spinner-wrapper"><div class="spinner s"></div></div></td> <td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> - <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> + <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> {{else}} - <td></td><td></td><td></td><td></td> + <td></td><td></td><td></td>{{if $is_admin}}<td class="cloud-index-tool"><a href="#" title="{{$admin_delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>{{else}}<td>{{/if}}</td> {{/if}} <td>{{*{{$item.type}}*}}</td> <td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index d258f1992..b5e871c36 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -45,6 +45,7 @@ <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{include file="field_select_grouped.tpl" field=$role}} + {{$autoperms}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> <div class="form-group"> <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> |