diff options
| author | pafcu <pafcu@iki.fi> | 2014-10-21 00:02:08 +0300 |
|---|---|---|
| committer | pafcu <pafcu@iki.fi> | 2014-10-21 00:02:08 +0300 |
| commit | 6fbd77069b8792b48cfbd45bd476b8acb5f98ed6 (patch) | |
| tree | 7f1303769398dc0862a2941e64e7a42e4e39d10d /mod | |
| parent | 6ee514579f85927e60fa5ebd2b89f97cbfe6544d (diff) | |
| parent | c080c420ba4e9f216708b63fdddb5c03bbea72c9 (diff) | |
| download | volse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.tar.gz volse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.tar.bz2 volse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.zip | |
Merge pull request #2 from friendica/master
Sync with upstream
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/photos.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..06c566f47 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -855,16 +855,14 @@ function photos_content(&$a) { $tools = array( 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')), ); - - // lock - $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) - || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) - ? t('Private Message') - : Null); - - } + // lock + $lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) + || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) + ? t('Private Photo') + : Null); + $a->page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n"; if($prevlink) $a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n"; @@ -873,7 +871,7 @@ function photos_content(&$a) { $a->page['htmlhead'] .= '});</script>'; if($prevlink) - $prevlink = array($prevlink, '<i class="icon-backward photo-icons""></i>') ; + $prevlink = array($prevlink, t('Previous')); $photo = array( 'href' => $a->get_baseurl() . '/photo/' . $hires['resource_id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']], @@ -882,7 +880,7 @@ function photos_content(&$a) { ); if($nextlink) - $nextlink = array($nextlink, '<i class="icon-forward photo-icons"></i>'); + $nextlink = array($nextlink, t('Next')); // Do we have an item for this photo? @@ -956,7 +954,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => $link_item['id'], //$ph[0]['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1112,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, @@ -1122,6 +1120,8 @@ function photos_content(&$a) { '$prevlink' => $prevlink, '$nextlink' => $nextlink, '$desc' => $ph[0]['description'], + '$filename' => $ph[0]['filename'], + '$unknown' => t('Unknown'), '$tag_hdr' => t('In This Photo:'), '$tags' => $tags, '$edit' => $edit, |