r67703 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r67702‎ \| r67703 \| r67704 >
Date:	11:28, 9 June 2010
Author:	platonides
Status:	ok
Tags:
Comment:	Prefix Vector specific ids (head-base\|page-base\|head\|panel) with mw- per bug 23597. It may be a good idea to rename further the confusing head (eg. to mw-skin-head). Lots of mentions of headers, <head>, document.getElementsByTagName('head')... but no real usage of that.
Modified paths:	/trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js (modified) (history) /trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js (modified) (history) /trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js (modified) (history) /trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css (modified) (history) /trunk/phase3/includes/DefaultSettings.php (modified) (history) /trunk/phase3/skins/Vector.php (modified) (history) /trunk/phase3/skins/common/wikibits.js (modified) (history) /trunk/phase3/skins/vector/experiments/babaco-colors-a.css (modified) (history) /trunk/phase3/skins/vector/experiments/babaco-colors-b.css (modified) (history) /trunk/phase3/skins/vector/experiments/babaco-colors-c.css (modified) (history) /trunk/phase3/skins/vector/experiments/new-tabs.css (modified) (history) /trunk/phase3/skins/vector/main-ltr.css (modified) (history) /trunk/phase3/skins/vector/main-rtl.css (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/common/wikibits.js
—	—	@@ -247,7 +247,7 @@
248	248	// optimization technique.
249	249	var linkContainers = [
250	250	'column-one', // Monobook and Modern
251		~~- 'head', 'panel', 'p-logo' // Vector~~
	251	+ 'mw-head', 'mw-panel', 'p-logo' // Vector
252	252	];
253	253	for ( var i in linkContainers ) {
254	254	var linkContainer = document.getElementById( linkContainers[i] );
Index: trunk/phase3/skins/Vector.php
—	—	@@ -470,8 +470,8 @@
471	471	// Output HTML Page
472	472	$this->html( 'headelement' );
473	473	?>
474		~~- <div id="page-base" class="noprint"></div>~~
475		~~- <div id="head-base" class="noprint"></div>~~
	474	+ <div id="mw-page-base" class="noprint"></div>
	475	+ <div id="mw-head-base" class="noprint"></div>
476	476	<!-- content -->
477	477	<div id="content"<?php $this->html('specialpageattributes') ?>>
478	478	<a id="top"></a>
—	—	@@ -529,7 +529,7 @@
530	530	</div>
531	531	<!-- /content -->
532	532	<!-- header -->
533		~~- <div id="head" class="noprint">~~
	533	+ <div id="mw-head" class="noprint">
534	534	<?php $this->renderNavigation( 'PERSONAL' ); ?>
535	535	<div id="left-navigation">
536	536	<?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
—	—	@@ -540,7 +540,7 @@
541	541	</div>
542	542	<!-- /header -->
543	543	<!-- panel -->
544		~~- <div id="panel" class="noprint">~~
	544	+ <div id="mw-panel" class="noprint">
545	545	<!-- logo -->
546	546	<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>
547	547	<!-- /logo -->
Index: trunk/phase3/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: trunk/phase3/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: trunk/phase3/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: trunk/phase3/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: trunk/phase3/skins/vector/main-ltr.css
—	—	@@ -38,14 +38,14 @@
39	39	color: black;
40	40	}
41	41	/* Head */
42		~~-#page-base {~~
	42	+#mw-page-base {
43	43	height: 5em;
44	44	background-color: white;
45	45	background-image: url(images/page-fade.png?1);
46	46	background-position: bottom left;
47	47	background-repeat: repeat-x;
48	48	}
49		~~-#head-base {~~
	49	+#mw-head-base {
50	50	margin-top: -5em;
51	51	margin-left: 10em;
52	52	height: 5em;
—	—	@@ -53,13 +53,13 @@
54	54	background-position: bottom left;
55	55	background-repeat: repeat-x;
56	56	}
57		~~-div#head {~~
	57	+div#mw-head {
58	58	position: absolute;
59	59	top: 0;
60	60	right: 0;
61	61	width: 100%;
62	62	}
63		~~-div#head h5 {~~
	63	+div#mw-head h5 {
