summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/searchaction.php16
-rw-r--r--lib/searchgroupnav.php2
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 70e63146a..fdfb8dc5a 100644
--- 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);
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 9fe3c2379..3ba3f9cd9 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -82,7 +82,7 @@ class SearchGroupNav extends Widget
$this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
_('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
$this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
- _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice');
+ _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group');
$this->action->elementEnd('ul');
}
}