| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -715,7 +715,10 @@ |
| 716 | 716 | padding: .5em .4em .4em .4em; |
| 717 | 717 | text-align: center; |
| 718 | 718 | } |
| 719 | | - |
| | 719 | +#p-search #searchform div div { |
| | 720 | + margin-top: .4em; |
| | 721 | + font-size: 95%; |
| | 722 | +} |
| 720 | 723 | /* |
| 721 | 724 | ** the personal toolbar |
| 722 | 725 | */ |
| Index: trunk/phase3/skins/modern/main.css |
| — | — | @@ -158,6 +158,10 @@ |
| 159 | 159 | margin-right: auto; |
| 160 | 160 | } |
| 161 | 161 | |
| | 162 | +#p-search #searchform div div { |
| | 163 | + margin-top: .4em; |
| | 164 | +} |
| | 165 | + |
| 162 | 166 | .portlet h5 { |
| 163 | 167 | padding: 0.1em 0 0.3em 1em; |
| 164 | 168 | margin: 0 0 0 0; |
| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -289,7 +289,7 @@ |
| 290 | 290 | |
| 291 | 291 | function searchForm( $label = "" ) |
| 292 | 292 | { |
| 293 | | - global $wgRequest; |
| | 293 | + global $wgRequest, $wgUseTwoButtonsSearchForm; |
| 294 | 294 | |
| 295 | 295 | $search = $wgRequest->getText( 'search' ); |
| 296 | 296 | $action = $this->escapeSearchLink(); |
| — | — | @@ -298,9 +298,15 @@ |
| 299 | 299 | |
| 300 | 300 | $s .= "<input type='text' id=\"searchInput{$this->searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\"" |
| 301 | 301 | . htmlspecialchars(substr($search,0,256)) . "\" /><br />" |
| 302 | | - . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" />" |
| 303 | | - . "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>"; |
| | 302 | + . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" />"; |
| 304 | 303 | |
| | 304 | + if ($wgUseTwoButtonsSearchForm) |
| | 305 | + $s .= "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" />\n"; |
| | 306 | + else |
| | 307 | + $s .= '<div><a href="$action" rel="search">' . wfMsg ('powersearch-legend') . "</a></div>\n"; |
| | 308 | + |
| | 309 | + $s .= '</form>'; |
| | 310 | + |
| 305 | 311 | // Ensure unique id's for search boxes made after the first |
| 306 | 312 | $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1; |
| 307 | 313 | |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -249,6 +249,7 @@ |
| 250 | 250 | |
| 251 | 251 | /*************************************************************************************************/ |
| 252 | 252 | function searchBox() { |
| | 253 | + global $wgUseTwoButtonsSearchForm; |
| 253 | 254 | ?> |
| 254 | 255 | <div id="p-search" class="portlet"> |
| 255 | 256 | <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5> |
| — | — | @@ -257,8 +258,11 @@ |
| 258 | 259 | <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search'); |
| 259 | 260 | if( isset( $this->data['search'] ) ) { |
| 260 | 261 | ?> value="<?php $this->text('search') ?>"<?php } ?> /> |
| 261 | | - <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /> |
| 262 | | - <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> |
| | 262 | + <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?> |
| | 263 | + <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?> |
| | 264 | + |
| | 265 | + <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?> |
| | 266 | + |
| 263 | 267 | </div></form> |
| 264 | 268 | </div> |
| 265 | 269 | </div> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -245,6 +245,7 @@ |
| 246 | 246 | |
| 247 | 247 | /*************************************************************************************************/ |
| 248 | 248 | function searchBox() { |
| | 249 | + global $wgUseTwoButtonsSearchForm; |
| 249 | 250 | ?> |
| 250 | 251 | <!-- search --> |
| 251 | 252 | <div id="p-search" class="portlet"> |
| — | — | @@ -254,8 +255,11 @@ |
| 255 | 256 | <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search'); |
| 256 | 257 | if( isset( $this->data['search'] ) ) { |
| 257 | 258 | ?> value="<?php $this->text('search') ?>"<?php } ?> /> |
| 258 | | - <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /> |
| 259 | | - <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> |
| | 259 | + <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?> |
| | 260 | + <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?> |
| | 261 | + |
| | 262 | + <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?> |
| | 263 | + |
| 260 | 264 | </div></form> |
| 261 | 265 | </div><!-- pBody --> |
| 262 | 266 | </div><!-- portlet --> |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1455,7 +1455,7 @@ |
| 1456 | 1456 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1457 | 1457 | * styles. |
| 1458 | 1458 | */ |
| 1459 | | -$wgStyleVersion = '198'; |
| | 1459 | +$wgStyleVersion = '199'; |
| 1460 | 1460 | |
| 1461 | 1461 | |
| 1462 | 1462 | # Server-side caching: |
| — | — | @@ -3657,10 +3657,10 @@ |
| 3658 | 3658 | $wgEdititis = false; |
| 3659 | 3659 | |
| 3660 | 3660 | /** |
| 3661 | | -* Enable the UniversalEditButton for browsers that support it |
| 3662 | | -* (currently only Firefox with an extension) |
| 3663 | | -* See http://universaleditbutton.org for more background information |
| 3664 | | -*/ |
| | 3661 | + * Enable the UniversalEditButton for browsers that support it |
| | 3662 | + * (currently only Firefox with an extension) |
| | 3663 | + * See http://universaleditbutton.org for more background information |
| | 3664 | + */ |
| 3665 | 3665 | $wgUniversalEditButton = true; |
| 3666 | 3666 | |
| 3667 | 3667 | /** |
| — | — | @@ -3669,3 +3669,10 @@ |
| 3670 | 3670 | * and the functionality will be enabled universally. |
| 3671 | 3671 | */ |
| 3672 | 3672 | $wgEnforceHtmlIds = true; |
| | 3673 | + |
| | 3674 | +/** |
| | 3675 | + * Search form behavior |
| | 3676 | + * true = use Go & Search buttons |
| | 3677 | + * false = use Go button & Advanced search link |
| | 3678 | + */ |
| | 3679 | +$wgUseTwoButtonsSearchForm = true; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1140,16 +1140,22 @@ |
| 1141 | 1141 | } |
| 1142 | 1142 | |
| 1143 | 1143 | function searchForm() { |
| 1144 | | - global $wgRequest; |
| | 1144 | + global $wgRequest, $wgUseTwoButtonsSearchForm; |
| 1145 | 1145 | $search = $wgRequest->getText( 'search' ); |
| 1146 | 1146 | |
| 1147 | 1147 | $s = '<form id="searchform'.$this->searchboxes.'" name="search" class="inline" method="post" action="' |
| 1148 | 1148 | . $this->escapeSearchLink() . "\">\n" |
| 1149 | 1149 | . '<input type="text" id="searchInput'.$this->searchboxes.'" name="search" size="19" value="' |
| 1150 | 1150 | . htmlspecialchars(substr($search,0,256)) . "\" />\n" |
| 1151 | | - . '<input type="submit" name="go" value="' . wfMsg ('searcharticle') . '" /> ' |
| 1152 | | - . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>"; |
| 1153 | | - |
| | 1151 | + . '<input type="submit" name="go" value="' . wfMsg ('searcharticle') . '" />'; |
| | 1152 | + |
| | 1153 | + if ($wgUseTwoButtonsSearchForm) |
| | 1154 | + $s .= ' <input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n"; |
| | 1155 | + else |
| | 1156 | + $s .= ' <a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg ('powersearch-legend') . "</a>\n"; |
| | 1157 | + |
| | 1158 | + $s .= '</form>'; |
| | 1159 | + |
| 1154 | 1160 | // Ensure unique id's for search boxes made after the first |
| 1155 | 1161 | $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1; |
| 1156 | 1162 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -22,6 +22,7 @@ |
| 23 | 23 | |
| 24 | 24 | * Added $wgNewPasswordExpiry, to specify an expiry time (in seconds) to |
| 25 | 25 | temporary passwords |
| | 26 | +* Added $wgUseTwoButtonsSearchForm to choose the Search form behavior/look |
| 26 | 27 | |
| 27 | 28 | === New features in 1.15 === |
| 28 | 29 | |
| — | — | @@ -48,20 +49,23 @@ |
| 49 | 50 | * (bugs 16957/16969) Add show/hide to preferences for RC patrol options on |
| 50 | 51 | specialpages |
| 51 | 52 | * (bug 11443) Auto-noindex user/user talk pages for blocked user |
| 52 | | -* (bug 11644) Add $wgMaxRedirects variable to control how many redirects are recursed |
| 53 | | - through until the "destination" page is reached. |
| 54 | | -* Add $wgInvalidRedirectTargets variable to prevent redirects to certain special pages. |
| | 53 | +* (bug 11644) Add $wgMaxRedirects variable to control how many redirects are |
| | 54 | + recursed through until the "destination" page is reached. |
| | 55 | +* Add $wgInvalidRedirectTargets variable to prevent redirects to certain |
| | 56 | + special pages. |
| 55 | 57 | * Use HTML5 rel attributes for some links, where appropriate |
| | 58 | +* Added optional alternative Search form look - Go button & Advanced search |
| | 59 | + link instead of Go button & Search button |
| 56 | 60 | |
| 57 | 61 | === Bug fixes in 1.15 === |
| 58 | 62 | * (bug 16968) Special:Upload no longer throws useless warnings. |
| 59 | | -* (bug 17000) Special:RevisionDelete now checks if the database is locked before |
| 60 | | - trying to delete the edit. |
| | 63 | +* (bug 17000) Special:RevisionDelete now checks if the database is locked |
| | 64 | + before trying to delete the edit. |
| 61 | 65 | * (bug 16852) padleft and padright now handle multibyte characters correctly |
| 62 | 66 | * (bug 17010) maintenance/namespaceDupes.php now add the suffix recursively if |
| 63 | 67 | the destination page exists |
| 64 | | -* (bug 17035) Special:Upload now fails gracefully if PHP's file_uploads has been |
| 65 | | - disabled |
| | 68 | +* (bug 17035) Special:Upload now fails gracefully if PHP's file_uploads has |
| | 69 | + been disabled |
| 66 | 70 | * Fixing the caching issue by using -{T|xxx}- syntax (only applies on wiki with |
| 67 | 71 | LanguageConverter class) |
| 68 | 72 | * Improving the efficiency by using -{A|xxx}- syntax (only applies on wiki with |
| — | — | @@ -70,8 +74,8 @@ |
| 71 | 75 | * (bug 11527) Diff on page with one revision shows "Next" link to same diff |
| 72 | 76 | * (bug 15936) New page's patrol button should always be visible |
| 73 | 77 | * (bug 8065) Fix summary forcing for new pages |
| 74 | | -* (bug 10569) redirects to Special:Mypage and Special:Mytalk are no longer allowed |
| 75 | | - by default. Change $wgInvalidRedirectTargets to re-enable. |
| | 78 | +* (bug 10569) redirects to Special:Mypage and Special:Mytalk are no longer |
| | 79 | + allowed by default. Change $wgInvalidRedirectTargets to re-enable. |
| 76 | 80 | |
| 77 | 81 | == API changes in 1.15 == |
| 78 | 82 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |