From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 12 Jan 2016 00:07:45 +0000 (+0000)
Subject: Merge "SpecialComparePages: Float the boxes, if available space is given"
X-Git-Tag: 1.31.0-rc.0~8375
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=5bd4dd1f262683cff76d8b47d19c0b263bf01774;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "SpecialComparePages: Float the boxes, if available space is given"
---

5bd4dd1f262683cff76d8b47d19c0b263bf01774
diff --combined includes/specials/SpecialComparePages.php
index 086bcc9f83,1deea8e351..fbc5984e02
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@@ -49,7 -49,9 +49,8 @@@ class SpecialComparePages extends Speci
  	public function execute( $par ) {
  		$this->setHeaders();
  		$this->outputHeader();
+ 		$this->getOutput()->addModuleStyles( 'mediawiki.special.comparepages.styles' );
  
 -		# Form (.mw-searchInput enables suggestions)
  		$form = HTMLForm::factory( 'ooui', array(
  			'Page1' => array(
  				'type' => 'title',
diff --combined resources/Resources.php
index 0d27f87660,0939e116d4..52a9564847
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -355,6 -355,9 +355,6 @@@ return array
  		'scripts' => 'resources/lib/jquery/jquery.ba-throttle-debounce.js',
  		'targets' => array( 'desktop', 'mobile' ),
  	),
 -	'jquery.validate' => array(
 -		'scripts' => 'resources/lib/jquery/jquery.validate.js',
 -	),
  	'jquery.xmldom' => array(
  		'scripts' => 'resources/lib/jquery/jquery.xmldom.js',
  	),
@@@ -832,6 -835,7 +832,6 @@@
  	'mediawiki.apihelp' => array(
  		'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css',
  		'targets' => array( 'desktop' ),
 -		'dependencies' => 'mediawiki.hlist',
  		'position' => 'top',
  	),
  	'mediawiki.template' => array(
@@@ -1025,6 -1029,8 +1025,6 @@@
  	),
  	'mediawiki.hlist' => array(
  		'styles' => 'resources/src/mediawiki/mediawiki.hlist.css',
 -		'scripts' => 'resources/src/mediawiki/mediawiki.hlist.js',
 -		'dependencies' => 'jquery.client',
  	),
  	'mediawiki.htmlform' => array(
  		'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
@@@ -1715,6 -1721,10 +1715,10 @@@
  		'position' => 'top',
  		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js',
  	),
+ 	'mediawiki.special.comparepages.styles' => array(
+ 		'position' => 'top',
+ 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less',
+ 	),
  	'mediawiki.special.edittags' => array(
  		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.edittags.js',
  		'dependencies' => array(
@@@ -2062,69 -2072,6 +2066,69 @@@
  		),
  		'targets' => array( 'desktop', 'mobile' ),
  	),
 +	'mediawiki.widgets.datetime' => array(
 +		'scripts' => array(
 +			'resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js',
 +			'resources/src/mediawiki.widgets.datetime/CalendarWidget.js',
 +			'resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js',
 +			'resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js',
 +			'resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js',
 +		),
 +		'skinStyles' => array(
 +			'default' => array(
 +				'resources/src/mediawiki.widgets.datetime/CalendarWidget.less',
 +				'resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less',
 +			),
 +		),
 +		'messages' => array(
 +			'timezone-utc',
 +			'timezone-local',
 +			'january',
 +			'february',
 +			'march',
 +			'april',
 +			'may_long',
 +			'june',
 +			'july',
 +			'august',
 +			'september',
 +			'october',
 +			'november',
 +			'december',
 +			'jan',
 +			'feb',
 +			'mar',
 +			'apr',
 +			'may',
 +			'jun',
 +			'jul',
 +			'aug',
 +			'sep',
 +			'oct',
 +			'nov',
 +			'dec',
 +			'sunday',
 +			'monday',
 +			'tuesday',
 +			'wednesday',
 +			'thursday',
 +			'friday',
 +			'saturday',
 +			'sun',
 +			'mon',
 +			'tue',
 +			'wed',
 +			'thu',
 +			'fri',
 +			'sat',
 +			'period-am',
 +			'period-pm',
 +		),
 +		'dependencies' => array(
 +			'oojs-ui',
 +		),
 +		'targets' => array( 'desktop', 'mobile' ),
 +	),
  	'mediawiki.widgets.CategorySelector' => array(
  		'scripts' => array(
  			'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',