aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/photos.php6
-rwxr-xr-xview/tpl/field_checkbox.tpl2
-rwxr-xr-xview/tpl/photo_view.tpl2
3 files changed, 6 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 296aab67f..e88d1497e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -539,7 +539,7 @@ function photos_content(&$a) {
$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
}
- $aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
+ $aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : '');
$selname = (($datum) ? hex2bin($datum) : '');
@@ -557,7 +557,7 @@ function photos_content(&$a) {
'$albums' => $albums['albums'],
'$selname' => $selname,
'$permissions' => t('Permissions'),
- '$aclselect' => $aclselect_e,
+ '$aclselect' => $aclselect,
'$lockstate' => $lockstate,
'$uploader' => $ret['addon_text'],
'$default' => (($ret['default_upload']) ? true : false),
@@ -900,7 +900,7 @@ function photos_content(&$a) {
if($can_post) {
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['description'];
- $aclselect_e = populate_acl($ph[0]);
+ $aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : '');
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
$_SESSION['album_return'] = bin2hex($ph[0]['album']);
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
index 514626d5f..6785e522a 100755
--- a/view/tpl/field_checkbox.tpl
+++ b/view/tpl/field_checkbox.tpl
@@ -1,4 +1,4 @@
- <div class="form-group field checkbox">
+ <div id="{{$field.0}}_container" class="form-group field checkbox">
<label for="id_{{$field.0}}">{{$field.1}}</label>
<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
<span class="help-block">{{$field.3}}</span>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 49181b018..1054d5e3a 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -79,9 +79,11 @@
<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
</div>
<div class="form-group btn-group pull-right">
+ {{if $edit.aclselect}}
<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="icon-{{$edit.lockstate}}"></i>
</button>
+ {{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
</div>
</form>