Merge branch '1.0.x' into inline-comments

[quix0rs-gnu-social.git] / lib / galleryaction.php

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 18cc7b9295ff7d2cd127bf72a8cd132967ca2f0b..b8edbbb7ba84ba5d6319d1eed185e4b0c0525757 100644 (file)
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -117,9 +117,6 @@ class GalleryAction extends OwnerDesignAction
             $content[$t] = $t;
         }
         if ($tags) {
-            $this->elementStart('dl', array('id'=>'filter_tags'));
-            $this->element('dt', null, _('Filter tags'));
-            $this->elementStart('dd');
             $this->elementStart('ul');
             $this->elementStart('li', array('id' => 'filter_tags_all',
                                              'class' => 'child_1'));
@@ -132,18 +129,19 @@ class GalleryAction extends OwnerDesignAction
             $this->elementEnd('li');
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
-                                               'id' => 'bytag',
-                                               'action' => common_path('?action=' . $this->trimmed('action')),
+                                               'id' => 'form_filter_bytag',
+                                              'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
+            $this->elementStart('fieldset');
+            $this->element('legend', null, _('Select tag to filter'));
             $this->dropdown('tag', _('Tag'), $content,
                             _('Choose a tag to narrow list'), false, $tag);
             $this->hidden('nickname', $this->user->nickname);
             $this->submit('submit', _('Go'));
+            $this->elementEnd('fieldset');
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
     }