| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleLeftNav/CollapsibleLeftNav.js |
| — | — | @@ -19,5 +19,6 @@ |
| 20 | 20 | .toggleClass( 'collapsed' ) |
| 21 | 21 | .find( 'div.body' ) |
| 22 | 22 | .slideToggle( 'fast' ); |
| | 23 | + return false; |
| 23 | 24 | } ); |
| 24 | 25 | } ); |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -12,16 +12,16 @@ |
| 13 | 13 | |
| 14 | 14 | static $scripts = array( |
| 15 | 15 | 'raw' => array( |
| 16 | | - array( 'src' => 'Modules/CollapsibleLeftNav/CollapsibleLeftNav.js', 'version' => 2 ), |
| | 16 | + array( 'src' => 'Modules/CollapsibleLeftNav/CollapsibleLeftNav.js', 'version' => 3 ), |
| 17 | 17 | array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 6 ), |
| 18 | 18 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 4 ), |
| 19 | 19 | array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 4 ), |
| 20 | 20 | ), |
| 21 | 21 | 'combined' => array( |
| 22 | | - array( 'src' => 'Vector.combined.js', 'version' => 8 ), |
| | 22 | + array( 'src' => 'Vector.combined.js', 'version' => 9 ), |
| 23 | 23 | ), |
| 24 | 24 | 'minified' => array( |
| 25 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 8 ), |
| | 25 | + array( 'src' => 'Vector.combined.min.js', 'version' => 9 ), |
| 26 | 26 | ), |
| 27 | 27 | ); |
| 28 | 28 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -19,6 +19,7 @@ |
| 20 | 20 | .toggleClass( 'collapsed' ) |
| 21 | 21 | .find( 'div.body' ) |
| 22 | 22 | .slideToggle( 'fast' ); |
| | 23 | + return false; |
| 23 | 24 | } ); |
| 24 | 25 | } ); |
| 25 | 26 | mw.addOnloadHook( function() { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | |
| 3 | 3 | mw.addOnloadHook(function(){if(!wgVectorEnabledModules.collapsibleleftnav) |
| 4 | | -return true;$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal').toggleClass('collapsed');$j('#panel > div.portal:first').toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');$j('#panel > div.portal > h5').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');});});mw.addOnloadHook(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| | 4 | +return true;$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal').toggleClass('collapsed');$j('#panel > div.portal:first').toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');$j('#panel > div.portal > h5').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});mw.addOnloadHook(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| 5 | 5 | 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') |
| 6 | 6 | $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) |
| 7 | 7 | $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;}}});});mw.addOnloadHook(function(){if(!wgVectorEnabledModules.editwarning){return true;} |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | private static $styleFiles = array( |
| 20 | 20 | 'base_sets' => array( |
| 21 | 21 | 'raw' => array( |
| 22 | | - array( 'src' => 'css/collapsibleLeftNav.css', 'version' => 2 ), |
| | 22 | + array( 'src' => 'css/collapsibleLeftNav.css', 'version' => 3 ), |
| 23 | 23 | array( 'src' => 'css/suggestions.css', 'version' => 6 ), |
| 24 | 24 | array( 'src' => 'css/wikiEditor.css', 'version' => 7 ), |
| 25 | 25 | array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 8 ), |
| — | — | @@ -28,11 +28,11 @@ |
| 29 | 29 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 30 | 30 | ), |
| 31 | 31 | 'combined' => array( |
| 32 | | - array( 'src' => 'css/combined.css', 'version' => 43 ), |
| | 32 | + array( 'src' => 'css/combined.css', 'version' => 44 ), |
| 33 | 33 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 34 | 34 | ), |
| 35 | 35 | 'minified' => array( |
| 36 | | - array( 'src' => 'css/combined.min.css', 'version' => 43 ), |
| | 36 | + array( 'src' => 'css/combined.min.css', 'version' => 44 ), |
| 37 | 37 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 38 | 38 | ), |
| 39 | 39 | ) |
| Index: trunk/extensions/UsabilityInitiative/css/collapsibleLeftNav.css |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | font-weight: normal; |
| 12 | 12 | background: url(../images/vector/left-nav-arrow-down.png) 0 50% no-repeat; |
| 13 | 13 | padding: 8px 0 8px 1.5em; |
| | 14 | + margin-bottom: 0; |
| 14 | 15 | } |
| 15 | 16 | #panel.collapsible-nav div.collapsed h5 { |
| 16 | 17 | color: #ccc; |
| — | — | @@ -23,8 +24,16 @@ |
| 24 | 25 | background: url(../images/vector/left-nav-arrow-right-over.png) 0 50% no-repeat #e7e8e9; |
| 25 | 26 | } |
| 26 | 27 | #panel.collapsible-nav div.portal div.body { |
| | 28 | + padding-top: 4px; |
| 27 | 29 | display: none; |
| 28 | 30 | } |
| 29 | 31 | #panel.collapsible-nav div.portal div.body { |
| 30 | 32 | background: none !important; |
| 31 | 33 | } |
| | 34 | +#panel.collapsible-nav #p-navigation { |
| | 35 | + border-top: none; |
| | 36 | + margin-top: 0px; |
| | 37 | +} |
| | 38 | +#panel.collapsible-nav #p-navigation h5 { |
| | 39 | + display: none; |
| | 40 | +} |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | font-weight: normal; |
| 12 | 12 | background: url(../images/vector/left-nav-arrow-down.png) 0 50% no-repeat; |
| 13 | 13 | padding: 8px 0 8px 1.5em; |
| | 14 | + margin-bottom: 0; |
| 14 | 15 | } |
| 15 | 16 | #panel.collapsible-nav div.collapsed h5 { |
| 16 | 17 | color: #ccc; |
| — | — | @@ -23,11 +24,19 @@ |
| 24 | 25 | background: url(../images/vector/left-nav-arrow-right-over.png) 0 50% no-repeat #e7e8e9; |
| 25 | 26 | } |
| 26 | 27 | #panel.collapsible-nav div.portal div.body { |
| | 28 | + padding-top: 4px; |
| 27 | 29 | display: none; |
| 28 | 30 | } |
| 29 | 31 | #panel.collapsible-nav div.portal div.body { |
| 30 | 32 | background: none !important; |
| 31 | 33 | } |
| | 34 | +#panel.collapsible-nav #p-navigation { |
| | 35 | + border-top: none; |
| | 36 | + margin-top: 0px; |
| | 37 | +} |
| | 38 | +#panel.collapsible-nav #p-navigation h5 { |
| | 39 | + display: none; |
| | 40 | +} |
| 32 | 41 | /* suggestions plugin */ |
| 33 | 42 | |
| 34 | 43 | .suggestions { |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -9,6 +9,7 @@ |
| 10 | 10 | font-weight:normal; |
| 11 | 11 | background:url(../images/vector/left-nav-arrow-down.png) 0 50% no-repeat; |
| 12 | 12 | padding:8px 0 8px 1.5em; |
| | 13 | +margin-bottom:0; |
| 13 | 14 | } |
| 14 | 15 | #panel.collapsible-nav div.collapsed h5{ |
| 15 | 16 | color:#ccc; |
| — | — | @@ -22,11 +23,19 @@ |
| 23 | 24 | background:url(../images/vector/left-nav-arrow-right-over.png) 0 50% no-repeat #e7e8e9; |
| 24 | 25 | } |
| 25 | 26 | #panel.collapsible-nav div.portal div.body{ |
| | 27 | +padding-top:4px; |
| 26 | 28 | display:none; |
| 27 | 29 | } |
| 28 | 30 | #panel.collapsible-nav div.portal div.body{ |
| 29 | 31 | background:none !important; |
| 30 | 32 | } |
| | 33 | +#panel.collapsible-nav #p-navigation{ |
| | 34 | +border-top:none; |
| | 35 | +margin-top:0px; |
| | 36 | +} |
| | 37 | +#panel.collapsible-nav #p-navigation h5{ |
| | 38 | +display:none; |
| | 39 | +} |
| 31 | 40 | .suggestions{ |
| 32 | 41 | overflow:hidden; |
| 33 | 42 | position:absolute; |