r68102 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r68101‎ | r68102 | r68103 >
Date:19:38, 15 June 2010
Author:platonides
Status:resolved (Comments)
Tags:
Comment:
Backport r67703 & r67893
id renaming is conflictive enough to release it right.
Modified paths:
  • /branches/REL1_16/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.combined.js (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.combined.min.js (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.hooks.php (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/css/combined.css (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/css/combined.min.css (modified) (history)
  • /branches/REL1_16/extensions/UsabilityInitiative/css/vector.collapsibleNav.css (modified) (history)
  • /branches/REL1_16/phase3/includes/DefaultSettings.php (modified) (history)
  • /branches/REL1_16/phase3/skins/Vector.php (modified) (history)
  • /branches/REL1_16/phase3/skins/common/wikibits.js (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-a.css (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-b.css (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-c.css (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/experiments/new-tabs.css (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/main-ltr.css (modified) (history)
  • /branches/REL1_16/phase3/skins/vector/main-rtl.css (modified) (history)

Diff [purge]

Index: branches/REL1_16/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
——@@ -5,14 +5,14 @@
66 if( !wgVectorEnabledModules.collapsiblenav ) {
77 return true;
88 }
9 - $j( '#panel' ).addClass( 'collapsible-nav' );
 9+ $j( '#mw-panel' ).addClass( 'collapsible-nav' );
1010 // Always show the first portal
11 - $j( '#panel > div.portal:first' )
 11+ $j( '#mw-panel > div.portal:first' )
1212 .addClass( 'expanded' )
1313 .find( 'div.body' )
1414 .show();
1515 // Remember which portals to hide and show
16 - $j( '#panel > div.portal:not(:first)' )
 16+ $j( '#mw-panel > div.portal:not(:first)' )
1717 .each( function() {
1818 if ( $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) ) == 'true' ) {
1919 $j(this)
——@@ -24,7 +24,7 @@
2525 }
2626 } );
2727 // Toggle the selected menu's class and expand or collapse the menu
28 - $j( '#panel > div.portal > h5' ).click( function() {
 28+ $j( '#mw-panel > div.portal > h5' ).click( function() {
2929 $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) );
3030 $j(this)
3131 .parent()
Index: branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.hooks.php
——@@ -12,17 +12,17 @@
1313
1414 static $scripts = array(
1515 'raw' => array(
16 - array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 7 ),
 16+ array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 8 ),
1717 array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 7 ),
1818 array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ),
1919 array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ),
2020 array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 7 ),
2121 ),
2222 'combined' => array(
23 - array( 'src' => 'Vector.combined.js', 'version' => 22 ),
 23+ array( 'src' => 'Vector.combined.js', 'version' => 23 ),
2424 ),
2525 'minified' => array(
26 - array( 'src' => 'Vector.combined.min.js', 'version' => 22 ),
 26+ array( 'src' => 'Vector.combined.min.js', 'version' => 23 ),
2727 ),
2828 );
2929 static $modules = array(
Index: branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.combined.js
——@@ -5,14 +5,14 @@
66 if( !wgVectorEnabledModules.collapsiblenav ) {
77 return true;
88 }
9 - $j( '#panel' ).addClass( 'collapsible-nav' );
 9+ $j( '#mw-panel' ).addClass( 'collapsible-nav' );
1010 // Always show the first portal
11 - $j( '#panel > div.portal:first' )
 11+ $j( '#mw-panel > div.portal:first' )
1212 .addClass( 'expanded' )
1313 .find( 'div.body' )
1414 .show();
1515 // Remember which portals to hide and show
16 - $j( '#panel > div.portal:not(:first)' )
 16+ $j( '#mw-panel > div.portal:not(:first)' )
1717 .each( function() {
1818 if ( $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) ) == 'true' ) {
1919 $j(this)
——@@ -24,7 +24,7 @@
2525 }
2626 } );
2727 // Toggle the selected menu's class and expand or collapse the menu
28 - $j( '#panel > div.portal > h5' ).click( function() {
 28+ $j( '#mw-panel > div.portal > h5' ).click( function() {
2929 $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) );
3030 $j(this)
3131 .parent()
Index: branches/REL1_16/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
——@@ -1,6 +1,6 @@
22
33 $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;}
4 -$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#panel > div.portal:not(:first)').each(function(){if($j.cookie('vector-nav-'+$j(this).attr('id'))=='true'){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}});$j('#panel > div.portal > h5').click(function(){$j.cookie('vector-nav-'+$j(this).parent().attr('id'),$j(this).parent().is('.collapsed'));$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;}
 4+$j('#mw-panel').addClass('collapsible-nav');$j('#mw-panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#mw-panel > div.portal:not(:first)').each(function(){if($j.cookie('vector-nav-'+$j(this).attr('id'))=='true'){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');}});$j('#mw-panel > div.portal > h5').click(function(){$j.cookie('vector-nav-'+$j(this).parent().attr('id'),$j(this).parent().is('.collapsed'));$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;}
55 var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=true;var data=$moving.data('collapsibleTabsSettings');var target=$moving.data('collapsibleTabsSettings').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($j(ele).data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=true;var data=$moving.data('collapsibleTabsSettings');var $target=$j($moving.data('collapsibleTabsSettings').expandedContainer).find('span.placeholder:first');var expandedWidth=$moving.data('collapsibleTabsSettings').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($moving.data('collapsibleTabsSettings').expandedContainer).data('collapsibleTabsSettings').shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none')
66 $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)
77 $j("#p-cactions h5").animate({'width':'1px'},370,function(){$j(this).attr('style','').parent().addClass("emptyPortlet").removeClass("filledPortlet");});}).collapsibleTabs({expandCondition:function(eleWidth){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width()+1)<($j('#left-navigation').position().left-eleWidth);}else{return($j('#left-navigation').position().left+$j('#left-navigation').width()+1)<($j('#right-navigation').position().left-eleWidth);}},collapseCondition:function(){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width())>$j('#left-navigation').position().left;}else{return($j('#left-navigation').position().left+$j('#left-navigation').width())>$j('#right-navigation').position().left;}}});});$j(document).ready(function(){if(!wgVectorEnabledModules.editwarning||$j('#wpTextbox1').size()==0){return true;}
Index: branches/REL1_16/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
——@@ -19,7 +19,7 @@
2020 'base_sets' => array(
2121 'raw' => array(
2222 array( 'src' => 'css/suggestions.css', 'version' => 6 ),
23 - array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 7 ),
 23+ array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 8 ),
2424 array( 'src' => 'css/vector.footerCleanup.css', 'version' => 1 ),
2525 array( 'src' => 'css/wikiEditor.css', 'version' => 12 ),
2626 array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 20 ),
——@@ -29,11 +29,11 @@
3030 array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
3131 ),
3232 'combined' => array(
33 - array( 'src' => 'css/combined.css', 'version' => 68 ),
 33+ array( 'src' => 'css/combined.css', 'version' => 69 ),
3434 array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
3535 ),
3636 'minified' => array(
37 - array( 'src' => 'css/combined.min.css', 'version' => 68 ),
 37+ array( 'src' => 'css/combined.min.css', 'version' => 69 ),
3838 array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
3939 ),
4040 )
Index: branches/REL1_16/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
——@@ -1,62 +1,62 @@
22 /* Prototype code to show collapsing left nav options */
3 -#panel.collapsible-nav div.portal {
 3+#mw-panel.collapsible-nav div.portal {
