From cc2598b654ba8743419c1ae639edf9906c5eaafc Mon Sep 17 00:00:00 2001 From: Rob Church Date: Fri, 18 May 2007 21:10:36 +0000 Subject: [PATCH] (bug 9886) Give a sample stub link in stub threshold label in preferences Not the most elegant solution, but all the alternatives suck. Toggle messages still allow HTML, as far as I can see. Running the thing through the parser is overkill and produces useless paragraph and other unwanted nonsense, too. --- RELEASE-NOTES | 1 + includes/DefaultSettings.php | 2 +- includes/SpecialPreferences.php | 4 ++-- languages/messages/MessagesEn.php | 2 +- skins/chick/main.css | 5 ++++- skins/common/cologneblue.css | 2 +- skins/common/nostalgia.css | 2 +- skins/monobook/main.css | 3 ++- skins/simple/main.css | 5 ++++- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 16f05d4361..9835770459 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -32,6 +32,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 9628) Show warnings about slave lag on Special:Contributions, Special:Watchlist * (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext" +* (bug 9886) Give a sample stub link in stub threshold label in preferences == Bugfixes since 1.10 == diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index a4ea5903fb..463e96f2d1 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1125,7 +1125,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '72'; +$wgStyleVersion = '73'; # Server-side caching: diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index e9c5418f95..b4ae86dd7c 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -949,8 +949,8 @@ class PreferencesForm { # Misc # $wgOut->addHTML('
' . wfMsg('prefs-misc') . ''); - $wgOut->addHTML( wfInputLabel( wfMsg( 'stubthreshold' ), - 'wpStubs', 'wpStubs', 6, $this->mStubs ) ); + $wgOut->addHtml( ' ' ); + $wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) ); $msgUnderline = htmlspecialchars( wfMsg ( 'tog-underline' ) ); $msgUnderlinenever = htmlspecialchars( wfMsg ( 'underline-never' ) ); $msgUnderlinealways = htmlspecialchars( wfMsg ( 'underline-always' ) ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 64818588c6..c643424c2e 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1254,7 +1254,7 @@ containing all of the search terms will appear in the result).", 'resultsperpage' => 'Hits per page:', 'contextlines' => 'Lines per hit:', 'contextchars' => 'Context per line:', -'stubthreshold' => 'Threshold for stub display:', +'stub-threshold' => 'Threshold for stub link formatting:', 'recentchangesdays' => 'Days to show in recent changes:', 'recentchangescount' => 'Number of edits to show in recent changes:', 'savedprefs' => 'Your preferences have been saved.', diff --git a/skins/chick/main.css b/skins/chick/main.css index 997dd5111f..3b78aadfd5 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -16,7 +16,10 @@ body { a { color: #002bb8; } a:visited { color: #5a3696; } a:active { color: #ffa500; } -a.stub { color: #772233; } +a.stub, +span.mw-stub-example { + color: #772233; +} a.new, #p-personal a.new { color:#ba0000; } a.new:visited, diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index 5b6e5bca1a..b367dbaa4a 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -89,7 +89,7 @@ a { color: #223366; } a.external { color: #336644; } a:visited { color: #8D0749; } a.printable { text-decoration: underline; } -a.stub, #quickbar a.stub { color:#772233; text-decoration:none; } +a.stub, span.mw-stub-example, #quickbar a.stub { color:#772233; text-decoration:none; } a.new, #quickbar a.new { color: #CC2200; } h2, h3, h4, h5, h6 { margin-bottom: 0; } small { font-size: 75%; } diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css index c9b36a70b0..9c98294d6b 100644 --- a/skins/common/nostalgia.css +++ b/skins/common/nostalgia.css @@ -8,7 +8,7 @@ body { } a.interwiki, a.external { color: #3366BB; } a.printable { text-decoration: underline; } -a.stub { color:#772233; text-decoration:none; } +a.stub, span.mw-stub-example { color:#772233; text-decoration:none; } h1.pagetitle { padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0; } h2, h3, h4, h5, h6 { margin-bottom: 0; } textarea { overflow: auto; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 4b9dd358df..1c3ef37dc0 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -92,7 +92,8 @@ a:active { a:hover { text-decoration: underline; } -a.stub { +a.stub, +span.mw-stub-example { color: #772233; } a.new, #p-personal a.new { diff --git a/skins/simple/main.css b/skins/simple/main.css index ea682ecc55..7e738e3ac7 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -347,7 +347,10 @@ div.tleft { border-width: 0.5em 1.4em 0.8em 0; } -a.stub { color: #772233; } +a.stub, +span.mw-stub-example { + color: #772233; +} a.new, #p-personal a.new { text-decoration: line-through; -- 2.20.1