r67753 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r67752‎ \| r67753 \| r67754 >
Date:	19:52, 9 June 2010
Author:	catrope
Status:	deferred (Comments)
Tags:
Comment:	1.16wmf4: Merge some Vector fixes from trunk: r67537, r67544, r67576, r67631, r67640, r67703
Modified paths:	/branches/wmf/1.16wmf4/skins (modified) (history) /branches/wmf/1.16wmf4/skins/Vector.php (modified) (history) /branches/wmf/1.16wmf4/skins/vector (modified) (history) /branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-a.css (modified) (history) /branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-b.css (modified) (history) /branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-c.css (modified) (history) /branches/wmf/1.16wmf4/skins/vector/experiments/new-tabs.css (modified) (history) /branches/wmf/1.16wmf4/skins/vector/main-ltr.css (modified) (history) /branches/wmf/1.16wmf4/skins/vector/main-rtl.css (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/skins/Vector.php
—	—	@@ -38,7 +38,7 @@
39	39	// wait for the CSS file to load before fetching the HTC file.
40	40	$out->addScript(
41	41	'<!--[if lt IE 7]><style type="text/css">body{behavior:url("' .
42		~~- $wgLocalStylePath .~~
	42	+ htmlspecialchars( $wgLocalStylePath ) .
43	43	'/vector/csshover.htc")}</style><![endif]-->'
44	44	);
45	45	// Add extra stylesheets
—	—	@@ -55,7 +55,7 @@
56	56	* @private
57	57	*/
58	58	function buildNavigationUrls() {
59		~~- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle, $wgStylePath;~~
	59	+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
60	60	global $wgDisableLangConversion, $wgVectorUseIconWatch;
61	61
62	62	wfProfileIn( __METHOD__ );
—	—	@@ -448,8 +448,8 @@
449	449	// Output HTML Page
450	450	$this->html( 'headelement' );
451	451	?>
452		~~- <div id="page-base" class="noprint"></div>~~
453		~~- <div id="head-base" class="noprint"></div>~~
	452	+ <div id="mw-page-base" class="noprint"></div>
	453	+ <div id="mw-head-base" class="noprint"></div>
454	454	<!-- content -->
455	455	<div id="content"<?php $this->html('specialpageattributes') ?>>
456	456	<a id="top"></a>
—	—	@@ -483,7 +483,7 @@
484	484	<?php if ( $this->data['showjumplinks'] ): ?>
485	485	<!-- jumpto -->
486	486	<div id="jump-to-nav">
487		~~- <?php $this->msg( 'jumpto' ) ?><a href="#head"><?php $this->msg( 'jumptonavigation' ) ?></a>,~~
	487	+ <?php $this->msg( 'jumpto' ) ?> <a href="#head"><?php $this->msg( 'jumptonavigation' ) ?></a>,
488	488	<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
489	489	</div>
490	490	<!-- /jumpto -->
—	—	@@ -507,7 +507,7 @@
508	508	</div>
509	509	<!-- /content -->
510	510	<!-- header -->
511		~~- <div id="head" class="noprint">~~
	511	+ <div id="mw-head" class="noprint">
512	512	<?php $this->renderNavigation( 'PERSONAL' ); ?>
513	513	<div id="left-navigation">
514	514	<?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
—	—	@@ -518,7 +518,7 @@
519	519	</div>
520	520	<!-- /header -->
521	521	<!-- panel -->
522		~~- <div id="panel" class="noprint">~~
	522	+ <div id="mw-panel" class="noprint">
523	523	<!-- logo -->
524	524	<div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
525	525	<!-- /logo -->
—	—	@@ -661,7 +661,7 @@
662	662	* when UI is in RTL mode
663	663	*/
664	664	private function renderNavigation( $elements ) {
665		~~- global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgStylePath;~~
	665	+ global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
666	666
667	667	// If only one element was given, wrap it in an array, allowing more
668	668	// flexible arguments
Property changes on: branches/wmf/1.16wmf4/skins/Vector.php
___________________________________________________________________
Name: svn:mergeinfo
669	669	- /branches/wmf-deployment/skins/Vector.php:60970
/trunk/phase3/skins/Vector.php:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,66374,66403
670	670	+ /branches/wmf-deployment/skins/Vector.php:60970
/trunk/phase3/skins/Vector.php:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,66374,66403,67537,67544,67576,67631,67640,67703
Index: branches/wmf/1.16wmf4/skins/vector/experiments/new-tabs.css
—	—	@@ -191,7 +191,7 @@
192	192	direction: rtl;
193	193	}
194	194	/* @noflip */
195		~~- body #head div.vectorMenu h5 {~~
	195	+ body #mw-head div.vectorMenu h5 {
196	196	background-image: url(../images/arrow-down-icon.png);
197	197	background-position: center center;
198	198	background-repeat: no-repeat;
—	—	@@ -319,4 +319,4 @@
320	320	}
321	321	.wikiEditor-ui-tabs div.current a {
322	322	background: #FFFFFF;
323		-}
\ No newline at end of file
	323	+}
