diff options
| author | friendica <info@friendica.com> | 2014-09-27 00:15:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-27 00:15:43 -0700 |
| commit | 51c0904a8a32aba3f866d043f00d1b3934de9d94 (patch) | |
| tree | 8e2a48b44caf5d0ab0aab9831fda7612822390d0 /mod | |
| parent | fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6 (diff) | |
| parent | 04e460c8f8915be3b7911bf0b9c9c0bcd8703e25 (diff) | |
| download | volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.tar.gz volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.tar.bz2 volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/photos.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/mod/photos.php b/mod/photos.php index 44a7ce0f0..c2d90184e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -652,9 +652,10 @@ function photos_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - - $o .= '<h3>' . $album . '</h3>'; + $o .= '<div class="section-title-wrapper">'; + $o .= '<h3>' . $album . '</h3>'; + $o .= '<div class="section-title-submenu">'; if($cmd === 'edit') { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { @@ -680,22 +681,24 @@ function photos_content(&$a) { else { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { - $o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' - . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' - . t('Edit Album') . '</a></div>'; + $o .= '<a href="'. $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' . t('Edit Album') . '</a>'; } } } if($_GET['order'] === 'posted') - $o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a></div>'; + $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a>'; else - $o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a></div>'; - + $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a>'; + /* if($can_post) { - $o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>'; + $o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</<a>'; } + */ + + $o .= '</div>'; // section-title-submenu + $o .= '</div>'; // section-title-wrapper $ajaxout = ''; |