44 background-image:url(../images/vector/collapsibleNav/portal-break.png);
55 background-position:left top;
66 background-repeat:no-repeat;
77 padding: 0.25em 0 !important;
88 margin: -11px 9px 10px 11px;
99 }
10 -body.rtl #panel.collapsible-nav div.portal {
 10+body.rtl #mw-panel.collapsible-nav div.portal {
1111 background-position: right top;
1212 margin: -11px 11px 10px 9px;
1313 }
14 -#panel.collapsible-nav div.portal h5 {
 14+#mw-panel.collapsible-nav div.portal h5 {
1515 color: #4D4D4D;
1616 font-weight: normal;
1717 background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
1818 padding: 4px 0 3px 1.5em;
1919 margin-bottom: 0px;
2020 }
21 -body.rtl #panel.collapsible-nav div.portal h5 {
 21+body.rtl #mw-panel.collapsible-nav div.portal h5 {
2222 background: url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat;
2323 padding: 4px 1.5em 3px 0;
2424 }
25 -#panel.collapsible-nav div.collapsed h5 {
 25+#mw-panel.collapsible-nav div.collapsed h5 {
2626 color: #0645AD;
2727 background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
2828 margin-bottom: 0px;
2929 }
30 -body.rtl #panel.collapsible-nav div.collapsed h5 {
 30+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
3131 background: url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat;
3232 }
33 -#panel.collapsible-nav div h5:hover {
 33+#mw-panel.collapsible-nav div h5:hover {
3434 cursor: pointer;
3535 text-decoration: none;
3636 }
37 -#panel.collapsible-nav div.collapsed h5:hover {
 37+#mw-panel.collapsible-nav div.collapsed h5:hover {
3838 text-decoration: underline;
3939 }
40 -#panel.collapsible-nav div.portal div.body {
 40+#mw-panel.collapsible-nav div.portal div.body {
4141 padding-top: 0px;
4242 display: none;
4343 }
44 -#panel.collapsible-nav div.portal div.body ul li {
 44+#mw-panel.collapsible-nav div.portal div.body ul li {
4545 padding: 0.25em 0;
4646 }
47 -#panel.collapsible-nav div.portal div.body {
 47+#mw-panel.collapsible-nav div.portal div.body {
4848 background: none !important;
4949 }
50 -#panel.collapsible-nav #p-navigation {
 50+#mw-panel.collapsible-nav #p-navigation {
5151 background-image: none;
5252 margin-top: 0px;
5353 }
54 -#panel.collapsible-nav #p-navigation div.body {
 54+#mw-panel.collapsible-nav #p-navigation div.body {
5555 margin-left: 0.5em;
5656 }
57 -body.rtl #panel.collapsible-nav #p-navigation div.body {
 57+body.rtl #mw-panel.collapsible-nav #p-navigation div.body {
5858 margin-left: 0;
5959 margin-right: 0.5em;
6060 }
61 -#panel.collapsible-nav #p-navigation h5 {
 61+#mw-panel.collapsible-nav #p-navigation h5 {
6262 display: none;
6363 }
Index: branches/REL1_16/extensions/UsabilityInitiative/css/combined.css
——@@ -50,65 +50,65 @@
5151 color: HighlightText;
5252 }
5353 /* Prototype code to show collapsing left nav options */
54 -#panel.collapsible-nav div.portal {
 54+#mw-panel.collapsible-nav div.portal {
5555 background-image:url(../images/vector/collapsibleNav/portal-break.png);
5656 background-position:left top;
5757 background-repeat:no-repeat;
5858 padding: 0.25em 0 !important;
5959 margin: -11px 9px 10px 11px;
6060 }
61 -body.rtl #panel.collapsible-nav div.portal {
 61+body.rtl #mw-panel.collapsible-nav div.portal {
6262 background-position: right top;
6363 margin: -11px 11px 10px 9px;
6464 }
65 -#panel.collapsible-nav div.portal h5 {
 65+#mw-panel.collapsible-nav div.portal h5 {
6666 color: #4D4D4D;
6767 font-weight: normal;
6868 background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
6969 padding: 4px 0 3px 1.5em;
7070 margin-bottom: 0px;
7171 }
72 -body.rtl #panel.collapsible-nav div.portal h5 {
 72+body.rtl #mw-panel.collapsible-nav div.portal h5 {
7373 background: url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat;
7474 padding: 4px 1.5em 3px 0;
7575 }
76 -#panel.collapsible-nav div.collapsed h5 {
 76+#mw-panel.collapsible-nav div.collapsed h5 {
7777 color: #0645AD;
7878 background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
7979 margin-bottom: 0px;
8080 }
81 -body.rtl #panel.collapsible-nav div.collapsed h5 {
 81+body.rtl #mw-panel.collapsible-nav div.collapsed h5 {
8282 background: url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat;
8383 }
84 -#panel.collapsible-nav div h5:hover {
 84+#mw-panel.collapsible-nav div h5:hover {
8585 cursor: pointer;
8686 text-decoration: none;
8787 }
88 -#panel.collapsible-nav div.collapsed h5:hover {
 88+#mw-panel.collapsible-nav div.collapsed h5:hover {
8989 text-decoration: underline;
9090 }
91 -#panel.collapsible-nav div.portal div.body {
 91+#mw-panel.collapsible-nav div.portal div.body {
9292 padding-top: 0px;
9393 display: none;
9494 }
95 -#panel.collapsible-nav div.portal div.body ul li {
 95+#mw-panel.collapsible-nav div.portal div.body ul li {
9696 padding: 0.25em 0;
9797 }
98 -#panel.collapsible-nav div.portal div.body {
 98+#mw-panel.collapsible-nav div.portal div.body {
9999 background: none !important;
100100 }
101 -#panel.collapsible-nav #p-navigation {
 101+#mw-panel.collapsible-nav #p-navigation {
102102 background-image: none;
103103 margin-top: 0px;
104104 }
105 -#panel.collapsible-nav #p-navigation div.body {
 105+#mw-panel.collapsible-nav #p-navigation div.body {
106106 margin-left: 0.5em;
107107 }
108 -body.rtl #panel.collapsible-nav #p-navigation div.body {
 108+body.rtl #mw-panel.collapsible-nav #p-navigation div.body {
109109 margin-left: 0;
110110 margin-right: 0.5em;
111111 }
112 -#panel.collapsible-nav #p-navigation h5 {
 112+#mw-panel.collapsible-nav #p-navigation h5 {
113113 display: none;
114114 }
115115 /* wikiEditor plugin */
Index: branches/REL1_16/extensions/UsabilityInitiative/css/combined.min.css
——@@ -47,65 +47,65 @@
4848 color:white;
4949 color:HighlightText;
5050 }
51 -#panel.collapsible-nav div.portal{
 51+#mw-panel.collapsible-nav div.portal{
5252 background-image:url(../images/vector/collapsibleNav/portal-break.png);
5353 background-position:left top;
5454 background-repeat:no-repeat;
5555 padding:0.25em 0 !important;
5656 margin:-11px 9px 10px 11px;
5757 }
58 -body.rtl #panel.collapsible-nav div.portal{
 58+body.rtl #mw-panel.collapsible-nav div.portal{
5959 background-position:right top;
6060 margin:-11px 11px 10px 9px;
6161 }
62 -#panel.collapsible-nav div.portal h5{
 62+#mw-panel.collapsible-nav div.portal h5{
6363 color:#4D4D4D;
6464 font-weight:normal;
6565 background:url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
6666 padding:4px 0 3px 1.5em;
6767 margin-bottom:0px;
6868 }
69 -body.rtl #panel.collapsible-nav div.portal h5{
 69+body.rtl #mw-panel.collapsible-nav div.portal h5{
7070 background:url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat;
7171 padding:4px 1.5em 3px 0;
7272 }
73 -#panel.collapsible-nav div.collapsed h5{
 73+#mw-panel.collapsible-nav div.collapsed h5{
7474 color:#0645AD;
7575 background:url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
7676 margin-bottom:0px;
7777 }
78 -body.rtl #panel.collapsible-nav div.collapsed h5{
 78+body.rtl #mw-panel.collapsible-nav div.collapsed h5{
7979 background:url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat;
8080 }
81 -#panel.collapsible-nav div h5:hover{
 81+#mw-panel.collapsible-nav div h5:hover{
8282 cursor:pointer;
8383 text-decoration:none;
8484 }
85 -#panel.collapsible-nav div.collapsed h5:hover{
 85+#mw-panel.collapsible-nav div.collapsed h5:hover{