Index: branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-a.css
—	—	@@ -13,7 +13,7 @@
14	14	}
15	15
16	16	/* Framework */
17		~~-#page-base {~~
	17	+#mw-page-base {
18	18	background-color: inherit !important;
19	19	background-image: none !important;
20	20	}
—	—	@@ -65,10 +65,10 @@
66	66	font-family:sans-serif;
67	67	font-weight:normal;
68	68	}
69		~~-body #panel div.portal div.body {~~
	69	+body #mw-panel div.portal div.body {
70	70	background-image:url(images/new-portal-break-ltr.png);
71	71	}
72		~~-body.rtl #panel div.portal div.body {~~
	72	+body.rtl #mw-panel div.portal div.body {
73	73	background-image:url(images/new-portal-break-rtl.png);
74	74	}
75	75	body div.vectorTabs li a, div.vectorTabs li a span{
—	—	@@ -101,7 +101,7 @@
102	102	border: 1px solid #cccccc;
103	103	background-color: #f7f7f7;
104	104	}
105		~~-#panel div.portal h5 {~~
	105	+#mw-panel div.portal h5 {
106	106	font-weight:bold;
107	107	margin-bottom:0;
108	108	padding-bottom:0.05em;
Index: branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-b.css
—	—	@@ -8,7 +8,7 @@
9	9	}
10	10
11	11	/* Framework */
12		~~-#page-base {~~
	12	+#mw-page-base {
13	13	background-color: inherit !important;
14	14	background-image: none !important;
15	15	}
Index: branches/wmf/1.16wmf4/skins/vector/experiments/babaco-colors-c.css
—	—	@@ -1,7 +1,7 @@
2	2	/* Babaco Color Scheme C */
3	3
4	4	/* ridding ourselves of the gradient */
5		~~-#page-base {~~
	5	+#mw-page-base {
6	6	background-color: inherit !important;
7	7	background-image: none !important;
8	8	}
—	—	@@ -53,7 +53,7 @@
54	54	#toc h2, .toc h2 {
55	55	font-weight:normal;
56	56	}
57		~~-body #panel div.portal div.body {~~
	57	+body #mw-panel div.portal div.body {
58	58	background-image:url(images/new-portal-break-ltr.png);
59	59	}
60	60
—	—	@@ -77,7 +77,7 @@
78	78	border: 1px solid #cccccc;
79	79	background-color: #f7f7f7;
80	80	}
81		~~-#panel div.portal h5 {~~
	81	+#mw-panel div.portal h5 {
82	82	font-weight:bold;
83	83	margin-bottom:0;
84	84	padding-bottom:0.05em;
Index: branches/wmf/1.16wmf4/skins/vector/main-ltr.css
—	—	@@ -37,14 +37,14 @@
38	38	background-color: white;
39	39	}
40	40	/* Head */
41		~~-#page-base {~~
	41	+#mw-page-base {
42	42	height: 5em;
43	43	background-color: white;
44	44	background-image: url(images/page-fade.png?1);
45	45	background-position: bottom left;
46	46	background-repeat: repeat-x;
47	47	}
48		~~-#head-base {~~
	48	+#mw-head-base {
49	49	margin-top: -5em;
50	50	margin-left: 10em;
51	51	height: 5em;
—	—	@@ -52,13 +52,13 @@
53	53	background-position: bottom left;
54	54	background-repeat: repeat-x;
55	55	}
56		~~-#head {~~
	56	+div#mw-head {
57	57	position: absolute;
58	58	top: 0;
59	59	right: 0;
60	60	width: 100%;
61	61	}
62		~~-#head h5 {~~
	62	+div#mw-head h5 {
63	63	margin: 0;
64	64	padding: 0;
65	65	}
—	—	@@ -110,6 +110,7 @@
111	111	/* @noflip */
112	112	div.vectorTabs {
113	113	float: left;
	114	+ height: 2.5em;
114	115	}
115	116	div.vectorTabs {
116	117	background-image: url(images/tab-break.png?1);
—	—	@@ -213,20 +214,20 @@
214	215	}
215	216	/* OVERRIDDEN BY COMPLIANT BROWSERS */
216	217	/* @noflip */
217		~~- #head div.vectorMenu h5 {~~
	218	+ div#mw-head div.vectorMenu h5 {
218	219	float: left;
219	220	background-image: url(images/tab-break.png?1);
220	221	background-repeat: no-repeat;
221	222	}
222	223	/* IGNORED BY IE6 */
223		~~- #head div.vectorMenu > h5 {~~
	224	+ div#mw-head div.vectorMenu > h5 {
224	225	background-image: none;
225	226	}
226		~~- #head div.vectorMenu h5 {~~
	227	+ div#mw-head div.vectorMenu h5 {
227	228	background-position: bottom left;
228	229	margin-left: -1px;
229	230	}
230		~~- #head div.vectorMenu h4 {~~
	231	+ div#mw-head div.vectorMenu h4 {
231	232	display: inline-block;
232	233	float: left;
233	234	font-size: 0.8em;
—	—	@@ -395,17 +396,17 @@
396	397	background-color: silver;
397	398	}
398	399	/* Panel */
399		~~-#panel {~~
	400	+div#mw-panel {
400	401	position: absolute;
401	402	top: 160px;
402	403	padding-top: 1em;
403	404	width: 10em;
404	405	left: 0;
405	406	}
406		~~- #panel div.portal {~~
	407	+ div#mw-panel div.portal {
407	408	padding-bottom: 1.5em;
408	409	}
409		~~- #panel div.portal h5 {~~
	410	+ div#mw-panel div.portal h5 {
410	411	font-weight: normal;
411	412	color: #444444;
412	413	padding: 0.25em;
—	—	@@ -415,7 +416,7 @@
416	417	border: none;
417	418	font-size: 0.75em;
418	419	}
419		~~- #panel div.portal div.body {~~
	420	+ div#mw-panel div.portal div.body {
420	421	margin: 0;
421	422	padding-top: 0.5em;
422	423	margin-left: 1.25em;
—	—	@@ -423,14 +424,14 @@
424	425	background-repeat: no-repeat;
425	426	background-position: top left;
426	427	}
427		~~- #panel div.portal div.body ul {~~
	428	+ div#mw-panel div.portal div.body ul {
428	429	list-style: none;
429	430	list-style-image: none;
430	431	list-style-type: none;
431	432	padding: 0;
432	433	margin: 0;
433	434	}
434		~~- #panel div.portal div.body ul li {~~
	435	+ div#mw-panel div.portal div.body ul li {
435	436	line-height: 1.125em;
436	437	padding: 0;
437	438	padding-bottom: 0.5em;
—	—	@@ -438,10 +439,10 @@
439	440	overflow: hidden;
440	441	font-size: 0.75em;
441	442	}
442		~~- #panel div.portal div.body ul li a {~~
	443	+ div#mw-panel div.portal div.body ul li a {
443	444	color: #0645ad;
444	445	}
445		~~- #panel div.portal div.body ul li a:visited {~~
	446	+ div#mw-panel div.portal div.body ul li a:visited {
446	447	color: #0b0080;
447	448	}
448	449	/* Footer */
Index: branches/wmf/1.16wmf4/skins/vector/main-rtl.css
—	—	@@ -37,14 +37,14 @@
38	38	background-color: white;
39	39	}
40	40	/* Head */
41		~~-#page-base {~~
	41	+#mw-page-base {
42	42	height: 5em;
43	43	background-color: white;
44	44	background-image: url(images/page-fade.png?1);
45	45	background-position: bottom right;
46	46	background-repeat: repeat-x;
47	47	}
48		~~-#head-base {~~
	48	+#mw-head-base {
49	49	margin-top: -5em;
50	50	margin-right: 10em;
51	51	height: 5em;
—	—	@@ -52,13 +52,13 @@
53	53	background-position: bottom right;
54	54	background-repeat: repeat-x;
55	55	}
56		~~-#head {~~
	56	+div#mw-head {
57	57	position: absolute;
58	58	top: 0;
59	59	left: 0;
60	60	width: 100%;
61	61	}
62		~~-#head h5 {~~
	62	+div#mw-head h5 {
63	63	margin: 0;
64	64	padding: 0;
65	65	}
—	—	@@ -110,6 +110,7 @@
111	111	/* @noflip */
112	112	div.vectorTabs {
113	113	float: left;
	114	+ height: 2.5em;
114	115	}
115	116	div.vectorTabs {
116	117	background-image: url(images/tab-break.png?1);
—	—	@@ -213,20 +214,20 @@
214	215	}
215	216	/* OVERRIDDEN BY COMPLIANT BROWSERS */
216	217	/* @noflip */
217		~~- #head div.vectorMenu h5 {~~
	218	+ div#mw-head div.vectorMenu h5 {
218	219	float: left;
219	220	background-image: url(images/tab-break.png?1);
220	221	background-repeat: no-repeat;
221	222	}
222	223	/* IGNORED BY IE6 */
223		~~- #head div.vectorMenu > h5 {~~
	224	+ div#mw-head div.vectorMenu > h5 {
224	225	background-image: none;
225	226	}
226		~~- #head div.vectorMenu h5 {~~
	227	+ div#mw-head div.vectorMenu h5 {
