From 5dc0aa752d15c7e39f69f730edc3a0504a5ca5bf Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Wed, 15 Jul 2009 01:02:13 +0000 Subject: [PATCH] some merge fixes per comments on r53282 --- RELEASE-NOTES | 27 +++++++++++++-- js2/mwEmbed/libAddMedia/remoteSearchDriver.js | 3 +- skins/MonoBook.php | 34 +++++++++---------- skins/common/wikibits.js | 18 ++++++---- skins/monobook/KHTMLFixes.css | 4 --- 5 files changed, 53 insertions(+), 33 deletions(-) delete mode 100644 skins/monobook/KHTMLFixes.css diff --git a/RELEASE-NOTES b/RELEASE-NOTES index bcc2c4701e..5df82dee98 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -52,6 +52,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN functionality is now available via $wgLocalisationCacheConf. * $wgMessageCache->addMessages() is deprecated. Messages added via this interface will not appear in Special:AllMessages. +* $wgRegisterInternalExternals can be used to record external links pointing + to same server +* $wgHtml5 outputs an HTML 5 doctype instead of XHTML 1.0 Transitional. === New features in 1.16 === @@ -113,6 +116,13 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Added a feature to allow per-article process pool size control for the parsing task, to limit resource usage when the cache for a heavily-viewed article is invalidated. Requires an external daemon. +* Leading > is now syntax for
. +* (bug 19576) Moved id attribues from anchors accompanying section headers to + the section headers themselves, removing the redundant anchor elements. +* Parser::setFunctionTagHook now can be used to add a new tag which is parsed at + preprocesor level. +* Added $wgShowArchiveThumbnails, allowing sysadmins to disable thumbnail + display for old versions of images. === Bug fixes in 1.16 === @@ -232,6 +242,14 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN extension (since 0.ext is perfectly valid) * (bug 19468) Enotif preferences are now only displayed when they are turned on * (bug 19442) Show/hide options on watchlist only work once +* (bug 19602) PubMed Magic links now use updated NIH url +* (bug 19637) externallinks have links to self +* Don't load Opera 9.5 RTL fixes for Opera 9.6 +* Remove five-year-old KHTMLFixes.css, which is unlikely to be relevant anymore + and was causing problems. +* Removed repetition of URIs in the title attributes of external links. +* (bug 19693) User name is now escaped in "Contributions for ..." link on + Special:BlockIP * (bug 19571) Override buildConcat for SQLite. * Log in and log out links no longer return to page view when clicked from history view, edit page, or something similar @@ -276,6 +294,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 19423) The initial file description page used caption in user lang rather than UI lang * Added snippet field to list=search output +* (bug 17809) Add number of users in user groups to meta=siteinfo +* (bug 18533) Add readonly reason to readonly exception * (bug 19528) Added XSLT parameter to API queries in format=xml * (bug 19040) Fix prependtext and appendtext in combination with section parameter in action=edit @@ -293,15 +313,16 @@ changes to languages because of MediaZilla reports. * (bug 18474) Sorani (ckb - Central Kurdish) (renamed from ku-arab) * Add PLURAL function for Scots Gaelic (gd) -* Add Estonian letters äöõšüž to linktrail (et) +* Add Estonian letters äöõšüž to linktrail (et) * (bug 18776) Native name of Burmese language (my) * (bug 18806) Use correct unicode characters in spelling of native Chuvash - (Чӑвашла) + (Чӑвашла) * (bug 18864) Updated autonym for Zhuang language * (bug 18308) Updated date formatting in Occitan (oc) -* (bug 19080) Added ăâîşţșțĂÂÎŞŢȘȚ to Romanion (ro) linktrail +* (bug 19080) Added ăâîşţșțĂÂÎŞŢȘȚ to Romanion (ro) linktrail * (bug 19286) Correct commafying function in Polish (pl) * (bug 19441) Updated date formatting for Lithuanian +* (bug 19630) Added ÄäÇçĞğŇňÖöŞşÜüÝýŽž to Turkmen (tk) linktrail == Compatibility == diff --git a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js index 323803614d..7bc3ed5687 100644 --- a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js +++ b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js @@ -696,8 +696,7 @@ remoteSearchDriver.prototype = { if( this.disp_item == 'combined' ){ //combined results are harder to error handle just ignore that repo cp.sObj.loading = false; - }else{ - alert("should set tab to no-good"); + }else{ $j('#tab-' + this.disp_item).html( '
'+ gM('no_import_by_url') +'
'); } return false; diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 0bca15ce95..c1828692a7 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -26,7 +26,7 @@ class SkinMonoBook extends SkinTemplate { $this->stylename = 'monobook'; $this->template = 'MonoBookTemplate'; - } + } function setupSkinUserCss( OutputPage $out ) { global $wgHandheldStyle; @@ -44,28 +44,28 @@ class SkinMonoBook extends SkinTemplate { $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); - $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); - - - //@@todo we can move this to the parent once we update all skins + $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); + + + //@@todo we can move this to the parent once we update all skins if( $this->pagecss ) - $out->addInlineStyle( $this->pagecss ); - + $out->addInlineStyle( $this->pagecss ); + if( $this->usercss ) $out->addInlineStyle( $this->usercss ); - + } - function setupSkinUserJs( OutputPage $out ) { - parent::setupSkinUserJs( $out ); + function setupSkinUserJs( OutputPage $out ) { + parent::setupSkinUserJs( $out ); $out->addScriptFile( 'wikibits.js' ); - - //@@todo can move to parent once we update all skins (to not include things twice + + //@@todo can move to parent once we update all skins (to not include things twice if( $this->jsvarurl ) - $out->addScriptFile( $this->jsvarurl ); - - if( $this->userjs ) + $out->addScriptFile( $this->jsvarurl ); + + if( $this->userjs ) $out->addScriptFile( $this->userjs ); - + if( $this->userjsprev ) $out->addInlineScript( $this->userjsprev ); } @@ -92,7 +92,7 @@ class MonoBookTemplate extends QuickTemplate { // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); - + # FIXME: What is this? Should it apply to all skins? $path = htmlspecialchars( $wgStylePath ); $wgOut->addScript( << diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index b23ffd1069..595d66df70 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -14,7 +14,7 @@ var is_khtml = navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ); // For accesskeys; note that FF3+ is included here! var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC ); -var is_ff2_ = /firefox\/2/.test( clientPC ); +var ff2_bugs = /firefox\/2/.test( clientPC ); // These aren't used here, but some custom scripts rely on them var is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1; var is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1; @@ -23,6 +23,9 @@ if (clientPC.indexOf('opera') != -1) { var is_opera_preseven = window.opera && !document.childNodes; var is_opera_seven = window.opera && document.childNodes; var is_opera_95 = /opera\/(9.[5-9]|[1-9][0-9])/.test( clientPC ); + var opera6_bugs = is_opera_preseven; + var opera7_bugs = is_opera_seven && !is_opera_95; + var opera95_bugs = /opera\/(9\.5)/.test( clientPC ); } // Global external objects used by this script. @@ -96,19 +99,20 @@ function appendCSS(text) { // special stylesheet links if (typeof stylepath != 'undefined' && typeof skin != 'undefined') { - if (is_opera_preseven) { + // FIXME: This tries to load the stylesheets even for skins where they + // don't exist, i.e., everything but Monobook. + if (opera6_bugs) { importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css'); - } else if (is_opera_seven && !is_opera_95) { + } else if (opera7_bugs) { importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css'); - } else if (is_opera_95) { + } else if (opera95_bugs) { importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css'); - } else if (is_khtml) { - importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css'); - } else if (is_ff2_) { + } else if (ff2_bugs) { importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css'); } } + if (wgBreakFrames) { // Un-trap us from framesets if (window.top != window) { diff --git a/skins/monobook/KHTMLFixes.css b/skins/monobook/KHTMLFixes.css deleted file mode 100644 index afa3568b39..0000000000 --- a/skins/monobook/KHTMLFixes.css +++ /dev/null @@ -1,4 +0,0 @@ -/* KHTML fix stylesheet */ -/* work around the horizontal scrollbars */ -#column-content { margin-left: 0; } - -- 2.20.1