8686 text-decoration:underline;
8787 }
88 -#panel.collapsible-nav div.portal div.body{
 88+#mw-panel.collapsible-nav div.portal div.body{
8989 padding-top:0px;
9090 display:none;
9191 }
92 -#panel.collapsible-nav div.portal div.body ul li{
 92+#mw-panel.collapsible-nav div.portal div.body ul li{
9393 padding:0.25em 0;
9494 }
95 -#panel.collapsible-nav div.portal div.body{
 95+#mw-panel.collapsible-nav div.portal div.body{
9696 background:none !important;
9797 }
98 -#panel.collapsible-nav #p-navigation{
 98+#mw-panel.collapsible-nav #p-navigation{
9999 background-image:none;
100100 margin-top:0px;
101101 }
102 -#panel.collapsible-nav #p-navigation div.body{
 102+#mw-panel.collapsible-nav #p-navigation div.body{
103103 margin-left:0.5em;
104104 }
105 -body.rtl #panel.collapsible-nav #p-navigation div.body{
 105+body.rtl #mw-panel.collapsible-nav #p-navigation div.body{
106106 margin-left:0;
107107 margin-right:0.5em;
108108 }
109 -#panel.collapsible-nav #p-navigation h5{
 109+#mw-panel.collapsible-nav #p-navigation h5{
110110 display:none;
111111 }
112112 form#editform{
Index: branches/REL1_16/phase3/skins/common/wikibits.js
——@@ -244,7 +244,7 @@
245245 // optimization technique.
246246 var linkContainers = [
247247 'column-one', // Monobook and Modern
248 - 'head', 'panel', 'p-logo' // Vector
 248+ 'mw-head', 'mw-panel', 'p-logo' // Vector
249249 ];
250250 for ( var i in linkContainers ) {
251251 var linkContainer = document.getElementById( linkContainers[i] );
Index: branches/REL1_16/phase3/skins/Vector.php
——@@ -448,8 +448,8 @@
449449 // Output HTML Page
450450 $this->html( 'headelement' );
451451 ?>
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>
454454 <!-- content -->
455455 <div id="content" <?php $this->html('specialpageattributes') ?>>
456456 <a id="top"></a>
——@@ -483,7 +483,7 @@
484484 <?php if ( $this->data['showjumplinks'] ): ?>
485485 <!-- jumpto -->
486486 <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="#mw-head"><?php $this->msg( 'jumptonavigation' ) ?></a>,
488488 <a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
489489 </div>
490490 <!-- /jumpto -->
——@@ -507,7 +507,7 @@
508508 </div>
509509 <!-- /content -->
510510 <!-- header -->
511 - <div id="head" class="noprint">
 511+ <div id="mw-head" class="noprint">
512512 <?php $this->renderNavigation( 'PERSONAL' ); ?>
513513 <div id="left-navigation">
514514 <?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
——@@ -518,7 +518,7 @@
519519 </div>
520520 <!-- /header -->
521521 <!-- panel -->
522 - <div id="panel" class="noprint">
 522+ <div id="mw-panel" class="noprint">
523523 <!-- logo -->
524524 <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>
525525 <!-- /logo -->
Index: branches/REL1_16/phase3/skins/vector/experiments/new-tabs.css
——@@ -191,7 +191,7 @@
192192 direction: rtl;
193193 }
194194 /* @noflip */
195 - body #head div.vectorMenu h5 {
 195+ body #mw-head div.vectorMenu h5 {
196196 background-image: url(../images/arrow-down-icon.png);
197197 background-position: center center;
198198 background-repeat: no-repeat;
——@@ -319,4 +319,4 @@
320320 }
321321 .wikiEditor-ui-tabs div.current a {
322322 background: #FFFFFF;
323 -}
\ No newline at end of file
 323+}
Index: branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-a.css
——@@ -13,7 +13,7 @@
1414 }
1515
1616 /* Framework */
17 -#page-base {
 17+#mw-page-base {
