r59858 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r59857‎ \| r59858 \| r59859 >
Date:	23:09, 8 December 2009
Author:	catrope
Status:	ok
Tags:
Comment:	wmf-deployment: Merge r59224, r59254, r59680, r59683, r59806 (usability fixes) from trunk
Modified paths:	/branches/wmf-deployment/includes/DefaultSettings.php (modified) (history) /branches/wmf-deployment/includes/Skin.php (modified) (history) /branches/wmf-deployment/skins/common/ajaxwatch.js (modified) (history) /branches/wmf-deployment/skins/vector (modified) (history) /branches/wmf-deployment/skins/vector/experiments (modified) (history) /branches/wmf-deployment/skins/vector/main-ltr.css (modified) (history) /branches/wmf-deployment/skins/vector/main-rtl.css (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/skins/common/ajaxwatch.js
—	—	@@ -12,7 +12,9 @@
13	13	watchMsg: "Watch",
14	14	unwatchMsg: "Unwatch",
15	15	watchingMsg: "Watching...",
16		~~- unwatchingMsg: "Unwatching..."~~
	16	+ unwatchingMsg: "Unwatching...",
	17	+ 'tooltip-ca-watchMsg': "Add this page to your watchlist",
	18	+ 'tooltip-ca-unwatchMsg': "Remove this page from your watchlist"
17	19	};
18	20	}
19	21
—	—	@@ -31,7 +33,14 @@
32	34	if ( newText == wgAjaxWatch.watchingMsg \|\| newText == wgAjaxWatch.unwatchingMsg ) {
33	35	wgAjaxWatch.watchLinks[i].className += ' loading';
34	36	} else if ( newText == wgAjaxWatch.watchMsg \|\| newText == wgAjaxWatch.unwatchMsg ) {
35		~~- wgAjaxWatch.watchLinks[i].className = wgAjaxWatch.watchLinks[i].className.replace( /loading/i, '' );~~
	37	+ wgAjaxWatch.watchLinks[i].className =
	38	+ wgAjaxWatch.watchLinks[i].className.replace( /loading/i, '' );
	39	+ // update the title text on the link
	40	+ var keyCommand = wgAjaxWatch.watchLinks[i].title.match( /\[.*?\]$/ ) ?
	41	+ wgAjaxWatch.watchLinks[i].title.match( /\[.*?\]$/ )[0] : "";
	42	+ wgAjaxWatch.watchLinks[i].title = ( newText == wgAjaxWatch.watchMsg ?
	43	+ wgAjaxWatch['tooltip-ca-watchMsg'] : wgAjaxWatch['tooltip-ca-unwatchMsg'] )
	44	+ + " " + keyCommand;
36	45	}
37	46	}
38	47	} else {
Property changes on: branches/wmf-deployment/skins/common/ajaxwatch.js
___________________________________________________________________
Name: svn:mergeinfo
39	48	+ /branches/REL1_15/phase3/skins/common/ajaxwatch.js:51646
/trunk/phase3/skins/common/ajaxwatch.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59680,59683
Property changes on: branches/wmf-deployment/skins/vector/experiments
___________________________________________________________________
Name: svn:mergeinfo
40	49	- /branches/REL1_15/phase3/skins/vector/experiments:51646
/trunk/phase3/skins/vector/experiments:57541,57916,58151,58219,58633,58816
41	50	+ /branches/REL1_15/phase3/skins/vector/experiments:51646
/trunk/phase3/skins/vector/experiments:57541,57916,58151,58219,58633,58816,59224,59254,59806
Index: branches/wmf-deployment/skins/vector/main-ltr.css
—	—	@@ -205,6 +205,7 @@
206	206	background-position: center center;
207	207	background-repeat: no-repeat;
208	208	}
	209	+ /* @noflip */