64	64	margin: 0;
65	65	padding: 0;
66	66	}
—	—	@@ -215,20 +215,20 @@
216	216	}
217	217	/* OVERRIDDEN BY COMPLIANT BROWSERS */
218	218	/* @noflip */
219		~~- div#head div.vectorMenu h5 {~~
	219	+ div#mw-head div.vectorMenu h5 {
220	220	float: left;
221	221	background-image: url(images/tab-break.png?1);
222	222	background-repeat: no-repeat;
223	223	}
224	224	/* IGNORED BY IE6 */
225		~~- div#head div.vectorMenu > h5 {~~
	225	+ div#mw-head div.vectorMenu > h5 {
226	226	background-image: none;
227	227	}
228		~~- div#head div.vectorMenu h5 {~~
	228	+ div#mw-head div.vectorMenu h5 {
229	229	background-position: bottom left;
230	230	margin-left: -1px;
231	231	}
232		~~- div#head div.vectorMenu h4 {~~
	232	+ div#mw-head div.vectorMenu h4 {
233	233	display: inline-block;
234	234	float: left;
235	235	font-size: 0.8em;
—	—	@@ -386,17 +386,17 @@
387	387	height: 100%;
388	388	}
389	389	/* Panel */
390		~~-div#panel {~~
	390	+div#mw-panel {
391	391	position: absolute;
392	392	top: 160px;
393	393	padding-top: 1em;
394	394	width: 10em;
395	395	left: 0;
396	396	}
397		~~- div#panel div.portal {~~
	397	+ div#mw-panel div.portal {
398	398	padding-bottom: 1.5em;
399	399	}
400		~~- div#panel div.portal h5 {~~
	400	+ div#mw-panel div.portal h5 {
401	401	font-weight: normal;
402	402	color: #444444;
403	403	padding: 0.25em;
—	—	@@ -406,7 +406,7 @@
407	407	border: none;
408	408	font-size: 0.75em;
409	409	}
410		~~- div#panel div.portal div.body {~~
	410	+ div#mw-panel div.portal div.body {
411	411	margin: 0;
412	412	padding-top: 0.5em;
413	413	margin-left: 1.25em;
—	—	@@ -414,14 +414,14 @@
415	415	background-repeat: no-repeat;
416	416	background-position: top left;
417	417	}
418		~~- div#panel div.portal div.body ul {~~
	418	+ div#mw-panel div.portal div.body ul {
419	419	list-style: none;
420	420	list-style-image: none;
421	421	list-style-type: none;
422	422	padding: 0;
423	423	margin: 0;
424	424	}
425		~~- div#panel div.portal div.body ul li {~~
	425	+ div#mw-panel div.portal div.body ul li {
426	426	line-height: 1.125em;
427	427	padding: 0;
428	428	padding-bottom: 0.5em;
—	—	@@ -429,10 +429,10 @@
430	430	overflow: hidden;
431	431	font-size: 0.75em;
432	432	}
433		~~- div#panel div.portal div.body ul li a {~~
	433	+ div#mw-panel div.portal div.body ul li a {
434	434	color: #0645ad;
435	435	}
436		~~- div#panel div.portal div.body ul li a:visited {~~
	436	+ div#mw-panel div.portal div.body ul li a:visited {
437	437	color: #0b0080;
438	438	}
439	439	/* Footer */
Index: trunk/phase3/skins/vector/main-rtl.css
—	—	@@ -38,14 +38,14 @@
39	39	color: black;
40	40	}
41	41	/* Head */
42		~~-#page-base {~~
	42	+#mw-page-base {
43	43	height: 5em;
44	44	background-color: white;
45	45	background-image: url(images/page-fade.png?1);
46	46	background-position: bottom right;
47	47	background-repeat: repeat-x;
48	48	}
49		~~-#head-base {~~
	49	+#mw-head-base {
50	50	margin-top: -5em;
51	51	margin-right: 10em;
52	52	height: 5em;
—	—	@@ -53,13 +53,13 @@
54	54	background-position: bottom right;
55	55	background-repeat: repeat-x;
56	56	}
57		~~-div#head {~~
	57	+div#mw-head {
