diff options
| author | friendica <info@friendica.com> | 2014-11-07 05:16:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-07 05:16:14 -0800 |
| commit | b6ae56b069a7460c1c52f10b97f7e8eba8895770 (patch) | |
| tree | f86fe19e10ad83a92b7a2b47576fd277f432b5a3 | |
| parent | 1cc1bc8e811ccee8dedd340dcaa156c7c1a3fed1 (diff) | |
| parent | 2cfe0f15452c2231314991cdbbab3a9e6926a68b (diff) | |
| download | volse-hubzilla-b6ae56b069a7460c1c52f10b97f7e8eba8895770.tar.gz volse-hubzilla-b6ae56b069a7460c1c52f10b97f7e8eba8895770.tar.bz2 volse-hubzilla-b6ae56b069a7460c1c52f10b97f7e8eba8895770.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | mod/photos.php | 11 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mod/photos.php b/mod/photos.php index 9d8e68134..2367067a7 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -839,11 +839,11 @@ function photos_content(&$a) { ); } - // lock - $lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) + // lockstate + $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) - ? t('Private Photo') - : Null); + ? array('lock', t('Private Photo')) + : array('unlock', Null)); $a->page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n"; if($prevlink) @@ -946,6 +946,7 @@ function photos_content(&$a) { 'tag_label' => t('Add a Tag'), 'permissions' => t('Permissions'), 'aclselect' => $aclselect_e, + 'lockstate' => $lockstate[0], 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), 'adult' => array('adult',t('Flag as adult in album view'), (($ph[0]['photo_flags'] & PHOTO_ADULT) ? 1 : 0),''), @@ -1118,7 +1119,7 @@ function photos_content(&$a) { '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, - '$lock' => $lock, + '$lock' => $lockstate[1], '$photo' => $photo, '$prevlink' => $prevlink, '$nextlink' => $nextlink, diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index b1f39a9e2..969f66f44 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -69,7 +69,7 @@ </div> <div class="form-group btn-group pull-right"> <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="{{$edit.lockstate}}"></i> + <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i> </button> <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button> </div> |