X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsearchaction.php;h=b994e20296b895078722ad028fe8b36defdf507b;hb=8a4575ea769cb0349645f1ecfb4e7e66e4cf8d4b;hp=030d2bb724b2283b82228fd588b993aad65b1871;hpb=57198a74647f8350db4de03b0b7ef157091a4359;p=quix0rs-gnu-social.git diff --git a/lib/searchaction.php b/lib/searchaction.php index 030d2bb724..b994e20296 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -62,20 +62,6 @@ class SearchAction extends Action $this->showPage(); } - /** - * Show tabset for this page - * - * Uses the SearchGroupNav widget - * - * @return void - * @see SearchGroupNav - */ - function showObjectNav() - { - $nav = new SearchGroupNav($this, $this->trimmed('q')); - $nav->show(); - } - function showTop($arr=null) { $error = null; @@ -98,10 +84,6 @@ class SearchAction extends Action return null; } - function showNoticeForm() { - // remote post notice form - } - function showContent() { $this->showTop(); $this->showForm(); @@ -127,7 +109,7 @@ class SearchAction extends Action // TRANS: for searching can be entered. $this->input('q', _('Keyword(s)'), $q); // TRANS: Button text for searching site. - $this->submit('search', _m('BUTTON','Search')); + $this->element('input', array('type'=>'submit', 'class'=>'submit', 'value'=>_m('BUTTON','Search'))); $this->elementEnd('li'); $this->elementEnd('ul'); $this->elementEnd('fieldset'); @@ -143,21 +125,22 @@ class SearchAction extends Action $message = _("* Make sure all words are spelled correctly. * Try different keywords. * Try more general keywords. -* Try fewer keywords. -"); +* Try fewer keywords."); + $message .= "\n"; + if (!common_config('site', 'private')) { $qe = urlencode($q); + $message .= "\n"; // Don't change these long strings to HEREDOC; xgettext won't pick them up. // TRANS: Standard search suggestions shown when a search does not give any results. - $message .= sprintf(_(" -You can also try your search on other engines: + $message .= sprintf(_("You can also try your search on other engines: * [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%) * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s) * [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s) * [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s) -* [Collecta](http://collecta.com/#q=%s) -"), $qe, $qe, $qe, $qe, $qe); +* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe); + $message .= "\n"; } $this->elementStart('div', 'help instructions'); $this->raw(common_markup_to_html($message));