| Index: trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css |
| — | — | @@ -7,5 +7,4 @@ |
| 8 | 8 | } |
| 9 | 9 | div#simpleSearch button#searchButton { |
| 10 | 10 | margin: 0.4em 0 0 0; |
| 11 | | - float: right; |
| 12 | 11 | } |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -141,7 +141,6 @@ |
| 142 | 142 | } |
| 143 | 143 | div#simpleSearch button#searchButton { |
| 144 | 144 | margin: 0.4em 0 0 0; |
| 145 | | - float: right; |
| 146 | 145 | } |
| 147 | 146 | /* wikiEditor plugin */ |
| 148 | 147 | |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -139,7 +139,6 @@ |
| 140 | 140 | } |
| 141 | 141 | div#simpleSearch button#searchButton{ |
| 142 | 142 | margin:0.4em 0 0 0; |
| 143 | | -float:right; |
| 144 | 143 | } |
| 145 | 144 | form#editform{ |
| 146 | 145 | margin:0; |
| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/ExpandableSearch/ExpandableSearch.js |
| — | — | @@ -39,5 +39,7 @@ |
| 40 | 40 | $j.collapsibleTabs.handleResize(); |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | | - } ); |
| | 43 | + } ) |
| | 44 | + .siblings( 'button' ) |
| | 45 | + .css( 'float', 'right' ); |
| 44 | 46 | }); |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -14,16 +14,16 @@ |
| 15 | 15 | 'raw' => array( |
| 16 | 16 | array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 18 ), |
| 17 | 17 | array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ), |
| 18 | | - array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 2 ), |
| | 18 | + array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 3 ), |
| 19 | 19 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| 20 | 20 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 21 | 21 | array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 15 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 40 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 41 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 40 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 41 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -375,7 +375,9 @@ |
| 376 | 376 | $j.collapsibleTabs.handleResize(); |
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | | - } ); |
| | 379 | + } ) |
| | 380 | + .siblings( 'button' ) |
| | 381 | + .css( 'float', 'right' ); |
| 380 | 382 | }); |
| 381 | 383 | /* Prototype code to demonstrate proposed edit page footer cleanups */ |
| 382 | 384 | /* First draft and will be changing greatly */ |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | if(fallbackResult!==undefined){return fallbackResult;} |
| 22 | 22 | if(wgAction=='submit'||$j('#wpTextbox1').data('origtext')!=$j('#wpTextbox1').val()||$j('#wpSummary').data('origtext')!=$j('#wpSummary').val()){return mw.usability.getMsg('vector-editwarning-warning');}} |
| 23 | 23 | $j('form').submit(function(){window.onbeforeunload=fallbackWindowOnBeforeUnload;});});var fallbackWindowOnBeforeUnload=null;$j(document).ready(function(){if(!wgVectorEnabledModules.expandablesearch||skin!='vector'){return true;} |
| 24 | | -$j('#searchInput').expandableField({'beforeExpand':function(context){$j(this).parent().animate({'borderTopColor':'#a0d8ff','borderLeftColor':'#a0d8ff','borderRightColor':'#a0d8ff','borderBottomColor':'#a0d8ff'},'fast');},'beforeCondense':function(context){$j(this).parent().animate({'borderTopColor':'#aaaaaa','borderLeftColor':'#aaaaaa','borderRightColor':'#aaaaaa','borderBottomColor':'#aaaaaa'},'fast');},'afterExpand':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'afterCondense':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}}});});$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;} |
| | 24 | +$j('#searchInput').expandableField({'beforeExpand':function(context){$j(this).parent().animate({'borderTopColor':'#a0d8ff','borderLeftColor':'#a0d8ff','borderRightColor':'#a0d8ff','borderBottomColor':'#a0d8ff'},'fast');},'beforeCondense':function(context){$j(this).parent().animate({'borderTopColor':'#aaaaaa','borderLeftColor':'#aaaaaa','borderRightColor':'#aaaaaa','borderBottomColor':'#aaaaaa'},'fast');},'afterExpand':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}},'afterCondense':function(context){if(typeof $j.collapsibleTabs!='undefined'){$j.collapsibleTabs.handleResize();}}}).siblings('button').css('float','right');});$j(document).ready(function(){if(!wgVectorEnabledModules.footercleanup){return true;} |
| 25 | 25 | $j('#editpage-copywarn').add('.editOptions').wrapAll('<div id="editpage-bottom"></div>');$j('#wpSummary').data('hint',$j('#wpSummaryLabel span small').remove().text().replace(/\)|\(/g,'')).change(function(){if($j(this).val().length==0){$j(this).addClass('inline-hint').val($j(this).data('hint'));}else{$j(this).removeClass('inline-hint');}}).focus(function(){if($j(this).val()==$j(this).data('hint')){$j(this).removeClass('inline-hint').val("");}}).blur(function(){$j(this).trigger('change');}).trigger('change');$j('#wpSummary').add('.editCheckboxes').wrapAll('<div id="editpage-summary-fields"></div>');$j('#editpage-specialchars').remove();var transclusionCount=$j('.templatesUsed ul li').size();$j('.templatesUsed ul').wrap('<div id="transclusions-list" class="collapsible-list collapsed"></div>').parent().prepend('<label>This page contains <a href="http://en.wikipedia.org/wiki/transclusion">transclusions</a> of <strong>' |
| 26 | 26 | +transclusionCount |
| 27 | 27 | +'</strong> other pages.</label>');$j('.mw-templatesUsedExplanation').remove();$j('.collapsible-list label').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('ul').slideToggle('fast');return false;}).trigger('click');$j('#wpPreview, #wpDiff, .editHelp, #editpage-specialchars').remove();$j('#mw-editform-cancel').remove().appendTo('.editButtons');});if(wgVectorEnabledModules.simplesearch&&skin=='vector'&&typeof os_autoload_inputs!=='undefined'&&os_autoload_forms!=='undefined'){os_autoload_inputs=[];os_autoload_forms=[];} |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | 'raw' => array( |
| 22 | 22 | array( 'src' => 'css/suggestions.css', 'version' => 14 ), |
| 23 | 23 | array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 11 ), |
| 24 | | - array( 'src' => 'css/vector.expandableSearch.css', 'version' => 2 ), |
| | 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 ), |
| 27 | 27 | array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 29 ), |
| — | — | @@ -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' => 99 ), |
| | 34 | + array( 'src' => 'css/combined.css', 'version' => 100 ), |
| 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' => 99 ), |
| | 38 | + array( 'src' => 'css/combined.min.css', 'version' => 100 ), |
| 39 | 39 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 40 | 40 | ), |
| 41 | 41 | ) |