58	58	position: absolute;
59	59	top: 0;
60	60	left: 0;
61	61	width: 100%;
62	62	}
63		~~-div#head h5 {~~
	63	+div#mw-head h5 {
64	64	margin: 0;
65	65	padding: 0;
66	66	}
—	—	@@ -215,20 +215,20 @@
216	216	}
217	217	/* OVERRIDDEN BY COMPLIANT BROWSERS */
218	218	/* @noflip */
219		~~- div#head div.vectorMenu h5 {~~
	219	+ div#mw-head div.vectorMenu h5 {
220	220	float: left;
221	221	background-image: url(images/tab-break.png?1);
222	222	background-repeat: no-repeat;
223	223	}
224	224	/* IGNORED BY IE6 */
225		~~- div#head div.vectorMenu > h5 {~~
	225	+ div#mw-head div.vectorMenu > h5 {
226	226	background-image: none;
227	227	}
228		~~- div#head div.vectorMenu h5 {~~
	228	+ div#mw-head div.vectorMenu h5 {
229	229	background-position: bottom right;
230	230	margin-right: -1px;
231	231	}
232		~~- div#head div.vectorMenu h4 {~~
	232	+ div#mw-head div.vectorMenu h4 {
233	233	display: inline-block;
234	234	float: right;
235	235	font-size: 0.8em;
—	—	@@ -386,17 +386,17 @@
387	387	height: 100%;
388	388	}
389	389	/* Panel */
390		~~-div#panel {~~
	390	+div#mw-panel {
391	391	position: absolute;
392	392	top: 160px;
393	393	padding-top: 1em;
394	394	width: 10em;
395	395	right: 0;
396	396	}
397		~~- div#panel div.portal {~~
	397	+ div#mw-panel div.portal {
398	398	padding-bottom: 1.5em;
399	399	}
400		~~- div#panel div.portal h5 {~~
	400	+ div#mw-panel div.portal h5 {
401	401	font-weight: normal;
402	402	color: #444444;
403	403	padding: 0.25em;
—	—	@@ -406,7 +406,7 @@
407	407	border: none;
408	408	font-size: 0.75em;
409	409	}
410		~~- div#panel div.portal div.body {~~
	410	+ div#mw-panel div.portal div.body {
411	411	margin: 0;
412	412	padding-top: 0.5em;
413	413	margin-right: 1.25em;
—	—	@@ -414,14 +414,14 @@
415	415	background-repeat: no-repeat;
416	416	background-position: top right;
417	417	}
418		~~- div#panel div.portal div.body ul {~~
	418	+ div#mw-panel div.portal div.body ul {
419	419	list-style: none;
420	420	list-style-image: none;
421	421	list-style-type: none;
422	422	padding: 0;
423	423	margin: 0;
424	424	}
425		~~- div#panel div.portal div.body ul li {~~
	425	+ div#mw-panel div.portal div.body ul li {
426	426	line-height: 1.125em;
427	427	padding: 0;
428	428	padding-bottom: 0.5em;
—	—	@@ -429,10 +429,10 @@
430	430	overflow: hidden;
431	431	font-size: 0.75em;
432	432	}
433		~~- div#panel div.portal div.body ul li a {~~
	433	+ div#mw-panel div.portal div.body ul li a {
434	434	color: #0645ad;
435	435	}
436		~~- div#panel div.portal div.body ul li a:visited {~~
	436	+ div#mw-panel div.portal div.body ul li a:visited {
437	437	color: #0b0080;
438	438	}
439	439	/* Footer */
Index: trunk/phase3/includes/DefaultSettings.php
—	—	@@ -1676,7 +1676,7 @@
1677	1677	* to ensure that client-side caches do not keep obsolete copies of global
1678	1678	* styles.
1679	1679	*/
1680		~~-$wgStyleVersion = '286';~~
	1680	+$wgStyleVersion = '287';
1681	1681
1682	1682
1683	1683	# Server-side caching:
Index: trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
—	—	@@ -1,68 +1,68 @@
2	2	/* Prototype code to show collapsing left nav options */
3		~~-#panel.collapsible-nav div.portal {~~
	3	+#mw-panel.collapsible-nav div.portal {