209	210	body.rtl div.vectorMenu {
210	211	direction: rtl;
211	212	}
—	—	@@ -212,21 +213,29 @@
213	214	#head div.vectorMenu h5 {
214	215	float: left;
215	216	background-image: url(images/tab-break.png);
	217	+ background-repeat: no-repeat;
	218	+ }
	219	+ /* IGNORED BY IE6 */
	220	+ #head div.vectorMenu > h5 {
	221	+ background-image: none;
	222	+ }
	223	+ #head div.vectorMenu h5 {
216	224	background-position: bottom left;
217		~~- background-repeat: no-repeat;~~
218		~~- padding-left: 1px;~~
219	225	margin-left: -1px;
220	226	}
221	227	/* OVERRIDDEN BY COMPLIANT BROWSERS */
	228	+ /* @noflip */
222	229	div.vectorMenu h5 a {
223	230	display: inline-block;
224	231	width: 24px;
225	232	height: 2.5em;
226	233	text-decoration: none;
227	234	background-image: url(images/tab-break.png);
228		~~- background-position: bottom right;~~
229	235	background-repeat: no-repeat;
230	236	}
	237	+ div.vectorMenu h5 a{
	238	+ background-position: bottom right;
	239	+ }
231	240	/* IGNORED BY IE6 */
232	241	div.vectorMenu h5 > a {
233	242	display: block;
—	—	@@ -238,17 +247,20 @@
239	248	text-align: left;
240	249	}
241	250	/* OVERRIDDEN BY COMPLIANT BROWSERS */
	251	+ /* @noflip */
242	252	body.rtl div.vectorMenu div.menu {
243		~~- margin-right: 24px;~~
	253	+ margin-left: 24px;
244	254	}
245	255	/* IGNORED BY IE6 */
	256	+ /* @noflip */
246	257	body.rtl div.vectorMenu > div.menu {
247		~~- margin-right: auto;~~
	258	+ margin-left: auto;
248	259	}
249	260	/* Fixes old versions of FireFox */
	261	+ /* @noflip */
250	262	body.rtl div.vectorMenu > div.menu,
251	263	x:-moz-any-link {
252		~~- margin-right: 24px;~~
	264	+ margin-left: 23px;
253	265	}
254	266	div.vectorMenu:hover div.menu {
255	267	display: block;
—	—	@@ -1093,4 +1105,4 @@
1094	1106	background-image:url(images/tab-break.png);
1095	1107	background-position:right bottom;
1096	1108	background-repeat:no-repeat;
1097		-}
\ No newline at end of file
	1109	+}
Index: branches/wmf-deployment/skins/vector/main-rtl.css
—	—	@@ -205,6 +205,7 @@
206	206	background-position: center center;
207	207	background-repeat: no-repeat;
208	208	}
	209	+ /* @noflip */
209	210	body.rtl div.vectorMenu {
210	211	direction: rtl;
211	212	}
—	—	@@ -212,21 +213,29 @@
213	214	#head div.vectorMenu h5 {
214	215	float: left;
215	216	background-image: url(images/tab-break.png);
216		~~- background-position: bottom left;~~
217	217	background-repeat: no-repeat;
218		~~- padding-left: 1px;~~
219		~~- margin-left: -1px;~~
220	218	}
	219	+ /* IGNORED BY IE6 */
	220	+ #head div.vectorMenu > h5 {
	221	+ background-image: none;
	222	+ }
	223	+ #head div.vectorMenu h5 {
	224	+ background-position: bottom right;
	225	+ margin-right: -1px;
	226	+ }
221	227	/* OVERRIDDEN BY COMPLIANT BROWSERS */
	228	+ /* @noflip */
222	229	div.vectorMenu h5 a {
223	230	display: inline-block;
224	231	width: 24px;
225	232	height: 2.5em;
226	233	text-decoration: none;
227	234	background-image: url(images/tab-break.png);
228		~~- background-position: bottom left;~~
229	235	background-repeat: no-repeat;
230	236	}
	237	+ div.vectorMenu h5 a{
	238	+ background-position: bottom left;
	239	+ }
