r91736 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r91735‎ | r91736 | r91737 >
Date:17:20, 8 July 2011
Author:diebuche
Status:ok
Tags:
Comment:
r91734: Do the same for search.css and remove module from resources.php
Modified paths:
  • /trunk/phase3/includes/specials/SpecialSearch.php (modified) (history)
  • /trunk/phase3/resources/Resources.php (modified) (history)
  • /trunk/phase3/resources/mediawiki.special/mediawiki.special.search.css (added) (history)
  • /trunk/phase3/skins/common/search.css (deleted) (history)

Diff [purge]

Index: trunk/phase3/skins/common/search.css
@@ -1,14 +0,0 @@
2 -/**
3 - * Fixes sister projects box moving down the extract
4 - * of the first result (bug #16886).
5 - * It only happens when the window is small and
6 - * This changes slightly the layout for big screens
7 - * where there was space for the extracts and the
8 - * sister projects and thus it showed like in any
9 - * other browser.
10 - *
11 - * This will only affect IE 7 and lower
12 - */
13 -.searchresult {
14 - display: inline !ie;
15 -}
Index: trunk/phase3/includes/specials/SpecialSearch.php
@@ -407,7 +407,6 @@
408408 $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) );
409409 }
410410 // add javascript specific to special:search
411 - $wgOut->addModules( 'mediawiki.legacy.search' );
412411 $wgOut->addModules( 'mediawiki.special.search' );
413412 }
414413
Index: trunk/phase3/resources/Resources.php
@@ -535,6 +535,7 @@
536536 ),
537537 'mediawiki.special.search' => array(
538538 'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
 539+ 'styles' => 'resources/mediawiki.special/mediawiki.special.search.css',
539540 ),
540541 'mediawiki.special.block' => array(
541542 'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
@@ -669,13 +670,6 @@
670671 'jquery.byteLimit',
671672 ),
672673 ),
673 - 'mediawiki.legacy.search' => array(
674 - 'scripts' => 'common/search.js',
675 - 'remoteBasePath' => $GLOBALS['wgStylePath'],
676 - 'localBasePath' => $GLOBALS['wgStyleDirectory'],
677 - 'styles' => 'common/search.css',
678 - 'dependencies' => 'mediawiki.legacy.wikibits',
679 - ),
680674 'mediawiki.legacy.shared' => array(
681675 'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
682676 'remoteBasePath' => $GLOBALS['wgStylePath'],
Index: trunk/phase3/resources/mediawiki.special/mediawiki.special.search.css
@@ -0,0 +1,14 @@
 2+/**
 3+ * Fixes sister projects box moving down the extract
 4+ * of the first result (bug #16886).
 5+ * It only happens when the window is small and
 6+ * This changes slightly the layout for big screens
 7+ * where there was space for the extracts and the
 8+ * sister projects and thus it showed like in any
 9+ * other browser.
 10+ *
 11+ * This will only affect IE 7 and lower
 12+ */
 13+.searchresult {
 14+ display: inline !ie;
 15+}
Property changes on: trunk/phase3/resources/mediawiki.special/mediawiki.special.search.css
___________________________________________________________________
Added: svn:eol-style
116 + native

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r91734Migrate skins/common/search.js functionality to mediawiki.special.search.js. ...diebuche17:07, 8 July 2011

Status & tagging log