4	4	background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
5	5	background-position:left top;
6	6	background-repeat:no-repeat;
7	7	padding: 0.25em 0 !important;
8	8	margin: -11px 9px 10px 11px;
9	9	}
10		~~-body.rtl #panel.collapsible-nav div.portal {~~
	10	+body.rtl #mw-panel.collapsible-nav div.portal {
11	11	background-position: right top;
12	12	margin: -11px 11px 10px 9px;
13	13	}
14		~~-#panel.collapsible-nav div.portal h5 {~~
	14	+#mw-panel.collapsible-nav div.portal h5 {
15	15	color: #4D4D4D;
16	16	font-weight: normal;
17	17	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
18	18	padding: 4px 0 3px 1.5em;
19	19	margin-bottom: 0px;
20	20	}
21		~~-body.rtl #panel.collapsible-nav div.portal h5 {~~
	21	+body.rtl #mw-panel.collapsible-nav div.portal h5 {
22	22	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
23	23	padding: 4px 1.5em 3px 0;
24	24	}
25		~~-#panel.collapsible-nav div.collapsed h5 {~~
	25	+#mw-panel.collapsible-nav div.collapsed h5 {
26	26	color: #0645AD;
27	27	background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
28	28	margin-bottom: 0px;
29	29	}
30		~~-body.rtl #panel.collapsible-nav div.collapsed h5 {~~
	30	+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
31	31	background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
32	32	}
33		~~-#panel.collapsible-nav div h5:hover {~~
	33	+#mw-panel.collapsible-nav div h5:hover {
34	34	cursor: pointer;
35	35	text-decoration: none;
36	36	}
37		~~-#panel.collapsible-nav div.collapsed h5:hover {~~
	37	+#mw-panel.collapsible-nav div.collapsed h5:hover {
38	38	text-decoration: underline;
39	39	}
40		~~-#panel.collapsible-nav div.portal div.body {~~
	40	+#mw-panel.collapsible-nav div.portal div.body {
41	41	background: none !important;
42	42	padding-top: 0px;
43	43	display: none;
44	44	}
45		~~-#panel.collapsible-nav div.persistent div.body {~~
	45	+#mw-panel.collapsible-nav div.persistent div.body {
46	46	display: block;
47	47	}
48		~~-#panel.collapsible-nav div.first h5 {~~
	48	+#mw-panel.collapsible-nav div.first h5 {
49	49	display: none;
50	50	}
51		~~-#panel.collapsible-nav div.persistent h5 {~~
	51	+#mw-panel.collapsible-nav div.persistent h5 {
52	52	background: none !important;
53	53	padding-left: 0.7em;
54	54	cursor: default;
55	55	}
56		~~-#panel.collapsible-nav div.portal div.body ul li {~~
	56	+#mw-panel.collapsible-nav div.portal div.body ul li {
57	57	padding: 0.25em 0;
58	58	}
59		~~-#panel.collapsible-nav div.first {~~
	59	+#mw-panel.collapsible-nav div.first {
60	60	background-image: none;
61	61	margin-top: 0px;
62	62	}
63		~~-#panel.collapsible-nav div.persistent div.body {~~
	63	+#mw-panel.collapsible-nav div.persistent div.body {
64	64	margin-left: 0.5em;
65	65	}
66		~~-body.rtl #panel.collapsible-nav div.persistent div.body {~~
	66	+body.rtl #mw-panel.collapsible-nav div.persistent div.body {
67	67	margin-left: 0;
68	68	margin-right: 0.5em;
69		-}
\ No newline at end of file
	69	+}
Index: trunk/extensions/UsabilityInitiative/css/combined.css
—	—	@@ -66,73 +66,74 @@
67	67	color: white;
68	68	color: HighlightText;
69	69	}/* Prototype code to show collapsing left nav options */
70		~~-#panel.collapsible-nav div.portal {~~
	70	+#mw-panel.collapsible-nav div.portal {
71	71	background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
72	72	background-position:left top;
73	73	background-repeat:no-repeat;
74	74	padding: 0.25em 0 !important;
75	75	margin: -11px 9px 10px 11px;
76	76	}
77		~~-body.rtl #panel.collapsible-nav div.portal {~~
	77	+body.rtl #mw-panel.collapsible-nav div.portal {
