retain links in List and Icon switch

darcs-hash:20081124045924-5ed1f-2a8c374362334914fe37aad1fc8be2a661d54675.gz
This commit is contained in:
Evan Prodromou 2008-11-23 23:59:24 -05:00
parent 45dfacd2ae
commit 8d7af455cf

View File

@ -228,6 +228,8 @@ class GalleryAction extends Action {
} }
function display_links($profile, $page, $display) { function display_links($profile, $page, $display) {
$tag = $this->trimmed('tag');
common_element_start('dl', array('id'=>'subscriptions_nav')); common_element_start('dl', array('id'=>'subscriptions_nav'));
common_element('dt', null, _('Subscriptions navigation')); common_element('dt', null, _('Subscriptions navigation'));
common_element_start('dd'); common_element_start('dd');
@ -237,18 +239,26 @@ class GalleryAction extends Action {
case 'list': case 'list':
common_element('li', array('class'=>'child_1'), _('List')); common_element('li', array('class'=>'child_1'), _('List'));
common_element_start('li'); common_element_start('li');
common_element('a', array('href' => common_local_url($this->trimmed('action'), $url_args = array('display' => 'icons',
array('display' => 'icons', 'nickname' => $profile->nickname,
'nickname' => $profile->nickname, 'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE));
'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE)))), if ($tag) {
$url_args['tag'] = $tag;
}
$url = common_local_url($this->trimmed('action'), $url_args);
common_element('a', array('href' => $url),
_('Icons')); _('Icons'));
common_element_end('li'); common_element_end('li');
break; break;
default: default:
common_element_start('li', array('class'=>'child_1')); common_element_start('li', array('class'=>'child_1'));
common_element('a', array('href' => common_local_url($this->trimmed('action'), $url_args = array('nickname' => $profile->nickname,
array('nickname' => $profile->nickname, 'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE));
'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE)))), if ($tag) {
$url_args['tag'] = $tag;
}
common_local_url($this->trimmed('action'), $url_args);
common_element('a', array('href' => $url),
_('List')); _('List'));
common_element_end('li'); common_element_end('li');
common_element('li', NULL, _('Icons')); common_element('li', NULL, _('Icons'));