1818 background-color: inherit !important;
1919 background-image: none !important;
2020 }
——@@ -65,10 +65,10 @@
6666 font-family:sans-serif;
6767 font-weight:normal;
6868 }
69 -body #panel div.portal div.body {
 69+body #mw-panel div.portal div.body {
7070 background-image:url(images/new-portal-break-ltr.png);
7171 }
72 -body.rtl #panel div.portal div.body {
 72+body.rtl #mw-panel div.portal div.body {
7373 background-image:url(images/new-portal-break-rtl.png);
7474 }
7575 body div.vectorTabs li a, div.vectorTabs li a span{
——@@ -101,7 +101,7 @@
102102 border: 1px solid #cccccc;
103103 background-color: #f7f7f7;
104104 }
105 -#panel div.portal h5 {
 105+#mw-panel div.portal h5 {
106106 font-weight:bold;
107107 margin-bottom:0;
108108 padding-bottom:0.05em;
Index: branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-b.css
——@@ -8,7 +8,7 @@
99 }
1010
1111 /* Framework */
12 -#page-base {
 12+#mw-page-base {
1313 background-color: inherit !important;
1414 background-image: none !important;
1515 }
Index: branches/REL1_16/phase3/skins/vector/experiments/babaco-colors-c.css
——@@ -1,7 +1,7 @@
22 /* Babaco Color Scheme C */
33
44 /* ridding ourselves of the gradient */
5 -#page-base {
 5+#mw-page-base {
66 background-color: inherit !important;
77 background-image: none !important;
88 }
——@@ -53,7 +53,7 @@
5454 #toc h2, .toc h2 {
5555 font-weight:normal;
5656 }
57 -body #panel div.portal div.body {
 57+body #mw-panel div.portal div.body {
5858 background-image:url(images/new-portal-break-ltr.png);
5959 }
6060
——@@ -77,7 +77,7 @@
7878 border: 1px solid #cccccc;
7979 background-color: #f7f7f7;
8080 }
81 -#panel div.portal h5 {
 81+#mw-panel div.portal h5 {
8282 font-weight:bold;
8383 margin-bottom:0;
8484 padding-bottom:0.05em;
Index: branches/REL1_16/phase3/skins/vector/main-ltr.css
——@@ -385,17 +385,17 @@
386386 background-color: silver;
387387 }
388388 /* Panel */
389 -#panel {
 389+#mw-panel {
390390 position: absolute;
391391 top: 160px;
392392 padding-top: 1em;
393393 width: 10em;
394394 left: 0;
395395 }
396 - #panel div.portal {
 396+ #mw-panel div.portal {
397397 padding-bottom: 1.5em;
398398 }
399 - #panel div.portal h5 {
 399+ #mw-panel div.portal h5 {
400400 font-weight: normal;
401401 color: #444444;
402402 padding: 0.25em;
——@@ -405,7 +405,7 @@
406406 border: none;
407407 font-size: 0.75em;
408408 }
409 - #panel div.portal div.body {
 409+ #mw-panel div.portal div.body {
410410 margin: 0;
411411 padding-top: 0.5em;
412412 margin-left: 1.25em;
——@@ -413,14 +413,14 @@
414414 background-repeat: no-repeat;
415415 background-position: top left;
416416 }
417 - #panel div.portal div.body ul {
 417+ #mw-panel div.portal div.body ul {
418418 list-style: none;
419419 list-style-image: none;
420420 list-style-type: none;
421421 padding: 0;
422422 margin: 0;
423423 }
424 - #panel div.portal div.body ul li {
 424+ #mw-panel div.portal div.body ul li {
425425 line-height: 1.125em;
426426 padding: 0;
427427 padding-bottom: 0.5em;
——@@ -428,10 +428,10 @@
429429 overflow: hidden;
430430 font-size: 0.75em;
431431 }
432 - #panel div.portal div.body ul li a {
 432+ #mw-panel div.portal div.body ul li a {
433433 color: #0645ad;
434434 }
435 - #panel div.portal div.body ul li a:visited {
 435+ #mw-panel div.portal div.body ul li a:visited {