231	240	/* IGNORED BY IE6 */
232	241	div.vectorMenu h5 > a {
233	242	display: block;
—	—	@@ -238,17 +247,20 @@
239	248	text-align: right;
240	249	}
241	250	/* OVERRIDDEN BY COMPLIANT BROWSERS */
	251	+ /* @noflip */
242	252	body.rtl div.vectorMenu div.menu {
243	253	margin-left: 24px;
244	254	}
245	255	/* IGNORED BY IE6 */
	256	+ /* @noflip */
246	257	body.rtl div.vectorMenu > div.menu {
247	258	margin-left: auto;
248	259	}
249	260	/* Fixes old versions of FireFox */
	261	+ /* @noflip */
250	262	body.rtl div.vectorMenu > div.menu,
251	263	x:-moz-any-link {
252		~~- margin-left: 24px;~~
	264	+ margin-left: 23px;
253	265	}
254	266	div.vectorMenu:hover div.menu {
255	267	display: block;
—	—	@@ -1093,4 +1105,4 @@
1094	1106	background-image:url(images/tab-break.png);
1095	1107	background-position:left bottom;
1096	1108	background-repeat:no-repeat;
1097		-}
\ No newline at end of file
	1109	+}
Property changes on: branches/wmf-deployment/skins/vector
___________________________________________________________________
Name: svn:mergeinfo
1098	1110	+ /branches/REL1_15/phase3/skins/vector:51646
/trunk/phase3/skins/vector:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59224,59254,59806
Index: branches/wmf-deployment/includes/DefaultSettings.php
—	—	@@ -1605,7 +1605,7 @@
1606	1606	* to ensure that client-side caches do not keep obsolete copies of global
1607	1607	* styles.
1608	1608	*/
1609		~~-$wgStyleVersion = '254';~~
	1609	+$wgStyleVersion = '257';
1610	1610
1611	1611
1612	1612	# Server-side caching:
Property changes on: branches/wmf-deployment/includes/DefaultSettings.php
___________________________________________________________________
Name: svn:mergeinfo
1613	1613	- /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/wmf-deployment/includes/DefaultSettings.php:53381
/trunk/phase3/includes/DefaultSettings.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59607
1614	1614	+ /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/wmf-deployment/includes/DefaultSettings.php:53381
/trunk/phase3/includes/DefaultSettings.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59607,59680,59683
Index: branches/wmf-deployment/includes/Skin.php
—	—	@@ -443,7 +443,8 @@
444	444
445	445	if ( $wgOut->isArticleRelated() && $wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
446	446	$msgs = (object)array();
447		~~- foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching' ) as $msgName ) {~~
	447	+ foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching',
	448	+ 'tooltip-ca-watch', 'tooltip-ca-unwatch' ) as $msgName ) {
448	449	$msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
449	450	}
450	451	$vars['wgAjaxWatch'] = $msgs;
Property changes on: branches/wmf-deployment/includes/Skin.php
___________________________________________________________________
Name: svn:mergeinfo
451	452	- /branches/REL1_15/phase3/includes/Skin.php:51646
/branches/wmf-deployment/includes/Skin.php:53381
/trunk/phase3/includes/Skin.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56523,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816
452	453	+ /branches/REL1_15/phase3/includes/Skin.php:51646
/branches/wmf-deployment/includes/Skin.php:53381
/trunk/phase3/includes/Skin.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56523,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59680,59683

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r59224	Fixing a spacing issue with RTL langauges and the dropdown menu	adam	22:35, 18 November 2009
r59254	a followup, better fix for what r59224 aimed to do: Fixing a spacing issue wi...	adam	17:16, 19 November 2009
r59680	Adding some code to the ajax watch/unwatch to alter tooltips on ajax update. ...	adam	21:22, 2 December 2009
r59683	Follow change to r59680. Adding a better regex	adam	21:43, 2 December 2009
r59806	Used more @noflip rules to make some of the margins a bit less confusing.	tparscal	23:03, 7 December 2009

Status & tagging log

23:30, 8 December 2009 Tim Starling (talk | contribs) changed the status of r59858 [removed: new added: ok]