78	78	background-position: right top;
79	79	margin: -11px 11px 10px 9px;
80	80	}
81		~~-#panel.collapsible-nav div.portal h5 {~~
	81	+#mw-panel.collapsible-nav div.portal h5 {
82	82	color: #4D4D4D;
83	83	font-weight: normal;
84	84	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
85	85	padding: 4px 0 3px 1.5em;
86	86	margin-bottom: 0px;
87	87	}
88		~~-body.rtl #panel.collapsible-nav div.portal h5 {~~
	88	+body.rtl #mw-panel.collapsible-nav div.portal h5 {
89	89	background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
90	90	padding: 4px 1.5em 3px 0;
91	91	}
92		~~-#panel.collapsible-nav div.collapsed h5 {~~
	92	+#mw-panel.collapsible-nav div.collapsed h5 {
93	93	color: #0645AD;
94	94	background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
95	95	margin-bottom: 0px;
96	96	}
97		~~-body.rtl #panel.collapsible-nav div.collapsed h5 {~~
	97	+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
98	98	background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
99	99	}
100		~~-#panel.collapsible-nav div h5:hover {~~
	100	+#mw-panel.collapsible-nav div h5:hover {
101	101	cursor: pointer;
102	102	text-decoration: none;
103	103	}
104		~~-#panel.collapsible-nav div.collapsed h5:hover {~~
	104	+#mw-panel.collapsible-nav div.collapsed h5:hover {
105	105	text-decoration: underline;
106	106	}
107		~~-#panel.collapsible-nav div.portal div.body {~~
	107	+#mw-panel.collapsible-nav div.portal div.body {
108	108	background: none !important;
109	109	padding-top: 0px;
110	110	display: none;
111	111	}
112		~~-#panel.collapsible-nav div.persistent div.body {~~
	112	+#mw-panel.collapsible-nav div.persistent div.body {
113	113	display: block;
114	114	}
115		~~-#panel.collapsible-nav div.first h5 {~~
	115	+#mw-panel.collapsible-nav div.first h5 {
116	116	display: none;
117	117	}
118		~~-#panel.collapsible-nav div.persistent h5 {~~
	118	+#mw-panel.collapsible-nav div.persistent h5 {
119	119	background: none !important;
120	120	padding-left: 0.7em;
121	121	cursor: default;
122	122	}
123		~~-#panel.collapsible-nav div.portal div.body ul li {~~
	123	+#mw-panel.collapsible-nav div.portal div.body ul li {
124	124	padding: 0.25em 0;
125	125	}
126		~~-#panel.collapsible-nav div.first {~~
	126	+#mw-panel.collapsible-nav div.first {
127	127	background-image: none;
128	128	margin-top: 0px;
129	129	}
130		~~-#panel.collapsible-nav div.persistent div.body {~~
	130	+#mw-panel.collapsible-nav div.persistent div.body {
131	131	margin-left: 0.5em;
132	132	}
133		~~-body.rtl #panel.collapsible-nav div.persistent div.body {~~
	133	+body.rtl #mw-panel.collapsible-nav div.persistent div.body {
134	134	margin-left: 0;
135	135	margin-right: 0.5em;
136		~~-}.expandableField {~~
	136	+}
	137	+.expandableField {
137	138	display: block;
138	139	float: left;
139	140	}
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
—	—	@@ -64,73 +64,74 @@
65	65	color:white;
66	66	color:HighlightText;
67	67	}
68		~~-#panel.collapsible-nav div.portal{~~
	68	+#mw-panel.collapsible-nav div.portal{
69	69	background-image:url(../images/vector/collapsibleNav/portal-break.png?1);
70	70	background-position:left top;
71	71	background-repeat:no-repeat;
72	72	padding:0.25em 0 !important;
73	73	margin:-11px 9px 10px 11px;
74	74	}
75		~~-body.rtl #panel.collapsible-nav div.portal{~~
	75	+body.rtl #mw-panel.collapsible-nav div.portal{
76	76	background-position:right top;
77	77	margin:-11px 11px 10px 9px;
78	78	}
79		~~-#panel.collapsible-nav div.portal h5{~~
	79	+#mw-panel.collapsible-nav div.portal h5{
