From: Federico Leva <federicoleva@tiscali.it>
Date: Wed, 16 Sep 2015 18:27:39 +0000 (+0200)
Subject: Explicitly float local search results left so they come first
X-Git-Tag: 1.31.0-rc.0~9948^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=35b6a6dcf9e6c6d5d132fa0cb0e01308b65a3b02;p=lhc%2Fweb%2Fwiklou.git

Explicitly float local search results left so they come first

Invert HTML output order; div#mw-search-interwiki already floats right
and this way it goes up only if there is enough space for it.
Clear both before the search pager, so that it stays where it is.
See https://phabricator.wikimedia.org/F2610402 for Chromium test.

Bug: T87631
Change-Id: Ieabb9ded4325e47a53a430c7af7d5b986bc20f2d
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index af2dc94b32..f727a9a68c 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -369,14 +369,14 @@ class SpecialSearch extends SpecialPage {
 				$out->wrapWikiMsg( "==$1==\n", 'textmatches' );
 			}
 
-			// show interwiki results if any
-			if ( $textMatches->hasInterwikiResults() ) {
-				$out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
-			}
 			// show results
 			if ( $numTextMatches > 0 ) {
 				$out->addHTML( $this->showMatches( $textMatches ) );
 			}
+			// show interwiki results if any
+			if ( $textMatches->hasInterwikiResults() ) {
+				$out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
+			}
 
 			$textMatches->free();
 		}
@@ -391,6 +391,7 @@ class SpecialSearch extends SpecialPage {
 			}
 		}
 
+		$out->addHTML( '<div class="visualClear"></div>\n' );
 		if ( $prevnext ) {
 			$out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
 		}
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css b/resources/src/mediawiki.special/mediawiki.special.search.css
index 8f845dfa62..b869314338 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.css
@@ -27,6 +27,7 @@ div.searchresult {
 }
 .mw-search-results {
 	margin-left: 0.4em;
+	float: left;
 }
 .mw-search-results li {
 	padding-bottom: 1.2em;