227	228	background-position: bottom right;
228	229	margin-right: -1px;
229	230	}
230		~~- #head div.vectorMenu h4 {~~
	231	+ div#mw-head div.vectorMenu h4 {
231	232	display: inline-block;
232	233	float: right;
233	234	font-size: 0.8em;
—	—	@@ -395,17 +396,17 @@
396	397	background-color: silver;
397	398	}
398	399	/* Panel */
399		~~-#panel {~~
	400	+div#mw-panel {
400	401	position: absolute;
401	402	top: 160px;
402	403	padding-top: 1em;
403	404	width: 10em;
404	405	right: 0;
405	406	}
406		~~- #panel div.portal {~~
	407	+ div#mw-panel div.portal {
407	408	padding-bottom: 1.5em;
408	409	}
409		~~- #panel div.portal h5 {~~
	410	+ div#mw-panel div.portal h5 {
410	411	font-weight: normal;
411	412	color: #444444;
412	413	padding: 0.25em;
—	—	@@ -415,7 +416,7 @@
416	417	border: none;
417	418	font-size: 0.75em;
418	419	}
419		~~- #panel div.portal div.body {~~
	420	+ div#mw-panel div.portal div.body {
420	421	margin: 0;
421	422	padding-top: 0.5em;
422	423	margin-right: 1.25em;
—	—	@@ -423,14 +424,14 @@
424	425	background-repeat: no-repeat;
425	426	background-position: top right;
426	427	}
427		~~- #panel div.portal div.body ul {~~
	428	+ div#mw-panel div.portal div.body ul {
428	429	list-style: none;
429	430	list-style-image: none;
430	431	list-style-type: none;
431	432	padding: 0;
432	433	margin: 0;
433	434	}
434		~~- #panel div.portal div.body ul li {~~
	435	+ div#mw-panel div.portal div.body ul li {
435	436	line-height: 1.125em;
436	437	padding: 0;
437	438	padding-bottom: 0.5em;
—	—	@@ -438,10 +439,10 @@
439	440	overflow: hidden;
440	441	font-size: 0.75em;
441	442	}
442		~~- #panel div.portal div.body ul li a {~~
	443	+ div#mw-panel div.portal div.body ul li a {
443	444	color: #0645ad;
444	445	}
445		~~- #panel div.portal div.body ul li a:visited {~~
	446	+ div#mw-panel div.portal div.body ul li a:visited {
446	447	color: #0b0080;
447	448	}
448	449	/* Footer */
Property changes on: branches/wmf/1.16wmf4/skins/vector
___________________________________________________________________
Name: svn:mergeinfo
449	450	- /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65383,65387,65391,65555,65590-65591,65965,66151,66158,66614
450	451	+ /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65383,65387,65391,65555,65590-65591,65965,66151,66158,66614,67537,67544,67576,67631,67640,67703
Property changes on: branches/wmf/1.16wmf4/skins
___________________________________________________________________
Name: svn:mergeinfo
451	452	- /branches/wmf-deployment/skins:60970
/trunk/phase3/skins:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590
452	453	+ /branches/wmf-deployment/skins:60970
/trunk/phase3/skins:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,67537,67544,67576,67631,67640,67703

Follow-up revisions

Revision	Commit summary	Author	Date
r68006	1.16wmf4: Fix r67753: incomplete merge of r67703	catrope	17:49, 14 June 2010

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r67537	(bug 23800) Add missing space between "Jump to:" and "navigation, search" in ...	catrope	14:20, 7 June 2010
r67544	(bug 23570) Fix an instance of a javascript: link in core	catrope	16:19, 7 June 2010
r67576	Fixed CSS bug for Netfront (PS3). Ryan Kaldari Rules! (this was his find).	tparscal	00:29, 8 June 2010
r67631	Escape for html $wgLocalStylePath....	platonides	16:12, 8 June 2010
r67640	follow-up to r67631: add semicolon back	ashley	16:55, 8 June 2010
r67703	Prefix Vector specific ids (head-base\|page-base\|head\|panel) with mw- per bug ......	platonides	11:28, 9 June 2010

Comments

#Comment by TheDJ (talk | contribs) 13:18, 11 June 2010

This skipped the wikibits.js change, and now accesskey tooltips are not properly updated on browsers.

#Comment by Catrope (talk | contribs) 17:50, 14 June 2010

Fixed in r68006.

Status & tagging log

19:30, 21 November 2010 Reedy (talk | contribs) changed the status of r67753 [removed: new added: deferred]
17:50, 14 June 2010 Catrope (talk | contribs) changed the status of r67753 [removed: fixme added: new]
10:56, 12 June 2010 TheDJ (talk | contribs) changed the status of r67753 [removed: new added: fixme]