| Index: trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css |
| — | — | @@ -5,5 +5,5 @@ |
| 6 | 6 | overflow: auto; |
| 7 | 7 | } |
| 8 | 8 | div#simpleSearch button#searchButton { |
| 9 | | - margin: 0.4em 0 0 0; |
| | 9 | + margin: 3px 0 0 0; |
| 10 | 10 | } |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | overflow: auto; |
| 142 | 142 | } |
| 143 | 143 | div#simpleSearch button#searchButton { |
| 144 | | - margin: 0.4em 0 0 0; |
| | 144 | + margin: 3px 0 0 0; |
| 145 | 145 | } |
| 146 | 146 | /* wikiEditor plugin */ |
| 147 | 147 | |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | overflow:auto; |
| 140 | 140 | } |
| 141 | 141 | div#simpleSearch button#searchButton{ |
| 142 | | -margin:0.4em 0 0 0; |
| | 142 | +margin:3px 0 0 0; |
| 143 | 143 | } |
| 144 | 144 | form#editform{ |
| 145 | 145 | margin:0; |
| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js |
| — | — | @@ -43,10 +43,11 @@ |
| 44 | 44 | .css({ |
| 45 | 45 | 'display': 'none', |
| 46 | 46 | 'position' : 'absolute', |
| 47 | | - 'bottom': 0, |
| 48 | | - 'padding': '0.25em', |
| 49 | 47 | 'color': '#999999', |
| 50 | | - 'cursor': 'text' |
| | 48 | + 'cursor': 'text', |
| | 49 | + 'margin': '0 4px', |
| | 50 | + 'top': '6px', |
| | 51 | + 'line-height': '13px' |
| 51 | 52 | }) |
| 52 | 53 | .css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ), 0 ) |
| 53 | 54 | .click( function() { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -17,13 +17,13 @@ |
| 18 | 18 | array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 4 ), |
| 19 | 19 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| 20 | 20 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 21 | | - array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 16 ), |
| | 21 | + array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 17 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 50 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 51 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 50 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 51 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -503,10 +503,11 @@ |
| 504 | 504 | .css({ |
| 505 | 505 | 'display': 'none', |
| 506 | 506 | 'position' : 'absolute', |
| 507 | | - 'bottom': 0, |
| 508 | | - 'padding': '0.25em', |
| 509 | 507 | 'color': '#999999', |
| 510 | | - 'cursor': 'text' |
| | 508 | + 'cursor': 'text', |
| | 509 | + 'margin': '0 4px', |
| | 510 | + 'top': '6px', |
| | 511 | + 'line-height': '13px' |
| 511 | 512 | }) |
| 512 | 513 | .css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ), 0 ) |
| 513 | 514 | .click( function() { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | +'</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=[];} |
| 27 | 27 | $j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||skin!='vector'){return true;} |
| 28 | 28 | var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;} |
| 29 | | -$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','bottom':0,'padding':'0.25em','color':'#999999','cursor':'text'}).css(($j('body').is('.rtl')?'right':'left'),0).click(function(){$j(this).parent().find('input#searchInput').focus();}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).bind('keypress',function(){if($j(this).parent().find('label:visible').size()>0) |
| | 29 | +$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','color':'#999999','cursor':'text','margin':'0 4px','top':'6px','line-height':'13px'}).css(($j('body').is('.rtl')?'right':'left'),0).click(function(){$j(this).parent().find('input#searchInput').focus();}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).bind('keypress',function(){if($j(this).parent().find('label:visible').size()>0) |
| 30 | 30 | $j(this).parent().find('label').fadeOut(100);}).focus(function(){$j(this).parent().find('label').fadeOut(100);}).blur(function(){if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}});$j(document).bind('dragend',function(event){if($j('div#simpleSearch > label:visible').size()>0&&$j('div#simpleSearch > input#searchInput').val().length>0) |
| 31 | 31 | $j('div#simpleSearch > label').fadeOut(100);});$j('#searchInput, #searchInput2, #powerSearchText, #searchText').suggestions({fetch:function(query){var $this=$j(this);var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':query,'namespace':0,'suggest':''},dataType:'json',success:function(data){$this.suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request&&typeof request.abort=='function'){request.abort();$j(this).removeData('request');}},result:{select:function($textbox){$textbox.closest('form').submit();}},delay:120,positionFromLeft:$j('body').is('.rtl'),highlightInput:true}).bind('paste cut click',function(){$j(this).trigger('keypress');});$j('#searchInput').suggestions({result:{select:function($textbox){$textbox.closest('form').submit();}},special:{render:function(query){if($j(this).children().size()==0){$j(this).show() |
| 32 | 32 | $label=$j('<div />').addClass('special-label').text(mw.usability.getMsg('vector-simplesearch-containing')).appendTo($j(this));$query=$j('<div />').addClass('special-query').text(query).appendTo($j(this));$query.autoEllipsis();}else{$j(this).find('.special-query').empty().text(query).autoEllipsis();}},select:function($textbox){$textbox.closest('form').append($j('<input />').attr({'type':'hidden','name':'fulltext','value':1}));$textbox.closest('form').submit();}},$region:$j('#simpleSearch')}).bind('paste cut click',function(){$j(this).trigger('keypress');});}); |
| \ No newline at end of file |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | 'raw' => array( |
| 22 | 22 | array( 'src' => 'css/suggestions.css', 'version' => 15 ), |
| 23 | 23 | array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 12 ), |
| 24 | | - array( 'src' => 'css/vector.expandableSearch.css', 'version' => 4 ), |
| | 24 | + array( 'src' => 'css/vector.expandableSearch.css', 'version' => 5 ), |
| 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' => 103 ), |
| | 34 | + array( 'src' => 'css/combined.css', 'version' => 104 ), |
| 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' => 103 ), |
| | 38 | + array( 'src' => 'css/combined.min.css', 'version' => 104 ), |
| 39 | 39 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
| 40 | 40 | ), |
| 41 | 41 | ) |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | array( 'src' => 'js/plugins.combined.js', 'version' => 425 ), |
| 93 | 93 | ), |
| 94 | 94 | 'minified' => array( |
| 95 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 425 ), |
| | 95 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 426 ), |
| 96 | 96 | ), |
| 97 | 97 | ), |
| 98 | 98 | ); |