Merge branch 'master' of git://gitorious.org/laconica/mainline into 0.7.x

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 70e63146a61ee793e0acc6cf585541a955a2fac4..fdfb8dc5adac4cc57378b9665c9d0744907a8d5a 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -114,17 +114,21 @@ class SearchAction extends Action
         $q = $this->trimmed('q');
         $page = $this->trimmed('page', 1);
         $this->elementStart('form', array('method' => 'get',
-                                           'id' => 'login',
+                                           'id' => 'form_search',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url($this->trimmed('action'))));
-        $this->elementStart('p');
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Search site'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
             $this->hidden('action', $this->trimmed('action'));
         }
-        $this->input('q', '', $q);
-        $this->text(' ');
+        $this->input('q', 'Keyword(s)', $q);
         $this->submit('search', 'Search');
-
-        $this->elementEnd('p');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
         if ($q) {
             $this->showResults($q, $page);