summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gallery.php35
-rw-r--r--theme/default/display.css90
2 files changed, 116 insertions, 9 deletions
diff --git a/lib/gallery.php b/lib/gallery.php
index bf04eaa34..024649e28 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -88,14 +88,25 @@ class GalleryAction extends Action {
$content[$t] = $t;
}
if ($tags) {
+ common_element_start('dl', array('id'=>'filter_tags'));
+ common_element('dt', null, _('Filter tags'));
+ common_element_start('dd');
+ common_element_start('ul');
+ common_element_start('li', array('id'=>'filter_tags_all', 'class'=>'child_1'));
common_element('a', array('href' => common_local_url($this->trimmed('action'),
array('nickname' => $profile->nickname))),
_('All'));
+ common_element_end('li');
+ common_element_start('li', array('id'=>'filter_tags_item'));
common_element_start('form', array('name' => 'bytag', 'id' => 'bytag'));
common_dropdown('tag', _('Tag'), $content,
_('Choose a tag to narrow list'), FALSE, $tag);
common_submit('go', _('Go'));
common_element_end('form');
+ common_element_end('li');
+ common_element_end('ul');
+ common_element_end('dd');
+ common_element_end('dl');
}
}
@@ -217,30 +228,36 @@ class GalleryAction extends Action {
}
function display_links($profile, $page, $display) {
-
- common_element_start('p');
+ common_element_start('dl', array('id'=>'subscriptions_nav'));
+ common_element('dt', null, _('Subscriptions navigation'));
+ common_element_start('dd');
+ common_element_start('ul', array('class'=>'nav'));
switch ($display) {
case 'list':
- common_element('span', NULL, _('List'));
- common_text(' | ');
- common_element('a', array('href' => common_local_url($this->trimmed('action'),
+ common_element('li', array('class'=>'child_1'), _('List'));
+ common_element_start('li');
+ common_element('a', array('href' => common_local_url($this->trimmed('action'),
array('display' => 'icons',
'nickname' => $profile->nickname,
'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE)))),
_('Icons'));
- break;
+ common_element_end('li');
+ break;
default:
+ common_element_start('li', array('class'=>'child_1'));
common_element('a', array('href' => common_local_url($this->trimmed('action'),
array('nickname' => $profile->nickname,
'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE)))),
_('List'));
- common_text(' | ');
- common_element('span', NULL, _('Icons'));
+ common_element_end('li');
+ common_element('li', NULL, _('Icons'));
break;
}
- common_element_end('p');
+ common_element_end('ul');
+ common_element_end('dd');
+ common_element_end('dl');
}
# Get list of tags we tagged other users with
diff --git a/theme/default/display.css b/theme/default/display.css
index 47560b16b..a69e48240 100644
--- a/theme/default/display.css
+++ b/theme/default/display.css
@@ -501,6 +501,7 @@ ul.subscriptions, ul.subscribers {
padding: 0;
list-style-type: none;
overflow: auto;
+ clear:both;
}
ul.subscriptions li, ul.subscribers li {
display: block;
@@ -870,6 +871,95 @@ font-size: 60%;
}
+#subscriptions_nav,
+#filter_tags {
+margin:0 0 2em 0;
+}
+
+#subscriptions_nav {
+padding-bottom:0.5em;
+/*border-bottom:1px solid #D8E2D7;*/
+float:right;
+}
+#filter_tags {
+float:left;
+}
+
+#subscriptions_nav dt,
+#filter_tags dt {
+display:none;
+}
+#subscriptions_nav dd,
+#filter_tags dd {
+margin-left:0;
+}
+#subscriptions_nav ul,
+#filter_tags ul {
+padding-left:0;
+list-style-type:none;
+}
+#subscriptions_nav ul li {
+display:inline;
+padding-left:0.5em;
+margin-left:0.5em;
+border-left:1px solid #D8E2D7;;
+}
+#subscriptions_nav ul li.child_1 {
+border-left:0;
+padding-left:0;
+margin-left:0;
+}
+
+
+#filter_tags ul li {
+float:left;
+margin-left:0.5em;
+padding-left:0.5em;
+border-left:1px solid #D8E2D7;;
+}
+#filter_tags ul li.child_1 {
+margin-left:0;
+border-left:0;
+padding-left:0;
+}
+#filter_tags ul li li {
+margin-left:0;
+}
+#filter_tags ul li#filter_tags_item {
+width:30em;
+}
+#filter_tags ul li#filter_tags_item form {
+clear:none;
+}
+#filter_tags ul li#filter_tags_item label {
+margin-right:0.5em;
+font-size:14px;
+font-weight:normal;
+font-family:Georgia,"Times New Roman",Times,serif;
+}
+#filter_tags ul li#filter_tags_item label,
+#filter_tags ul li#filter_tags_item select {
+margin-top:-1px;
+margin-bottom:0.5em;
+display:inline;
+}
+#filter_tags ul li#filter_tags_item p {
+margin:0 1em 0 0;
+padding:0;
+float:left;
+}
+#filter_tags ul li .input_instructions {
+display:inline;
+display:block;
+margin:0;
+}
+#filter_tags ul li#filter_tags_item .submit {
+margin:0;
+}
+
+
+
+
.tags_self,
.tags_user {
margin-left:4.5em;