* Re-commit new search UI code, disabled by default. Old form messages still used...
authorAaron Schulz <aaron@users.mediawiki.org>
Mon, 17 Nov 2008 04:56:14 +0000 (04:56 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Mon, 17 Nov 2008 04:56:14 +0000 (04:56 +0000)
* Update old-fashioned profile calls

includes/AutoLoader.php
includes/DefaultSettings.php
includes/SearchEngine.php
includes/specials/SpecialSearch.php
languages/messages/MessagesEn.php
maintenance/language/messages.inc
skins/common/shared.css
skins/monobook/main.css

index c26916c..b531599 100644 (file)
@@ -485,6 +485,7 @@ $wgAutoloadLocalClasses = array(
        'SpecialRecentchanges' => 'includes/specials/SpecialRecentchanges.php',
        'SpecialRecentchangeslinked' => 'includes/specials/SpecialRecentchangeslinked.php',
        'SpecialSearch' => 'includes/specials/SpecialSearch.php',
+       'SpecialSearchOld' => 'includes/specials/SpecialSearch.php',
        'SpecialVersion' => 'includes/specials/SpecialVersion.php',
        'UncategorizedCategoriesPage' => 'includes/specials/SpecialUncategorizedcategories.php',
        'UncategorizedPagesPage' => 'includes/specials/SpecialUncategorizedpages.php',
index d0f918d..32c04fc 100644 (file)
@@ -1436,7 +1436,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '183';
+$wgStyleVersion = '184';
 
 
 # Server-side caching:
@@ -1923,6 +1923,21 @@ $wgNamespacesToBeSearchedDefault = array(
        NS_MAIN           => true,
 );
 
+/**
+ * Additional namespaces to those in $wgNamespacesToBeSearchedDefault that
+ * will be added to default search for "project" page inclusive searches
+ * 
+ * Same format as $wgNamespacesToBeSearchedDefault
+ */  
+$wgNamespacesToBeSearchedProject = array(
+       NS_USER           => true,
+       NS_PROJECT        => true,      
+       NS_HELP           => true,
+       NS_CATEGORY       => true,
+);
+
+$wgUseOldSearchUI = true; // temp testing variable
+
 /**
  * Site notice shown at the top of each page
  *
index 85071d5..032865e 100644 (file)
@@ -43,6 +43,11 @@ class SearchEngine {
                return null;
        }
        
+       /** If this search backend can list/unlist redirects */
+       function acceptListRedirects() {
+               return true;
+       }
+       
        /**
         * If an exact title match can be find, or a very slightly close match,
         * return the title. If no match, returns NULL.
@@ -262,7 +267,51 @@ class SearchEngine {
                
                return array_keys($wgNamespacesToBeSearchedDefault, true);
        }
-
+       
+       /**
+        * Get a list of namespace names useful for showing in tooltips
+        * and preferences
+        *
+        * @param unknown_type $namespaces
+        */
+       public static function namespacesAsText( $namespaces ){
+               global $wgContLang;
+               
+               $formatted = array_map( array($wgContLang,'getFormattedNsText'), $namespaces );
+               foreach( $formatted as $key => $ns ){
+                       if ( empty($ns) )
+                               $formatted[$key] = wfMsg( 'blanknamespace' );
+               }
+               return $formatted;
+       }
+       
+       /**
+        * An array of "project" namespaces indexes typically searched
+        * by logged-in users
+        * 
+        * @return array 
+        * @static
+        */
+       public static function projectNamespaces() {
+               global $wgNamespacesToBeSearchedDefault, $wgNamespacesToBeSearchedProject;
+               
+               return array_keys( $wgNamespacesToBeSearchedProject, true );
+       }
+       
+       /**
+        * An array of "project" namespaces indexes typically searched
+        * by logged-in users in addition to the default namespaces
+        * 
+        * @return array 
+        * @static
+        */
+       public static function defaultAndProjectNamespaces() {
+               global $wgNamespacesToBeSearchedDefault, $wgNamespacesToBeSearchedProject;
+               
+               return array_keys( $wgNamespacesToBeSearchedDefault + 
+                       $wgNamespacesToBeSearchedProject, true);
+       }
+       
        /**
         * Return a 'cleaned up' search string
         *
@@ -485,11 +534,11 @@ class SearchResult {
        var $mRevision = null;
        var $mImage = null;
 
-       function SearchResult( $row ) {
+       function __construct( $row ) {
                $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
                if( !is_null($this->mTitle) ){
                        $this->mRevision = Revision::newFromTitle( $this->mTitle );
-                       if($this->mTitle->getNamespace() == NS_IMAGE)
+                       if( $this->mTitle->getNamespace() === NS_IMAGE )
                                $this->mImage = wfFindFile( $this->mTitle );
                }
        }
index 83b855b..7b5a533 100644 (file)
  * @param $par String: (default '')
  */
 function wfSpecialSearch( $par = '' ) {
-       global $wgRequest, $wgUser;
+       global $wgRequest, $wgUser, $wgUseOldSearchUI;
 
        // Strip underscores from title parameter; most of the time we'll want
        // text form here. But don't strip underscores from actual text params!
        $titleParam = str_replace( '_', ' ', $par );
        
        $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) );
-       $searchPage = new SpecialSearch( $wgRequest, $wgUser );
+       $class = $wgUseOldSearchUI ? 'SpecialSearchOld' : 'SpecialSearch';
+       $searchPage = new $class( $wgRequest, $wgUser );
        if( $wgRequest->getVal( 'fulltext' ) 
                || !is_null( $wgRequest->getVal( 'offset' )) 
-               || !is_null( $wgRequest->getVal( 'searchx' ))) {
+               || !is_null( $wgRequest->getVal( 'searchx' )) )
+       {
                $searchPage->showResults( $search, 'search' );
        } else {
                $searchPage->goResult( $search );
@@ -60,7 +62,779 @@ class SpecialSearch {
         * @param User $user
         * @public
         */
-       function SpecialSearch( &$request, &$user ) {
+       function __construct( &$request, &$user ) {
+               list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
+
+               $this->namespaces = $this->powerSearch( $request );
+               if( empty( $this->namespaces ) ) {
+                       $this->namespaces = SearchEngine::userNamespaces( $user );
+               }
+
+               $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
+               $this->searchAdvanced = $request->getVal('advanced');
+       }
+
+       /**
+        * If an exact title match can be found, jump straight ahead to it.
+        * @param string $term
+        * @public
+        */
+       function goResult( $term ) {
+               global $wgOut, $wgGoToEdit;
+
+               $this->setupPage( $term );
+
+               # Try to go to page as entered.
+               $t = Title::newFromText( $term );
+
+               # If the string cannot be used to create a title
+               if( is_null( $t ) ) {
+                       return $this->showResults( $term );
+               }
+
+               # If there's an exact or very near match, jump right there.
+               $t = SearchEngine::getNearMatch( $term );
+               if( !is_null( $t ) ) {
+                       $wgOut->redirect( $t->getFullURL() );
+                       return;
+               }
+
+               # No match, generate an edit URL
+               $t = Title::newFromText( $term );
+               if( ! is_null( $t ) ) {
+                       wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
+                       # If the feature is enabled, go straight to the edit page
+                       if( $wgGoToEdit ) {
+                               $wgOut->redirect( $t->getFullURL( 'action=edit' ) );
+                               return;
+                       }
+               }
+
+               return $this->showResults( $term );
+       }
+
+       /**
+        * @param string $term
+        * @public
+        */
+       function showResults( $term ) {
+               wfProfileIn( __METHOD__ );
+               global $wgOut, $wgUser;
+               $sk = $wgUser->getSkin();
+
+               $this->setupPage( $term );
+               $this->searchEngine = SearchEngine::create();
+               
+               $t = Title::newFromText( $term );
+
+               $wgOut->addHtml( 
+                       Xml::openElement( 'table', array( 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
+                       Xml::openElement( 'tr' ) .
+                       Xml::openElement( 'td' ) . "\n" 
+               );
+               if( $this->searchAdvanced ) {
+                       $wgOut->addHTML( $this->powerSearchBox( $term ) );
+                       $showMenu = false;
+               } else {                        
+                       $wgOut->addHTML( $this->shortDialog( $term ) );
+                       $showMenu = true;
+               }
+               $wgOut->addHtml(
+                       Xml::closeElement('td') .
+                       Xml::closeElement('tr') .
+                       Xml::closeElement('table')
+               );
+
+               if( '' === trim( $term ) ) {
+                       // Empty query -- straight view of search form
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+
+               global $wgDisableTextSearch;
+               if( $wgDisableTextSearch ) {
+                       global $wgSearchForwardUrl;
+                       if( $wgSearchForwardUrl ) {
+                               $url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
+                               $wgOut->redirect( $url );
+                               return;
+                       }
+                       global $wgInputEncoding;
+                       $wgOut->addHTML(
+                               Xml::openElement( 'fieldset' ) .
+                               Xml::element( 'legend', null, wfMsg( 'search-external' ) ) .
+                               Xml::element( 'p', array( 'class' => 'mw-searchdisabled' ), wfMsg( 'searchdisabled' ) ) .
+                               wfMsg( 'googlesearch',
+                                       htmlspecialchars( $term ),
+                                       htmlspecialchars( $wgInputEncoding ),
+                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
+                               ) .
+                               Xml::closeElement( 'fieldset' )
+                       );
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+
+               $search =& $this->searchEngine;
+               $search->setLimitOffset( $this->limit, $this->offset );
+               $search->setNamespaces( $this->namespaces );
+               $search->showRedirects = $this->searchRedirects;
+               $rewritten = $search->replacePrefixes($term);
+
+               $titleMatches = $search->searchTitle( $rewritten );
+
+               // Sometimes the search engine knows there are too many hits
+               if( $titleMatches instanceof SearchResultTooMany ) {
+                       $wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+               
+               $textMatches = $search->searchText( $rewritten );
+               
+               // did you mean... suggestions
+               if( $textMatches && $textMatches->hasSuggestion() ) {
+                       $st = SpecialPage::getTitleFor( 'Search' );                     
+                       $stParams = wfArrayToCGI( 
+                               array( 'search' => $textMatches->getSuggestionQuery(), 'fulltext'       => wfMsg('search') ),
+                               $this->powerSearchOptions()
+                       );
+                       $suggestLink = '<a href="'.$st->escapeLocalURL($stParams).'">'.
+                               $textMatches->getSuggestionSnippet().'</a>';
+
+                       $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
+               }
+               
+               // show direct page/create link
+               if( !is_null($t) ) {
+                       if( !$t->exists() ) {
+                               $wgOut->addWikiMsg( 'searchmenu-new', wfEscapeWikiText( $t->getPrefixedText() ) );
+                       } else {
+                               $wgOut->addWikiMsg( 'searchmenu-exists', wfEscapeWikiText( $t->getPrefixedText() ) );
+                       }
+               }
+       
+               // show number of results
+               $numTitleMatches = $titleMatches ? $titleMatches->numRows() : 0;
+               $numTextMatches = $textMatches ? $textMatches->numRows() : 0;
+               $highestNum = max( $numTitleMatches, $numTextMatches );
+               // Total query matches (possible false positives)
+               $num = $numTitleMatches + $numTextMatches;
+               // Get total actual results
+               $totalNum = 0;
+               if( $titleMatches && !is_null($titleMatches->getTotalHits()) )
+                       $totalNum += $titleMatches->getTotalHits();
+               if( $textMatches && !is_null($textMatches->getTotalHits()) )
+                       $totalNum += $textMatches->getTotalHits();
+               if( $num > 0 ) {
+                       if( $totalNum > 0 ) {
+                               $top = wfMsgExt('showingresultstotal', array( 'parseinline' ), 
+                                       $this->offset+1, $this->offset+$num, $totalNum, $num );
+                       } elseif( $num >= $this->limit ) {
+                               $top = wfShowingResults( $this->offset, $this->limit );
+                       } else {
+                               $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
+                       }
+                       $wgOut->addHTML( "<p class='mw-search-numberresults'>{$top}</p>\n" );
+               }
+
+               // prev/next links
+               if( $num || $this->offset ) {
+                       $prevnext = wfViewPrevNext( $this->offset, $this->limit,
+                               SpecialPage::getTitleFor( 'Search' ),
+                               wfArrayToCGI( $this->powerSearchOptions(), array( 'search' => $term ) ),
+                               ($highestNum < $this->limit)
+                       );
+                       $wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
+                       wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
+               } else {
+                       wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
+               }
+
+               $wgOut->addHtml( "<div class='searchresults'>" );
+
+               if( $titleMatches ) {
+                       if( $titleMatches->numRows() ) {
+                               $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
+                               $wgOut->addHTML( $this->showMatches( $titleMatches ) );
+                       }
+                       $titleMatches->free();
+               }
+
+               if( $textMatches ) {
+                       // output appropriate heading
+                       if( $textMatches->numRows() ) {
+                               if($titleMatches)
+                                       $wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );
+                               else // if no title matches the heading is redundant
+                                       $wgOut->addHTML("<hr/>");                                                               
+                       } elseif( $num == 0 ) {
+                               # Don't show the 'no text matches' if we received title matches
+                               $wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
+                       }
+                       // show interwiki results if any
+                       if( $textMatches->hasInterwikiResults() )
+                               $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
+                       // show results
+                       if( $textMatches->numRows() )
+                               $wgOut->addHTML( $this->showMatches( $textMatches ) );
+
+                       $textMatches->free();
+               }
+
+               if( $num == 0 ) {
+                       $wgOut->addWikiMsg( 'search-nonefound' );
+               }
+
+               $wgOut->addHtml( "</div>" );
+
+               if( $num || $this->offset ) {
+                       $wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
+               }
+               wfProfileOut( __METHOD__ );
+       }
+       
+       /**
+        *
+        */
+       protected function setupPage( $term ) {
+               global $wgOut;
+               if( !empty( $term ) ) {
+                       $wgOut->setPageTitle( wfMsg( 'searchresults') );
+                       $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term) ) );
+               }                       
+               $wgOut->setArticleRelated( false );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+       }
+
+       /**
+        * Extract "power search" namespace settings from the request object,
+        * returning a list of index numbers to search.
+        *
+        * @param WebRequest $request
+        * @return array
+        */
+       protected function powerSearch( &$request ) {
+               $arr = array();
+               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+                       if( $request->getCheck( 'ns' . $ns ) ) {
+                               $arr[] = $ns;
+                       }
+               }
+               return $arr;
+       }
+
+       /**
+        * Reconstruct the 'power search' options for links
+        * @return array
+        */
+       protected function powerSearchOptions() {
+               $opt = array();
+               foreach( $this->namespaces as $n ) {
+                       $opt['ns' . $n] = 1;
+               }
+               $opt['redirs'] = $this->searchRedirects ? 1 : 0;
+               if( $this->searchAdvanced )
+                       $opt['advanced'] = $this->searchAdvanced;
+               return $opt;
+       }
+
+       /**
+        * Show whole set of results 
+        * 
+        * @param SearchResultSet $matches
+        */
+       protected function showMatches( &$matches ) {
+               global $wgContLang;
+               wfProfileIn( __METHOD__ );
+
+               $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
+
+               $out = "";
+               
+               $infoLine = $matches->getInfo();
+               if( !is_null($infoLine) )
+                       $out .= "\n<!-- {$infoLine} -->\n";
+                       
+               
+               $off = $this->offset + 1;
+               $out .= "<ul class='mw-search-results'>\n";
+               while( $result = $matches->next() ) {
+                       $out .= $this->showHit( $result, $terms );
+               }
+               $out .= "</ul>\n";
+
+               // convert the whole thing to desired language variant
+               $out = $wgContLang->convert( $out );
+               wfProfileOut( __METHOD__ );
+               return $out;
+       }
+
+       /**
+        * Format a single hit result
+        * @param SearchResult $result
+        * @param array $terms terms to highlight
+        */
+       protected function showHit( $result, $terms ) {
+               wfProfileIn( __METHOD__ );
+               global $wgUser, $wgContLang, $wgLang;
+               
+               if( $result->isBrokenTitle() ) {
+                       wfProfileOut( __METHOD__ );
+                       return "<!-- Broken link in search result -->\n";
+               }
+               
+               $t = $result->getTitle();
+               $sk = $wgUser->getSkin();
+
+               $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+
+               //If page content is not readable, just return the title.
+               //This is not quite safe, but better than showing excerpts from non-readable pages
+               //Note that hiding the entry entirely would screw up paging.
+               if(!$t->userCanRead()) {
+                       wfProfileOut( __METHOD__ );
+                       return "<li>{$link}</li>\n";
+               }
+
+               // If the page doesn't *exist*... our search index is out of date.
+               // The least confusing at this point is to drop the result.
+               // You may get less results, but... oh well. :P
+               if( $result->isMissingRevision() ) {
+                       wfProfileOut( __METHOD__ );
+                       return "<!-- missing page " .
+                               htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
+               }
+
+               // format redirects / relevant sections
+               $redirectTitle = $result->getRedirectTitle();
+               $redirectText = $result->getRedirectSnippet($terms);
+               $sectionTitle = $result->getSectionTitle();
+               $sectionText = $result->getSectionSnippet($terms);
+               $redirect = '';
+               if( !is_null($redirectTitle) )
+                       $redirect = "<span class='searchalttitle'>"
+                               .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
+                               ."</span>";
+               $section = '';
+               if( !is_null($sectionTitle) )
+                       $section = "<span class='searchalttitle'>" 
+                               .wfMsg('search-section', $sk->makeKnownLinkObj( $sectionTitle, $sectionText))
+                               ."</span>";
+
+               // format text extract
+               $extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
+               
+               // format score
+               if( is_null( $result->getScore() ) ) {
+                       // Search engine doesn't report scoring info
+                       $score = '';
+               } else {
+                       $percent = sprintf( '%2.1f', $result->getScore() * 100 );
+                       $score = wfMsg( 'search-result-score', $wgLang->formatNum( $percent ) )
+                               . ' - ';
+               }
+
+               // format description
+               $byteSize = $result->getByteSize();
+               $wordCount = $result->getWordCount();
+               $timestamp = $result->getTimestamp();
+               $size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ),
+                       $sk->formatSize( $byteSize ),
+                       $wordCount );
+               $date = $wgLang->timeanddate( $timestamp );
+
+               // link to related articles if supported
+               $related = '';
+               if( $result->hasRelated() ) {
+                       $st = SpecialPage::getTitleFor( 'Search' );
+                       $stParams = wfArrayToCGI( $this->powerSearchOptions(),
+                               array('search'    => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
+                                     'fulltext'  => wfMsg('search') ));
+                       
+                       $related = ' -- <a href="'.$st->escapeLocalURL($stParams).'">'. 
+                               wfMsg('search-relatedarticle').'</a>';
+               }
+                               
+               // Include a thumbnail for media files...
+               if( $t->getNamespace() == NS_IMAGE ) {
+                       $img = wfFindFile( $t );
+                       if( $img ) {
+                               $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
+                               if( $thumb ) {
+                                       $desc = $img->getShortDesc();
+                                       wfProfileOut( __METHOD__ );
+                                       // Float doesn't seem to interact well with the bullets.
+                                       // Table messes up vertical alignment of the bullets.
+                                       // Bullets are therefore disabled (didn't look great anyway).
+                                       return "<li>" .
+                                               '<table class="searchResultImage">' .
+                                               '<tr>' .
+                                               '<td width="120" align="center" valign="top">' .
+                                               $thumb->toHtml( array( 'desc-link' => true ) ) .
+                                               '</td>' .
+                                               '<td valign="top">' .
+                                               $link .
+                                               $extract .
+                                               "<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
+                                               '</td>' .
+                                               '</tr>' .
+                                               '</table>' .
+                                               "</li>\n";
+                               }
+                       }
+               }
+
+               wfProfileOut( __METHOD__ );
+               return "<li>{$link} {$redirect} {$section} {$extract}\n" .
+                       "<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
+                       "</li>\n";
+
+       }
+
+       /**
+        * Show results from other wikis
+        * 
+        * @param SearchResultSet $matches
+        */
+       protected function showInterwiki( &$matches, $query ) {
+               wfProfileIn( __METHOD__ );
+
+               global $wgContLang;
+               $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
+
+               $out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".
+                       wfMsg('search-interwiki-caption')."</div>\n";           
+               $off = $this->offset + 1;
+               $out .= "<ul start='{$off}' class='mw-search-iwresults'>\n";
+
+               // work out custom project captions
+               $customCaptions = array();
+               $customLines = explode("\n",wfMsg('search-interwiki-custom')); // format per line <iwprefix>:<caption>
+               foreach($customLines as $line) {
+                       $parts = explode(":",$line,2);
+                       if(count($parts) == 2) // validate line
+                               $customCaptions[$parts[0]] = $parts[1]; 
+               }
+               
+               
+               $prev = null;
+               while( $result = $matches->next() ) {
+                       $out .= $this->showInterwikiHit( $result, $prev, $terms, $query, $customCaptions );
+                       $prev = $result->getInterwikiPrefix();
+               }
+               // FIXME: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
+               $out .= "</ul></div>\n";
+
+               // convert the whole thing to desired language variant
+               global $wgContLang;
+               $out = $wgContLang->convert( $out );
+               wfProfileOut( __METHOD__ );
+               return $out;
+       }
+       
+       /**
+        * Show single interwiki link
+        *
+        * @param SearchResult $result
+        * @param string $lastInterwiki
+        * @param array $terms
+        * @param string $query 
+        * @param array $customCaptions iw prefix -> caption
+        */
+       protected function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
+               wfProfileIn( __METHOD__ );
+               global $wgUser, $wgContLang, $wgLang;
+               
+               if( $result->isBrokenTitle() ) {
+                       wfProfileOut( __METHOD__ );
+                       return "<!-- Broken link in search result -->\n";
+               }
+               
+               $t = $result->getTitle();
+               $sk = $wgUser->getSkin();
+               
+               $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+                               
+               // format redirect if any
+               $redirectTitle = $result->getRedirectTitle();
+               $redirectText = $result->getRedirectSnippet($terms);
+               $redirect = '';
+               if( !is_null($redirectTitle) )
+                       $redirect = "<span class='searchalttitle'>"
+                               .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
+                               ."</span>";
+
+               $out = "";
+               // display project name 
+               if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()) {
+                       if( key_exists($t->getInterwiki(),$customCaptions) )
+                               // captions from 'search-interwiki-custom'
+                               $caption = $customCaptions[$t->getInterwiki()];
+                       else{
+                               // default is to show the hostname of the other wiki which might suck 
+                               // if there are many wikis on one hostname
+                               $parsed = parse_url($t->getFullURL());
+                               $caption = wfMsg('search-interwiki-default', $parsed['host']); 
+                       }               
+                       // "more results" link (special page stuff could be localized, but we might not know target lang)
+                       $searchTitle = Title::newFromText($t->getInterwiki().":Special:Search");                        
+                       $searchLink = $sk->makeKnownLinkObj( $searchTitle, wfMsg('search-interwiki-more'),
+                               wfArrayToCGI(array('search' => $query, 'fulltext' => 'Search'))); 
+                       $out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>
+                               {$searchLink}</span>{$caption}</div>\n<ul>";
+               }
+
+               $out .= "<li>{$link} {$redirect}</li>\n"; 
+               wfProfileOut( __METHOD__ );
+               return $out;
+       }
+       
+
+       /**
+        * Generates the power search box at bottom of [[Special:Search]]
+        * @param $term string: search term
+        * @return $out string: HTML form
+        */
+       protected function powerSearchBox( $term ) {
+               global $wgScript, $wgContLang;
+
+               $namespaces = SearchEngine::searchableNamespaces();
+
+               // group namespaces into rows according to subject; try not to make too
+               // many assumptions about namespace numbering
+               $rows = array();
+               foreach( $namespaces as $ns => $name ) {
+                       $subj = Namespace::getSubject( $ns );
+                       if( !array_key_exists( $subj, $rows ) ) {
+                               $rows[$subj] = "";
+                       }
+                       $name = str_replace( '_', ' ', $name );
+                       if( '' == $name ) {
+                               $name = wfMsg( 'blanknamespace' );
+                       }
+                       $rows[$subj] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) ) .
+                                       Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
+                                       Xml::closeElement( 'td' ) . "\n";
+               }
+               $rows = array_values( $rows );
+               $numRows = count( $rows );
+
+               // lay out namespaces in multiple floating two-column tables so they'll
+               // be arranged nicely while still accommodating different screen widths
+               $rowsPerTable = 3;  // seems to look nice
+
+               // float to the right on RTL wikis
+               $tableStyle = ( $wgContLang->isRTL() ?
+                               'float: right; margin: 0 0 1em 1em' :
+                               'float: left; margin: 0 1em 1em 0' );
+
+               $tables = "";
+               for( $i = 0; $i < $numRows; $i += $rowsPerTable ) {
+                       $tables .= Xml::openElement( 'table', array( 'style' => $tableStyle ) );
+                       for( $j = $i; $j < $i + $rowsPerTable && $j < $numRows; $j++ ) {
+                               $tables .= "<tr>\n" . $rows[$j] . "</tr>";
+                       }
+                       $tables .= Xml::closeElement( 'table' ) . "\n";
+               }
+
+               $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
+               $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
+               $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
+               $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n";
+               $searchTitle = SpecialPage::getTitleFor( 'Search' );
+               
+               $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
+                       Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n" .
+                       "<p>" .
+                       wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
+                       "</p>\n" .
+                       $tables .
+                       "<hr style=\"clear: both\" />\n" .
+                       "<p>" .
+                       $redirect . " " . $redirectLabel .
+                       "</p>\n" .
+                       wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
+                       "&nbsp;" .
+                       $searchField .
+                       "&nbsp;" .
+                       $searchButton .
+                       "</form>";
+               $t = Title::newFromText( $term );
+               if( $t != null )
+                       $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
+
+               return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
+                       Xml::element( 'legend', null, wfMsg('powersearch-legend') ) .
+                       $this->formHeader($term) . $out . 
+                       Xml::closeElement( 'fieldset' );
+       }
+
+       protected function powerSearchFocus() {
+               global $wgJsMimeType;
+               return "<script type=\"$wgJsMimeType\">" .
+                       "hookEvent(\"load\", function() {" .
+                               "document.getElementById('powerSearchText').focus();" .
+                       "});" .
+                       "</script>";
+       }
+       
+       /** Make a search link with some target namespaces */
+       protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params=array() ) {
+               $opt = $params;
+               foreach( $namespaces as $n ) {
+                       $opt['ns' . $n] = 1;
+               }
+               $opt['redirs'] = $this->searchRedirects ? 1 : 0;
+
+               $st = SpecialPage::getTitleFor( 'Search' );             
+               $stParams = wfArrayToCGI( array( 'search' => $term, 'fulltext' => wfMsg( 'search' ) ), $opt );
+
+               return Xml::element( 'a', 
+                       array( 'href'=> $st->getLocalURL( $stParams ), 'title' => $tooltip ), 
+                       $label );       
+       }
+       
+       /** Check if query starts with image: prefix */
+       protected function startsWithImage( $term ) {
+               global $wgContLang;
+               
+               $p = explode( ':', $term );
+               if( count( $p ) > 1 ) {
+                       return $wgContLang->getNsIndex( $p[0] ) == NS_IMAGE;
+               }
+               return false;
+       }
+
+       protected function formHeader( $term ) {
+               global $wgContLang, $wgCanonicalNamespaceNames;
+               
+               $sep = '&nbsp;&nbsp;&nbsp;';
+               $out = Xml::openElement('div', array( 'style' => 'padding-bottom:0.5em;' ) );
+               
+               $bareterm = $term;
+               if( $this->startsWithImage( $term ) )
+                       $bareterm = substr( $term, strpos( $term, ':' ) + 1 ); // delete all/image prefix
+                       
+               $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+               // figure out the active search profile header
+               if( $this->searchAdvanced )
+                       $active = 'advanced';
+               else if( $this->namespaces === NS_IMAGE || $this->startsWithImage( $term ) )
+                       $active = 'images';
+               elseif( $this->namespaces === $nsAllSet )
+                       $active = 'all';
+               elseif( $this->namespaces === SearchEngine::defaultNamespaces() )
+                       $active = 'default';
+               elseif( $this->namespaces === SearchEngine::defaultAndProjectNamespaces() )
+                       $active = 'withproject';
+               elseif( $this->namespaces === SearchEngine::projectNamespaces() )
+                       $active = 'project';
+               else
+                       $active = 'advanced';
+               
+               
+               // search profiles headers
+               $m = wfMsg( 'searchprofile-articles' );
+               $tt = wfMsg( 'searchprofile-articles-tooltip', 
+                       implode( ', ', SearchEngine::namespacesAsText( SearchEngine::defaultNamespaces() ) ) );
+               if( $active == 'default' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultNamespaces(), $m, $tt );
+               }
+               $out .= $sep;
+               
+               $m = wfMsg( 'searchprofile-images' );
+               $tt = wfMsg( 'searchprofile-images-tooltip' );
+               if( $active == 'images' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $imageTextForm = $wgContLang->getFormattedNsText(NS_IMAGE).':'.$bareterm;
+                       $out .= $this->makeSearchLink( $imageTextForm, array( NS_IMAGE ) , $m, $tt );
+               }
+               $out .= $sep;
+                       
+               $m = wfMsg( 'searchprofile-articles-and-proj' );
+               $tt = wfMsg( 'searchprofile-project-tooltip', 
+                       implode( ', ', SearchEngine::namespacesAsText( SearchEngine::defaultAndProjectNamespaces() ) ) );
+               if( $active == 'withproject' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultAndProjectNamespaces(), $m, $tt );
+               }
+               $out .= $sep;
+               
+               $m = wfMsg( 'searchprofile-project' );
+               $tt = wfMsg( 'searchprofile-project-tooltip', 
+                       implode( ', ', SearchEngine::namespacesAsText( SearchEngine::projectNamespaces() ) ) );
+               if( $active == 'project' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $out .= $this->makeSearchLink( $bareterm, SearchEngine::projectNamespaces(), $m, $tt );
+               }
+               $out .= $sep;
+                       
+               $m = wfMsg( 'searchprofile-everything' );
+               $tt = wfMsg( 'searchprofile-everything-tooltip' );
+               if( $active == 'all' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $out .= $this->makeSearchLink( $bareterm, $nsAllSet, $m, $tt );
+               }
+               $out .= $sep;
+               
+               $m = wfMsg( 'searchprofile-advanced' );
+               $tt = wfMsg( 'searchprofile-advanced-tooltip' );
+               if( $active == 'advanced' ) {
+                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );    
+               } else {
+                       $out .= $this->makeSearchLink( $bareterm, $this->namespaces, $m, $tt, array( 'advanced' => '1' ) );
+               }
+               $out .= Xml::closeElement('div') ;
+               
+               return $out;
+       }
+       
+       protected function shortDialog( $term ) {
+               global $wgScript;
+               $out = Xml::openElement( 'form', array( 'id' => 'search', 'method' => 'get', 'action' => $wgScript ) );
+               $searchTitle = SpecialPage::getTitleFor( 'Search' );
+               $out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
+               $out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . "\n";
+               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+                       if( in_array( $ns, $this->namespaces ) ) {
+                               $out .= Xml::hidden( "ns{$ns}", '1' );
+                       }
+               }
+               $out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
+               $out .= ' (' . wfMsgExt('searchmenu-help',array('parseinline') ) . ')';
+               $out .= Xml::closeElement( 'form' );
+               $t = Title::newFromText( $term );
+               if( $t != null )
+                       $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
+               return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
+                       Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
+                       $this->formHeader($term) . $out .
+                       Xml::closeElement( 'fieldset' );
+       }
+}
+
+/**
+ * implements Special:Search - Run text & title search and display the output
+ * @ingroup SpecialPage
+ */
+class SpecialSearchOld {
+
+       /**
+        * Set up basic search parameters from the request and user settings.
+        * Typically you'll pass $wgRequest and $wgUser.
+        *
+        * @param WebRequest $request
+        * @param User $user
+        * @public
+        */
+       function __construct( &$request, &$user ) {
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
 
                $this->namespaces = $this->powerSearch( $request );
@@ -123,8 +897,7 @@ class SpecialSearch {
         * @public
         */
        function showResults( $term ) {
-               $fname = 'SpecialSearch::showResults';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                global $wgOut, $wgUser;
                $sk = $wgUser->getSkin();
 
@@ -137,7 +910,7 @@ class SpecialSearch {
                        $wgOut->setSubtitle( '' );
                        $wgOut->addHTML( $this->powerSearchBox( $term ) );
                        $wgOut->addHTML( $this->powerSearchFocus() );
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
 
@@ -161,7 +934,7 @@ class SpecialSearch {
                                ) .
                                Xml::closeElement( 'fieldset' )
                        );
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
 
@@ -180,7 +953,7 @@ class SpecialSearch {
                        $wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
                        $wgOut->addHTML( $this->powerSearchBox( $term ) );
                        $wgOut->addHTML( $this->powerSearchFocus() );
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                
@@ -270,7 +1043,7 @@ class SpecialSearch {
                        $wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
                }
                $wgOut->addHTML( $this->powerSearchBox( $term ) );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        #------------------------------------------------------------------
@@ -329,8 +1102,7 @@ class SpecialSearch {
         * @param SearchResultSet $matches
         */
        function showMatches( &$matches ) {
-               $fname = 'SpecialSearch::showMatches';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgContLang;
                $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
@@ -353,7 +1125,7 @@ class SpecialSearch {
                // convert the whole thing to desired language variant
                global $wgContLang;
                $out = $wgContLang->convert( $out );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
 
@@ -363,12 +1135,11 @@ class SpecialSearch {
         * @param array $terms terms to highlight
         */
        function showHit( $result, $terms ) {
-               $fname = 'SpecialSearch::showHit';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                global $wgUser, $wgContLang, $wgLang;
                
                if( $result->isBrokenTitle() ) {
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return "<!-- Broken link in search result -->\n";
                }
                
@@ -381,7 +1152,7 @@ class SpecialSearch {
                //This is not quite safe, but better than showing excerpts from non-readable pages
                //Note that hiding the entry entirely would screw up paging.
                if (!$t->userCanRead()) {
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return "<li>{$link}</li>\n";
                }
 
@@ -389,7 +1160,7 @@ class SpecialSearch {
                // The least confusing at this point is to drop the result.
                // You may get less results, but... oh well. :P
                if( $result->isMissingRevision() ) {
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return "<!-- missing page " .
                                htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
                }
@@ -451,7 +1222,7 @@ class SpecialSearch {
                                $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
                                if( $thumb ) {
                                        $desc = $img->getShortDesc();
-                                       wfProfileOut( $fname );
+                                       wfProfileOut( __METHOD__ );
                                        // Ugly table. :D
                                        // Float doesn't seem to interact well with the bullets.
                                        // Table messes up vertical alignment of the bullet, but I'm
@@ -474,7 +1245,7 @@ class SpecialSearch {
                        }
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return "<li>{$link} {$redirect} {$section} {$extract}\n" .
                        "<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
                        "</li>\n";
@@ -487,8 +1258,7 @@ class SpecialSearch {
         * @param SearchResultSet $matches
         */
        function showInterwiki( &$matches, $query ) {
-               $fname = 'SpecialSearch::showInterwiki';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgContLang;
                $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
@@ -518,7 +1288,7 @@ class SpecialSearch {
                // convert the whole thing to desired language variant
                global $wgContLang;
                $out = $wgContLang->convert( $out );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
        
@@ -531,13 +1301,12 @@ class SpecialSearch {
         * @param string $query 
         * @param array $customCaptions iw prefix -> caption
         */
-       function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions){
-               $fname = 'SpecialSearch::showInterwikiHit';
-               wfProfileIn( $fname );
+       function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
+               wfProfileIn( __METHOD__ );
                global $wgUser, $wgContLang, $wgLang;
                
                if( $result->isBrokenTitle() ) {
-                       wfProfileOut( $fname );
+                       wfProfileOut( __METHOD__ );
                        return "<!-- Broken link in search result -->\n";
                }
                
@@ -575,7 +1344,7 @@ class SpecialSearch {
                }
 
                $out .= "<li>{$link} {$redirect}</li>\n"; 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
        
index 2b2c852..239ce97 100644 (file)
@@ -1418,52 +1418,72 @@ Note that using the navigation links will reset this column.',
 'diff-strike'             => "'''strikethrough'''",
 
 # Search results
-'searchresults'             => 'Search results',
-'searchresults-title'       => 'Search results for $1',
-'searchresulttext'          => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]] | [[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
-'searchsubtitleinvalid'     => "You searched for '''$1'''",
-'noexactmatch'              => "'''There is no page titled \"\$1\".'''
+'searchresults'                    => 'Search results',
+'searchresults-title'              => 'Search results for "$1"',
+'searchresulttext'                 => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]] | [[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
+'searchsubtitleinvalid'            => "You searched for '''$1'''",
+'noexactmatch'                     => "'''There is no page titled \"\$1\".'''
 You can [[:\$1|create this page]].",
-'noexactmatch-nocreate'     => "'''There is no page titled \"\$1\".'''",
-'toomanymatches'            => 'Too many matches were returned, please try a different query',
-'titlematches'              => 'Page title matches',
-'notitlematches'            => 'No page title matches',
-'textmatches'               => 'Page text matches',
-'notextmatches'             => 'No page text matches',
-'prevn'                     => 'previous $1',
-'nextn'                     => 'next $1',
-'viewprevnext'              => 'View ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 word|$2 words}})',
-'search-result-score'       => 'Relevance: $1%',
-'search-redirect'           => '(redirect $1)',
-'search-section'            => '(section $1)',
-'search-suggest'            => 'Did you mean: $1',
-'search-interwiki-caption'  => 'Sister projects',
-'search-interwiki-default'  => '$1 results:',
-'search-interwiki-custom'   => '', # do not translate or duplicate this message to other languages
-'search-interwiki-more'     => '(more)',
-'search-mwsuggest-enabled'  => 'with suggestions',
-'search-mwsuggest-disabled' => 'no suggestions',
-'search-relatedarticle'     => 'Related',
-'mwsuggest-disable'         => 'Disable AJAX suggestions',
-'searchrelated'             => 'related',
-'searchall'                 => 'all',
-'showingresults'            => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.",
-'showingresultsnum'         => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
-'showingresultstotal'       => "Showing below {{PLURAL:$4|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
-'nonefound'                 => "'''Note''': Only some namespaces are searched by default.
+'noexactmatch-nocreate'            => "'''There is no page titled \"\$1\".'''",
+'toomanymatches'                   => 'Too many matches were returned, please try a different query',
+'titlematches'                     => 'Page title matches',
+'notitlematches'                   => 'No page title matches',
+'textmatches'                      => 'Page text matches',
+'notextmatches'                    => 'No page text matches',
+'prevn'                            => 'previous $1',
+'nextn'                            => 'next $1',
+'viewprevnext'                     => 'View ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Search options',
+'searchmenu-exists'                => "'''There is page named \"[[\$1]]\" on this wiki'''",
+'searchmenu-new'                   => "'''[[:$1|Create]] the page ''$1'' on this wiki!'''",
+'searchhelp-url'                   => 'Help:Contents',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Browse pages with this prefix]]',
+'searchmenu-help'                  => '[[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]?', # do not translate or duplicate this message to other languages
+'searchprofile-articles'           => 'Pages',
+'searchprofile-articles-and-proj'  => 'Pages & Project',
+'searchprofile-project'            => 'Project',
+'searchprofile-images'             => 'Files',
+'searchprofile-everything'         => 'Everything',
+'searchprofile-advanced'           => 'Advanced',
+'searchprofile-articles-tooltip'   => 'Search in $1',
+'searchprofile-project-tooltip'    => 'Search in $1',
+'searchprofile-images-tooltip'     => 'Search for files',
+'searchprofile-everything-tooltip' => 'Search all of content (including talk pages)',
+'searchprofile-advanced-tooltip'   => 'Search in custom namespaces',
+'prefs-search-nsdefault'           => 'Search using defaults:',
+'prefs-search-nscustom'            => 'Search custom namespaces:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 word|$2 words}})',
+'search-result-score'              => 'Relevance: $1%',
+'search-redirect'                  => '(redirect $1)',
+'search-section'                   => '(section $1)',
+'search-suggest'                   => 'Did you mean: $1',
+'search-interwiki-caption'         => 'Sister projects',
+'search-interwiki-default'         => '$1 results:',
+'search-interwiki-custom'          => '', # do not translate or duplicate this message to other languages
+'search-interwiki-more'            => '(more)',
+'search-mwsuggest-enabled'         => 'with suggestions',
+'search-mwsuggest-disabled'        => 'no suggestions',
+'search-relatedarticle'            => 'Related',
+'mwsuggest-disable'                => 'Disable AJAX suggestions',
+'searchrelated'                    => 'related',
+'searchall'                        => 'all',
+'showingresults'                   => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.",
+'showingresultsnum'                => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
+'showingresultstotal'              => "Showing below {{PLURAL:$4|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
+'nonefound'                        => "'''Note''': Only some namespaces are searched by default.
 Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.",
-'powersearch'               => 'Advanced search',
-'powersearch-legend'        => 'Advanced search',
-'powersearch-ns'            => 'Search in namespaces:',
-'powersearch-redir'         => 'List redirects',
-'powersearch-field'         => 'Search for',
-'search-external'           => 'External search',
-'searchdisabled'            => '{{SITENAME}} search is disabled.
+'search-nonefound'                 => 'There were no results matching the query.',
+'powersearch'                      => 'Advanced search',
+'powersearch-legend'               => 'Advanced search',
+'powersearch-ns'                   => 'Search in namespaces:',
+'powersearch-redir'                => 'List redirects',
+'powersearch-field'                => 'Search for',
+'search-external'                  => 'External search',
+'searchdisabled'                   => '{{SITENAME}} search is disabled.
 You can search via Google in the meantime.
 Note that their indexes of {{SITENAME}} content may be out of date.',
-'googlesearch'              => '<form method="get" action="http://www.google.com/search" id="googlesearch">
+'googlesearch'                     => '<form method="get" action="http://www.google.com/search" id="googlesearch">
     <input type="hidden" name="domains" value="{{SERVER}}" />
     <input type="hidden" name="num" value="50" />
     <input type="hidden" name="ie" value="$2" />
index a5e5b05..e9d12e2 100644 (file)
@@ -773,6 +773,25 @@ $wgMessageStructure = array(
                'prevn',
                'nextn',
                'viewprevnext',
+               'searchmenu-legend',
+               'searchmenu-exists',
+               'searchmenu-new',
+               'searchhelp-url',
+               'searchmenu-prefix',
+               'searchmenu-help',
+               'searchprofile-articles',
+               'searchprofile-articles-and-proj',
+               'searchprofile-project',
+               'searchprofile-images',
+               'searchprofile-everything',
+               'searchprofile-advanced',
+               'searchprofile-articles-tooltip',
+               'searchprofile-project-tooltip',
+               'searchprofile-images-tooltip',
+               'searchprofile-everything-tooltip',
+               'searchprofile-advanced-tooltip',
+               'prefs-search-nsdefault',
+               'prefs-search-nscustom',
                'search-result-size',
                'search-result-score',
                'search-redirect',
@@ -792,6 +811,7 @@ $wgMessageStructure = array(
                'showingresultsnum',
                'showingresultstotal',
                'nonefound',
+               'search-nonefound',
                'powersearch',
                'powersearch-legend',
                'powersearch-ns',
index b6020d8..8dad1e1 100644 (file)
@@ -106,12 +106,18 @@ div.searchresult {
 }
 .mw-search-results li {
        padding-bottom: 1em;
+       list-style:none;
 }
 .mw-search-result-data {
        color: green;
        font-size: 97%;
 }
 
+td#mw-search-menu {
+       padding-left:6em;
+       font-size:85%;
+}
+
 div#mw-search-interwiki {
        float: right;
        width: 18em;
@@ -144,6 +150,14 @@ div.searchdidyoumean {
        font-weight: bold;
 }
 
+div.searchresults {
+       border:1px solid darkblue;
+       padding-top: 5px;
+       padding-bottom: 5px;
+       padding-left: 15px;
+       padding-right: 15px;
+}
+
 /*
  * UserRights stuff
  */
index 170dae4..1824fa5 100644 (file)
@@ -1409,6 +1409,10 @@ div#searchTargetHide {
        padding:2px;
 }
 
+#powersearch p {
+       margin-top:0px;
+}
+
 div.multipageimagenavbox {
    border: solid 1px silver;
    padding: 4px;