| Index: branches/wmf/1.18wmf1/skins/CologneBlue.php |
| — | — | @@ -29,23 +29,23 @@ |
| 30 | 30 | if ( 2 == $qb ) { # Right |
| 31 | 31 | $rules[] = "/* @noflip */#quickbar { position: absolute; right: 4px; }"; |
| 32 | 32 | $rules[] = "/* @noflip */#article { margin-left: 4px; margin-right: 148px; }"; |
| 33 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }"; |
| | 33 | + $rules[] = "/* @noflip */#footer { margin-right: 152px; }"; |
| 34 | 34 | } elseif ( 1 == $qb ) { |
| 35 | 35 | $rules[] = "/* @noflip */#quickbar { position: absolute; left: 4px; }"; |
| 36 | 36 | $rules[] = "/* @noflip */#article { margin-left: 148px; margin-right: 4px; }"; |
| 37 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 37 | + $rules[] = "/* @noflip */#footer { margin-left: 152px; }"; |
| 38 | 38 | } elseif ( 3 == $qb ) { # Floating left |
| 39 | 39 | $rules[] = "/* @noflip */#quickbar { position:absolute; left:4px }"; |
| 40 | 40 | $rules[] = "/* @noflip */#topbar { margin-left: 148px }"; |
| 41 | 41 | $rules[] = "/* @noflip */#article { margin-left:148px; margin-right: 4px; }"; |
| 42 | 42 | $rules[] = "/* @noflip */body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto; bottom:4px;}"; # Hides from IE |
| 43 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 43 | + $rules[] = "/* @noflip */#footer { margin-left: 152px; }"; |
| 44 | 44 | } elseif ( 4 == $qb ) { # Floating right |
| 45 | 45 | $rules[] = "/* @noflip */#quickbar { position: fixed; right: 4px; }"; |
| 46 | 46 | $rules[] = "/* @noflip */#topbar { margin-right: 148px }"; |
| 47 | 47 | $rules[] = "/* @noflip */#article { margin-right: 148px; margin-left: 4px; }"; |
| 48 | 48 | $rules[] = "/* @noflip */body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE |
| 49 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 49 | + $rules[] = "/* @noflip */#footer { margin-right: 152px; }"; |
| 50 | 50 | } |
| 51 | 51 | $style = implode( "\n", $rules ); |
| 52 | 52 | $out->addInlineStyle( $style, 'flip' ); |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | |
| 69 | 69 | $s .= '</td><td class="top" id="top-syslinks" width="100%">'; |
| 70 | 70 | $s .= $this->sysLinks(); |
| 71 | | - $s .= '</td></tr><tr><td class="top-linkcollection">'; |
| | 71 | + $s .= '</td></tr><tr><td class="top-subheader">'; |
| 72 | 72 | |
| 73 | 73 | $s .= '<font size="-1"><span id="sitesub">'; |
| 74 | 74 | $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . '</span></font>'; |
| Index: branches/wmf/1.18wmf1/skins/common/mwsuggest.js |
| — | — | @@ -50,18 +50,15 @@ |
| 51 | 51 | window.os_enabled = true; |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | | - * <datalist> is a new HTML5 element that allows you to manually supply |
| 55 | | - * suggestion lists and have them rendered according to the right platform |
| 56 | | - * conventions. Opera as of version 11 has a fatal problem: the suggestion |
| 57 | | - * lags behind what the user types by one keypress. (Reported as DSK-276870 to |
| 58 | | - * Opera's secret bug tracker.) However, Firefox 4 supports it without |
| 59 | | - * problems, so Opera is just blacklisted here. Ideally we wouldn't blacklist |
| 60 | | - * future versions, in case they fix it, but the fallback isn't bad at all and |
| 61 | | - * the failure if they don't fix it is very annoying, so in this case we'll |
| 62 | | - * blacklist future versions too. |
| | 54 | + * <datalist> is a new HTML5 element that allows you to manually |
| | 55 | + * supply suggestion lists and have them rendered according to the |
| | 56 | + * right platform conventions. Opera as of version 11 has a fatal |
| | 57 | + * problem: the suggestion lags behind what the user types by one |
| | 58 | + * keypress. (Reported as DSK-276870 to Opera's secret bug tracker.) |
| | 59 | + * There are also problems with other browsers, including Firefox and |
| | 60 | + * Safari: See bug 31602 for details. |
| 63 | 61 | */ |
| 64 | | -window.os_use_datalist = 'list' in document.createElement( 'input' ) |
| 65 | | - && $.client.profile().name != 'opera'; |
| | 62 | +window.os_use_datalist = false; |
| 66 | 63 | |
| 67 | 64 | /** Timeout timer class that will fetch the results */ |
| 68 | 65 | window.os_Timer = function( id, r, query ) { |
| Property changes on: branches/wmf/1.18wmf1/skins/common/mwsuggest.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 69 | 66 | Merged /trunk/phase3/skins/common/mwsuggest.js:r100348,101656,103450,103672,103677,103679,103694 |
| Index: branches/wmf/1.18wmf1/skins/simple/main.css |
| — | — | @@ -311,6 +311,13 @@ |
| 312 | 312 | li.new { |
| 313 | 313 | text-decoration: line-through; |
| 314 | 314 | } |
| | 315 | +/** |
| | 316 | ++ * Overrides text justification (user preference) |
| | 317 | ++ * See bug 31990 |
| | 318 | ++ */ |
| | 319 | +#catlinks { |
| | 320 | + text-align: center; |
| | 321 | +} |
| 315 | 322 | .catlinks { |
| 316 | 323 | text-align: center; |
| 317 | 324 | width: 80%; |
| Index: branches/wmf/1.18wmf1/skins/cologneblue/screen.css |
| — | — | @@ -103,7 +103,16 @@ |
| 104 | 104 | td.top-linkcollection { |
| 105 | 105 | text-align: right; |
| 106 | 106 | } |
| 107 | | - |
| | 107 | +/** |
| | 108 | + * Overrides text justification (user preference) |
| | 109 | + * See bug 31990 |
| | 110 | + */ |
| | 111 | +td.top-linkcollection #catlinks { |
| | 112 | + text-align: right; |
| | 113 | +} |
| | 114 | +td.top-subheader { |
| | 115 | + vertical-align: top; |
| | 116 | +} |
| 108 | 117 | td.bottom { |
| 109 | 118 | font-family: Verdana, Arial, sans-serif; |
| 110 | 119 | font-size: 10pt; |
| Index: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| — | — | @@ -89,8 +89,6 @@ |
| 90 | 90 | * BREAKING CHANGE: action=watch / action=unwatch now requires a token. |
| 91 | 91 | * (bug 8130) Query pages should limit to content namespaces, not just main |
| 92 | 92 | namespace. |
| 93 | | -* Search suggestions (other than in the Vector skin) will now use the HTML5 |
| 94 | | - datalist feature where supported, currently only Firefox 4. |
| 95 | 93 | * Special:Contribs now redirects to Special:Contributions. |
| 96 | 94 | * (bug 6672) Images are now autorotated according to their EXIF orientation. |
| 97 | 95 | This only affects thumbnails; the source remains unrotated. |
| Property changes on: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 98 | 96 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r100348,101656,103450,103672,103677,103679,103694 |
| Index: branches/wmf/1.18wmf1/includes/Wiki.php |
| — | — | @@ -78,7 +78,12 @@ |
| 79 | 79 | $ret = Title::newMainPage(); |
| 80 | 80 | } else { |
| 81 | 81 | $ret = Title::newFromURL( $title ); |
| 82 | | - // check variant links so that interwiki links don't have to worry |
| | 82 | + // Alias NS_MEDIA page URLs to NS_FILE...we only use NS_MEDIA |
| | 83 | + // in wikitext links to tell Parser to make a direct file link |
| | 84 | + if ( !is_null( $ret ) && $ret->getNamespace() == NS_MEDIA ) { |
| | 85 | + $ret = Title::makeTitle( NS_FILE, $ret->getDBkey() ); |
| | 86 | + } |
| | 87 | + // Check variant links so that interwiki links don't have to worry |
| 83 | 88 | // about the possible different language variants |
| 84 | 89 | if ( count( $wgContLang->getVariants() ) > 1 |
| 85 | 90 | && !is_null( $ret ) && $ret->getArticleID() == 0 ) |
| Index: branches/wmf/1.18wmf1/includes/SkinTemplate.php |
| — | — | @@ -853,7 +853,7 @@ |
| 854 | 854 | wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$preventActiveTabs ) ); |
| 855 | 855 | |
| 856 | 856 | // Checks if page is some kind of content |
| 857 | | - if( $title->getNamespace() != NS_SPECIAL ) { |
| | 857 | + if( $title->canExist() ) { |
| 858 | 858 | // Gets page objects for the related namespaces |
| 859 | 859 | $subjectPage = $title->getSubjectPage(); |
| 860 | 860 | $talkPage = $title->getTalkPage(); |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialSearch.php |
| — | — | @@ -1020,7 +1020,8 @@ |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| 1023 | 1023 | protected function shortDialog( $term ) { |
| 1024 | | - $out = Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n"; |
| | 1024 | + $out = Html::hidden( 'title', $this->getTitle()->getPrefixedText() ); |
| | 1025 | + $out .= Html::hidden( 'profile', $this->profile ) . "\n"; |
| 1025 | 1026 | // Term box |
| 1026 | 1027 | $out .= Html::input( 'search', $term, 'search', array( |
| 1027 | 1028 | 'id' => $this->profile === 'advanced' ? 'powerSearchText' : 'searchText', |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialLinkSearch.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | $target = $request->getVal( 'target', $par ); |
| 57 | 57 | $namespace = $request->getIntorNull( 'namespace', null ); |
| 58 | 58 | |
| 59 | | - $protocols_list[] = ''; |
| | 59 | + $protocols_list = array(); |
| 60 | 60 | foreach( $wgUrlProtocols as $prot ) { |
| 61 | 61 | $protocols_list[] = $prot; |
| 62 | 62 | } |
| Property changes on: branches/wmf/1.18wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 63 | 63 | Merged /trunk/phase3/includes/specials:r103694 |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 64 | 64 | Merged /trunk/phase3/includes:r101656,103450,103672,103677,103679,103694 |
| Index: branches/wmf/1.18wmf1/resources/Resources.php |
| — | — | @@ -720,7 +720,7 @@ |
| 721 | 721 | 'scripts' => 'common/mwsuggest.js', |
| 722 | 722 | 'remoteBasePath' => $GLOBALS['wgStylePath'], |
| 723 | 723 | 'localBasePath' => $GLOBALS['wgStyleDirectory'], |
| 724 | | - 'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ), |
| | 724 | + 'dependencies' => 'mediawiki.legacy.wikibits', |
| 725 | 725 | 'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ), |
| 726 | 726 | ), |
| 727 | 727 | 'mediawiki.legacy.preview' => array( |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 728 | 728 | Merged /trunk/phase3:r100348,101656,103450,103672,103677,103679,103694 |