harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide lockstate for photo edit

Browse Source
This commit is contained in:
marijus 2014-11-07 12:13:38 +01:00
parent f077badcb6
commit 2cfe0f1545
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/photos.php
View File

@ -840,11 +840,11 @@ function photos_content(&$a) {
); );
} }
// lock // lockstate
$lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
? t('Private Photo') ? array('lock', t('Private Photo'))
: Null); : array('unlock', Null));
$a->page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n"; $a->page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n";
if($prevlink) if($prevlink)
@ -947,6 +947,7 @@ function photos_content(&$a) {
'tag_label' => t('Add a Tag'), 'tag_label' => t('Add a Tag'),
'permissions' => t('Permissions'), 'permissions' => t('Permissions'),
'aclselect' => $aclselect_e, 'aclselect' => $aclselect_e,
'lockstate' => $lockstate[0],
'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), '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),''), 'adult' => array('adult',t('Flag as adult in album view'), (($ph[0]['photo_flags'] & PHOTO_ADULT) ? 1 : 0),''),
@ -1119,7 +1120,7 @@ function photos_content(&$a) {
'$id' => $link_item['id'], //$ph[0]['id'], '$id' => $link_item['id'], //$ph[0]['id'],
'$album' => $album_e, '$album' => $album_e,
'$tools' => $tools, '$tools' => $tools,
'$lock' => $lock, '$lock' => $lockstate[1],
'$photo' => $photo, '$photo' => $photo,
'$prevlink' => $prevlink, '$prevlink' => $prevlink,
'$nextlink' => $nextlink, '$nextlink' => $nextlink,

2
view/tpl/photo_view.tpl
View File

@ -69,7 +69,7 @@
</div> </div>
<div class="form-group btn-group pull-right"> <div class="form-group btn-group pull-right">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <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>
<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button> <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button>
</div> </div>