80	80	color:#4D4D4D;
81	81	font-weight:normal;
82	82	background:url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat;
83	83	padding:4px 0 3px 1.5em;
84	84	margin-bottom:0px;
85	85	}
86		~~-body.rtl #panel.collapsible-nav div.portal h5{~~
	86	+body.rtl #mw-panel.collapsible-nav div.portal h5{
87	87	background:url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat;
88	88	padding:4px 1.5em 3px 0;
89	89	}
90		~~-#panel.collapsible-nav div.collapsed h5{~~
	90	+#mw-panel.collapsible-nav div.collapsed h5{
91	91	color:#0645AD;
92	92	background:url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat;
93	93	margin-bottom:0px;
94	94	}
95		~~-body.rtl #panel.collapsible-nav div.collapsed h5{~~
	95	+body.rtl #mw-panel.collapsible-nav div.collapsed h5{
96	96	background:url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat;
97	97	}
98		~~-#panel.collapsible-nav div h5:hover{~~
	98	+#mw-panel.collapsible-nav div h5:hover{
99	99	cursor:pointer;
100	100	text-decoration:none;
101	101	}
102		~~-#panel.collapsible-nav div.collapsed h5:hover{~~
	102	+#mw-panel.collapsible-nav div.collapsed h5:hover{
103	103	text-decoration:underline;
104	104	}
105		~~-#panel.collapsible-nav div.portal div.body{~~
	105	+#mw-panel.collapsible-nav div.portal div.body{
106	106	background:none !important;
107	107	padding-top:0px;
108	108	display:none;
109	109	}
110		~~-#panel.collapsible-nav div.persistent div.body{~~
	110	+#mw-panel.collapsible-nav div.persistent div.body{
111	111	display:block;
112	112	}
113		~~-#panel.collapsible-nav div.first h5{~~
	113	+#mw-panel.collapsible-nav div.first h5{
114	114	display:none;
115	115	}
116		~~-#panel.collapsible-nav div.persistent h5{~~
	116	+#mw-panel.collapsible-nav div.persistent h5{
117	117	background:none !important;
118	118	padding-left:0.7em;
119	119	cursor:default;
120	120	}
121		~~-#panel.collapsible-nav div.portal div.body ul li{~~
	121	+#mw-panel.collapsible-nav div.portal div.body ul li{
122	122	padding:0.25em 0;
123	123	}
124		~~-#panel.collapsible-nav div.first{~~
	124	+#mw-panel.collapsible-nav div.first{
125	125	background-image:none;
126	126	margin-top:0px;
127	127	}
128		~~-#panel.collapsible-nav div.persistent div.body{~~
	128	+#mw-panel.collapsible-nav div.persistent div.body{
129	129	margin-left:0.5em;
130	130	}
131		~~-body.rtl #panel.collapsible-nav div.persistent div.body{~~
	131	+body.rtl #mw-panel.collapsible-nav div.persistent div.body{
132	132	margin-left:0;
133	133	margin-right:0.5em;
134		~~-}.expandableField{~~
	134	+}
	135	+.expandableField{
135	136	display:block;
136	137	float:left;
137	138	}
Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
—	—	@@ -144,11 +144,11 @@
145	145	$j( '#p-lang' ).addClass( 'persistent' );
146	146	}
147	147	// Always show the first portal
148		~~- $j( '#panel > div.portal:first' ).addClass( 'first persistent' );~~
	148	+ $j( '#mw-panel > div.portal:first' ).addClass( 'first persistent' );
149	149	// Apply a class to the entire panel to activate styles
150		~~- $j( '#panel' ).addClass( 'collapsible-nav' );~~
	150	+ $j( '#mw-panel' ).addClass( 'collapsible-nav' );
151	151	// Use cookie data to restore preferences of what to show and hide
152		~~- $j( '#panel > div.portal:not(.persistent)' )~~
	152	+ $j( '#mw-panel > div.portal:not(.persistent)' )
153	153	.each( function( i ) {
154	154	var id = $j(this).attr( 'id' );
155	155	var state = $j.cookie( 'vector-nav-' + id );
—	—	@@ -180,7 +180,7 @@
181	181	.find( 'div.body' )
182	182	.slideToggle( 'fast' );
183	183	}
184		~~- var $headings = $j( '#panel > div.portal:not(.persistent) > h5' );~~
	184	+ var $headings = $j( '#mw-panel > div.portal:not(.persistent) > h5' );
185	185	/** Copy-pasted from jquery.wikiEditor.dialogs - :( */
186	186	// Find the highest tabindex in use
187	187	var maxTI = 0;
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
—	—	@@ -12,7 +12,7 @@
13	13
14	14	static $scripts = array(
15	15	'raw' => array(
16		~~- array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 20 ),~~
	16	+ array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 21 ),
17	17	array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ),
18	18	array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 3 ),
19	19	array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ),
—	—	@@ -20,10 +20,10 @@
21	21	array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 15 ),
22	22	),
23	23	'combined' => array(
24		~~- array( 'src' => 'Vector.combined.js', 'version' => 43 ),~~
	24	+ array( 'src' => 'Vector.combined.js', 'version' => 44 ),
25	25	),
26	26	'minified' => array(
27		~~- array( 'src' => 'Vector.combined.min.js', 'version' => 43 ),~~
	27	+ array( 'src' => 'Vector.combined.min.js', 'version' => 44 ),
28	28	),
29	29	);
30	30	static $modules = array(
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
—	—	@@ -144,11 +144,11 @@
145	145	$j( '#p-lang' ).addClass( 'persistent' );
146	146	}
147	147	// Always show the first portal
148		~~- $j( '#panel > div.portal:first' ).addClass( 'first persistent' );~~
	148	+ $j( '#mw-panel > div.portal:first' ).addClass( 'first persistent' );
149	149	// Apply a class to the entire panel to activate styles
150		~~- $j( '#panel' ).addClass( 'collapsible-nav' );~~
	150	+ $j( '#mw-panel' ).addClass( 'collapsible-nav' );
151	151	// Use cookie data to restore preferences of what to show and hide
152		~~- $j( '#panel > div.portal:not(.persistent)' )~~
	152	+ $j( '#mw-panel > div.portal:not(.persistent)' )
