Index: trunk/phase3/skins/monobook/KHTMLFixes.css |
— | — | @@ -1,4 +0,0 @@ |
2 | | -/* KHTML fix stylesheet */ |
3 | | -/* work around the horizontal scrollbars */ |
4 | | -#column-content { margin-left: 0; } |
5 | | - |
Index: trunk/phase3/skins/common/wikibits.js |
— | — | @@ -14,7 +14,7 @@ |
15 | 15 | ( document.childNodes && !document.all && !navigator.taintEnabled ); |
16 | 16 | // For accesskeys; note that FF3+ is included here! |
17 | 17 | var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC ); |
18 | | -var is_ff2_ = /firefox\/2/.test( clientPC ); |
| 18 | +var ff2_bugs = /firefox\/2/.test( clientPC ); |
19 | 19 | // These aren't used here, but some custom scripts rely on them |
20 | 20 | var is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1; |
21 | 21 | var is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1; |
— | — | @@ -23,6 +23,9 @@ |
24 | 24 | var is_opera_preseven = window.opera && !document.childNodes; |
25 | 25 | var is_opera_seven = window.opera && document.childNodes; |
26 | 26 | var is_opera_95 = /opera\/(9.[5-9]|[1-9][0-9])/.test( clientPC ); |
| 27 | + var opera6_bugs = is_opera_preseven; |
| 28 | + var opera7_bugs = is_opera_seven && !is_opera_95; |
| 29 | + var opera95_bugs = /opera\/(9\.5)/.test( clientPC ); |
27 | 30 | } |
28 | 31 | |
29 | 32 | // Global external objects used by this script. |
— | — | @@ -96,19 +99,20 @@ |
97 | 100 | |
98 | 101 | // special stylesheet links |
99 | 102 | if (typeof stylepath != 'undefined' && typeof skin != 'undefined') { |
100 | | - if (is_opera_preseven) { |
| 103 | + // FIXME: This tries to load the stylesheets even for skins where they |
| 104 | + // don't exist, i.e., everything but Monobook. |
| 105 | + if (opera6_bugs) { |
101 | 106 | importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css'); |
102 | | - } else if (is_opera_seven && !is_opera_95) { |
| 107 | + } else if (opera7_bugs) { |
103 | 108 | importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css'); |
104 | | - } else if (is_opera_95) { |
| 109 | + } else if (opera95_bugs) { |
105 | 110 | importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css'); |
106 | | - } else if (is_khtml) { |
107 | | - importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css'); |
108 | | - } else if (is_ff2_) { |
| 111 | + } else if (ff2_bugs) { |
109 | 112 | importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css'); |
110 | 113 | } |
111 | 114 | } |
112 | 115 | |
| 116 | + |
113 | 117 | if (wgBreakFrames) { |
114 | 118 | // Un-trap us from framesets |
115 | 119 | if (window.top != window) { |
Index: trunk/phase3/skins/MonoBook.php |
— | — | @@ -26,7 +26,7 @@ |
27 | 27 | $this->stylename = 'monobook'; |
28 | 28 | $this->template = 'MonoBookTemplate'; |
29 | 29 | |
30 | | - } |
| 30 | + } |
31 | 31 | function setupSkinUserCss( OutputPage $out ) { |
32 | 32 | global $wgHandheldStyle; |
33 | 33 | |
— | — | @@ -44,28 +44,28 @@ |
45 | 45 | $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); |
46 | 46 | $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); |
47 | 47 | |
48 | | - $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); |
49 | | - |
50 | | - |
51 | | - //@@todo we can move this to the parent once we update all skins |
| 48 | + $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); |
| 49 | + |
| 50 | + |
| 51 | + //@@todo we can move this to the parent once we update all skins |
52 | 52 | if( $this->pagecss ) |
53 | | - $out->addInlineStyle( $this->pagecss ); |
54 | | - |
| 53 | + $out->addInlineStyle( $this->pagecss ); |
| 54 | + |
55 | 55 | if( $this->usercss ) |
56 | 56 | $out->addInlineStyle( $this->usercss ); |
57 | | - |
| 57 | + |
58 | 58 | } |
59 | | - function setupSkinUserJs( OutputPage $out ) { |
60 | | - parent::setupSkinUserJs( $out ); |
| 59 | + function setupSkinUserJs( OutputPage $out ) { |
| 60 | + parent::setupSkinUserJs( $out ); |
61 | 61 | $out->addScriptFile( 'wikibits.js' ); |
62 | | - |
63 | | - //@@todo can move to parent once we update all skins (to not include things twice |
| 62 | + |
| 63 | + //@@todo can move to parent once we update all skins (to not include things twice |
64 | 64 | if( $this->jsvarurl ) |
65 | | - $out->addScriptFile( $this->jsvarurl ); |
66 | | - |
67 | | - if( $this->userjs ) |
| 65 | + $out->addScriptFile( $this->jsvarurl ); |
| 66 | + |
| 67 | + if( $this->userjs ) |
68 | 68 | $out->addScriptFile( $this->userjs ); |
69 | | - |
| 69 | + |
70 | 70 | if( $this->userjsprev ) |
71 | 71 | $out->addInlineScript( $this->userjsprev ); |
72 | 72 | } |
— | — | @@ -92,7 +92,7 @@ |
93 | 93 | |
94 | 94 | // Suppress warnings to prevent notices about missing indexes in $this->data |
95 | 95 | wfSuppressWarnings(); |
96 | | - |
| 96 | + # FIXME: What is this? Should it apply to all skins? |
97 | 97 | $path = htmlspecialchars( $wgStylePath ); |
98 | 98 | $wgOut->addScript( <<<HTML |
99 | 99 | <!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script> |
Index: trunk/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
— | — | @@ -696,8 +696,7 @@ |
697 | 697 | if( this.disp_item == 'combined' ){ |
698 | 698 | //combined results are harder to error handle just ignore that repo |
699 | 699 | cp.sObj.loading = false; |
700 | | - }else{ |
701 | | - alert("should set tab to no-good"); |
| 700 | + }else{ |
702 | 701 | $j('#tab-' + this.disp_item).html( '<div style="padding:10px">'+ gM('no_import_by_url') +'</div>'); |
703 | 702 | } |
704 | 703 | return false; |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -52,6 +52,9 @@ |
53 | 53 | functionality is now available via $wgLocalisationCacheConf. |
54 | 54 | * $wgMessageCache->addMessages() is deprecated. Messages added via this |
55 | 55 | interface will not appear in Special:AllMessages. |
| 56 | +* $wgRegisterInternalExternals can be used to record external links pointing |
| 57 | + to same server |
| 58 | +* $wgHtml5 outputs an HTML 5 doctype instead of XHTML 1.0 Transitional. |
56 | 59 | |
57 | 60 | === New features in 1.16 === |
58 | 61 | |
— | — | @@ -113,6 +116,13 @@ |
114 | 117 | * Added a feature to allow per-article process pool size control for the parsing |
115 | 118 | task, to limit resource usage when the cache for a heavily-viewed article is |
116 | 119 | invalidated. Requires an external daemon. |
| 120 | +* Leading > is now syntax for <blockquote>. |
| 121 | +* (bug 19576) Moved id attribues from anchors accompanying section headers to |
| 122 | + the section headers themselves, removing the redundant anchor elements. |
| 123 | +* Parser::setFunctionTagHook now can be used to add a new tag which is parsed at |
| 124 | + preprocesor level. |
| 125 | +* Added $wgShowArchiveThumbnails, allowing sysadmins to disable thumbnail |
| 126 | + display for old versions of images. |
117 | 127 | |
118 | 128 | === Bug fixes in 1.16 === |
119 | 129 | |
— | — | @@ -232,6 +242,14 @@ |
233 | 243 | extension (since 0.ext is perfectly valid) |
234 | 244 | * (bug 19468) Enotif preferences are now only displayed when they are turned on |
235 | 245 | * (bug 19442) Show/hide options on watchlist only work once |
| 246 | +* (bug 19602) PubMed Magic links now use updated NIH url |
| 247 | +* (bug 19637) externallinks have links to self |
| 248 | +* Don't load Opera 9.5 RTL fixes for Opera 9.6 |
| 249 | +* Remove five-year-old KHTMLFixes.css, which is unlikely to be relevant anymore |
| 250 | + and was causing problems. |
| 251 | +* Removed repetition of URIs in the title attributes of external links. |
| 252 | +* (bug 19693) User name is now escaped in "Contributions for ..." link on |
| 253 | + Special:BlockIP |
236 | 254 | * (bug 19571) Override buildConcat for SQLite. |
237 | 255 | * Log in and log out links no longer return to page view when clicked from |
238 | 256 | history view, edit page, or something similar |
— | — | @@ -276,6 +294,8 @@ |
277 | 295 | * (bug 19423) The initial file description page used caption in user lang |
278 | 296 | rather than UI lang |
279 | 297 | * Added snippet field to list=search output |
| 298 | +* (bug 17809) Add number of users in user groups to meta=siteinfo |
| 299 | +* (bug 18533) Add readonly reason to readonly exception |
280 | 300 | * (bug 19528) Added XSLT parameter to API queries in format=xml |
281 | 301 | * (bug 19040) Fix prependtext and appendtext in combination with section |
282 | 302 | parameter in action=edit |
— | — | @@ -293,15 +313,16 @@ |
294 | 314 | |
295 | 315 | * (bug 18474) Sorani (ckb - Central Kurdish) (renamed from ku-arab) |
296 | 316 | * Add PLURAL function for Scots Gaelic (gd) |
297 | | -* Add Estonian letters äöõšüž to linktrail (et) |
| 317 | +* Add Estonian letters äöõšüž to linktrail (et) |
298 | 318 | * (bug 18776) Native name of Burmese language (my) |
299 | 319 | * (bug 18806) Use correct unicode characters in spelling of native Chuvash |
300 | | - (Чӑвашла) |
| 320 | + (Чӑвашла) |
301 | 321 | * (bug 18864) Updated autonym for Zhuang language |
302 | 322 | * (bug 18308) Updated date formatting in Occitan (oc) |
303 | | -* (bug 19080) Added ăâîşţșțĂÂÎŞŢȘȚ to Romanion (ro) linktrail |
| 323 | +* (bug 19080) Added ăâîşţșțĂÂÎŞŢȘȚ to Romanion (ro) linktrail |
304 | 324 | * (bug 19286) Correct commafying function in Polish (pl) |
305 | 325 | * (bug 19441) Updated date formatting for Lithuanian |
| 326 | +* (bug 19630) Added ÄäÇçĞğŇňÖöŞşÜüÃýŽž to Turkmen (tk) linktrail |
306 | 327 | |
307 | 328 | == Compatibility == |
308 | 329 | |