436436 color: #0b0080;
437437 }
438438 /* Footer */
——@@ -1125,4 +1125,4 @@
11261126 background-image:url(images/tab-break.png);
11271127 background-position:right bottom;
11281128 background-repeat:no-repeat;
1129 -}
\ No newline at end of file
 1129+}
Index: branches/REL1_16/phase3/skins/vector/main-rtl.css
——@@ -385,17 +385,17 @@
386386 background-color: silver;
387387 }
388388 /* Panel */
389 -#panel {
 389+#mw-panel {
390390 position: absolute;
391391 top: 160px;
392392 padding-top: 1em;
393393 width: 10em;
394394 right: 0;
395395 }
396 - #panel div.portal {
 396+ #mw-panel div.portal {
397397 padding-bottom: 1.5em;
398398 }
399 - #panel div.portal h5 {
 399+ #mw-panel div.portal h5 {
400400 font-weight: normal;
401401 color: #444444;
402402 padding: 0.25em;
——@@ -405,7 +405,7 @@
406406 border: none;
407407 font-size: 0.75em;
408408 }
409 - #panel div.portal div.body {
 409+ #mw-panel div.portal div.body {
410410 margin: 0;
411411 padding-top: 0.5em;
412412 margin-right: 1.25em;
——@@ -413,14 +413,14 @@
414414 background-repeat: no-repeat;
415415 background-position: top right;
416416 }
417 - #panel div.portal div.body ul {
 417+ #mw-panel div.portal div.body ul {
418418 list-style: none;
419419 list-style-image: none;
420420 list-style-type: none;
421421 padding: 0;
422422 margin: 0;
423423 }
424 - #panel div.portal div.body ul li {
 424+ #mw-panel div.portal div.body ul li {
425425 line-height: 1.125em;
426426 padding: 0;
427427 padding-bottom: 0.5em;
——@@ -428,10 +428,10 @@
429429 overflow: hidden;
430430 font-size: 0.75em;
431431 }
432 - #panel div.portal div.body ul li a {
 432+ #mw-panel div.portal div.body ul li a {
433433 color: #0645ad;
434434 }
435 - #panel div.portal div.body ul li a:visited {
 435+ #mw-panel div.portal div.body ul li a:visited {
436436 color: #0b0080;
437437 }
438438 /* Footer */
——@@ -1125,4 +1125,4 @@
11261126 background-image:url(images/tab-break.png);
11271127 background-position:left bottom;
11281128 background-repeat:no-repeat;
1129 -}
\ No newline at end of file
 1129+}
Index: branches/REL1_16/phase3/includes/DefaultSettings.php
——@@ -1686,7 +1686,7 @@
16871687 * to ensure that client-side caches do not keep obsolete copies of global
16881688 * styles.
16891689 */
1690 -$wgStyleVersion = '269';
 1690+$wgStyleVersion = '270';
16911691
16921692
16931693 # Server-side caching:

Follow-up revisions

RevisionCommit summaryAuthorDate
r68122Follow up r68102 with #head, #head-base, #page-baseplatonides14:06, 16 June 2010
r68709* Added release notes for r68102, r68122, r66692.tstarling07:26, 29 June 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r67703Prefix Vector specific ids (head-base|page-base|head|panel) with mw- per bug ......platonides11:28, 9 June 2010
r67893Follow up to r67703. Fixes jump-to anchor which still ref'ed to #head instead...hartman10:59, 12 June 2010

Comments

#Comment by Fomafix (talk | contribs)   09:27, 16 June 2010
  1. head -> #mw-head is missing in phase3/skins/vector/main-ltr.css and phase3/skins/vector/main-rtl.cs
#Comment by Platonides (talk | contribs)   14:06, 16 June 2010

Fixed in r68122

#Comment by Tim Starling (talk | contribs)   06:53, 29 June 2010

Please do not make any more changes to 1.16 unless you are prepared to add appropriate entries to RELEASE-NOTES.

Status & tagging log