153	153	.each( function( i ) {
154	154	var id = $j(this).attr( 'id' );
155	155	var state = $j.cookie( 'vector-nav-' + id );
—	—	@@ -180,7 +180,7 @@
181	181	.find( 'div.body' )
182	182	.slideToggle( 'fast' );
183	183	}
184		~~- var $headings = $j( '#panel > div.portal:not(.persistent) > h5' );~~
	184	+ var $headings = $j( '#mw-panel > div.portal:not(.persistent) > h5' );
185	185	/** Copy-pasted from jquery.wikiEditor.dialogs - :( */
186	186	// Find the highest tabindex in use
187	187	var maxTI = 0;
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
—	—	@@ -9,9 +9,9 @@
10	10	if(count<limit){$secondary.children().each(function(){if(count++<limit){$j(this).appendTo($primary);}else{return false;}});}
11	11	if($secondary.children().length==0){$secondary.remove();}else{$j('#p-lang').after('<div id="p-lang-more" class="portal"><h5></h5><div class="body"></div></div>');$j('#p-lang-more h5').text(mw.usability.getMsg('vector-collapsiblenav-more'));$secondary.appendTo($j('#p-lang-more div.body'));}
12	12	$j('#p-lang').addClass('persistent');}
13		-$j('#panel > div.portal:first').addClass('first persistent');$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:not(.persistent)').each(function(i){var id=$j(this).attr('id');var state=$j.cookie('vector-nav-'+id);if(state=='true'\|\|(state==null&&i<1)\|\|version==1&&id=='p-lang'){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}
	13	+$j('#mw-panel > div.portal:first').addClass('first persistent');$j('#mw-panel').addClass('collapsible-nav');$j('#mw-panel > div.portal:not(.persistent)').each(function(i){var id=$j(this).attr('id');var state=$j.cookie('vector-nav-'+id);if(state=='true'\|\|(state==null&&i<1)\|\|version==1&&id=='p-lang'){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}
14	14	if(state!=null){$j.cookie('vector-nav-'+$j(this).attr('id'),state,{'expires':30,'path':'/'});}});function toggle($element){$j.cookie('vector-nav-'+$element.parent().attr('id'),$element.parent().is('.collapsed'),{'expires':30,'path':'/'});$element.parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');}
15		~~-var $headings=$j('#panel > div.portal:not(.persistent) > h5');var maxTI=0;$j('[tabindex]').each(function(){var ti=parseInt($j(this).attr('tabindex'));if(ti>maxTI)~~
	15	+var $headings=$j('#mw-panel > div.portal:not(.persistent) > h5');var maxTI=0;$j('[tabindex]').each(function(){var ti=parseInt($j(this).attr('tabindex'));if(ti>maxTI)
16	16	maxTI=ti;});var tabIndex=maxTI+1;$j('#searchInput').attr('tabindex',tabIndex++);$headings.each(function(){$j(this).attr('tabindex',tabIndex++);});$headings.keydown(function(event){if(event.which==13\|\|event.which==32){toggle($j(this));}}).mousedown(function(){toggle($j(this));$j(this).blur();return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;}
17	17	var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var target=data.collapsedContainer;$moving.css("position","relative").css((rtl?'left':'right'),0).animate({width:'1px'},"normal",function(){$j(this).hide();$j('<span class="placeholder" style="display:none;"></span>').insertAfter(this);$j(this).remove().prependTo(target).data('collapsibleTabsSettings',data);$j(this).attr('style','display:list-item;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($j(ele)).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var $target=$j(data.expandedContainer).find('span.placeholder:first');var expandedWidth=data.expandedWidth;$moving.css("position","relative").css((rtl?'right':'left'),0).css('width','1px');$target.replaceWith($moving.remove().css('width','1px').data('collapsibleTabsSettings',data).animate({width:expandedWidth+"px"},"normal",function(){$j(this).attr('style','display:block;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none')
18	18	$j("#p-cactions").addClass("filledPortlet").removeClass("emptyPortlet").find('h5').css('width','1px').animate({'width':'26px'},390);}).bind("beforeTabExpand",function(){if($j('#p-cactions li').length==1)
Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
—	—	@@ -19,7 +19,7 @@
20	20	'base_sets' => array(
21	21	'raw' => array(
22	22	array( 'src' => 'css/suggestions.css', 'version' => 14 ),
23		~~- array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 11 ),~~
	23	+ array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 12 ),
24	24	array( 'src' => 'css/vector.expandableSearch.css', 'version' => 3 ),
25	25	array( 'src' => 'css/vector.footerCleanup.css', 'version' => 2 ),
26	26	array( 'src' => 'css/wikiEditor.css', 'version' => 14 ),
—	—	@@ -30,11 +30,11 @@
31	31	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
32	32	),
33	33	'combined' => array(
34		~~- array( 'src' => 'css/combined.css', 'version' => 100 ),~~
	34	+ array( 'src' => 'css/combined.css', 'version' => 101 ),
35	35	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
36	36	),
37	37	'minified' => array(
38		~~- array( 'src' => 'css/combined.min.css', 'version' => 100 ),~~
	38	+ array( 'src' => 'css/combined.min.css', 'version' => 101 ),
39	39	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
40	40	),
41	41	)

Follow-up revisions

Revision	Commit summary	Author	Date
r67705	Followup r65412 and r67703 - Rename properly, bring changes forward	reedy	11:32, 9 June 2010
r67753	1.16wmf4: Merge some Vector fixes from trunk: r67537, r67544, r67576, r67631,...	catrope	19:52, 9 June 2010
r67893	Follow up to r67703. Fixes jump-to anchor which still ref'ed to #head instead...	hartman	10:59, 12 June 2010
r68006	1.16wmf4: Fix r67753: incomplete merge of r67703	catrope	17:49, 14 June 2010
r68102	Backport r67703 & r67893...	platonides	19:38, 15 June 2010

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r66646	(bug 23597) Make a number of ID selectors more specific (basically #foo -> di...	catrope	19:01, 19 May 2010

Status & tagging log

16:05, 9 June 2010 Catrope (talk | contribs) changed the status of r67703 [removed: new added: ok]