From 9a95e140fe0bc7ee7d77655074222047300d61a8 Mon Sep 17 00:00:00 2001 From: River Tarnell Date: Tue, 5 Jul 2005 19:33:44 +0000 Subject: [PATCH] convert "underline links" option into three options: always, never, default. change default preference to 'default' (2). --- includes/Skin.php | 6 ++++-- includes/SpecialPreferences.php | 22 ++++++++++++++++++++++ languages/Language.php | 9 ++++++--- languages/LanguageLi.php | 1 - languages/LanguageNv.php | 1 - 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index b6405a3dbb..5ef9dce42c 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -264,8 +264,10 @@ class Skin extends Linker { function reallyDoGetUserStyles() { global $wgUser; $s = ''; - $underline = $wgUser->getOption( "underline" ) ? 'underline' : 'none'; - $s .= "a { text-decoration: $underline; }\n"; + if (($undopt = $wgUser->getOption("underline")) != 2) { + $underline = $undopt ? 'underline' : 'none'; + $s .= "a { text-decoration: $underline; }\n"; + } if( $wgUser->getOption( 'highlightbroken' ) ) { $s .= "a.new, #quickbar a.new { color: #CC2200; }\n"; } else { diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index 90b2125975..7a66757f2a 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -30,6 +30,7 @@ class PreferencesForm { var $mUserLanguage, $mUserVariant; var $mSearch, $mRecent, $mHourDiff, $mSearchLines, $mSearchChars, $mAction; var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize; + var $mUnderline; /** * Constructor @@ -61,9 +62,11 @@ class PreferencesForm { $this->mSearchChars = $request->getVal( 'wpSearchChars' ); $this->mImageSize = $request->getVal( 'wpImageSize' ); $this->mThumbSize = $request->getInt( 'wpThumbSize' ); + $this->mUnderline = $request->getInt( 'wpOpunderline' ); $this->mAction = $request->getVal( 'action' ); $this->mReset = $request->getCheck( 'wpReset' ); $this->mPosted = $request->wasPosted(); + $this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) && $this->mPosted && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) ); @@ -225,6 +228,7 @@ class PreferencesForm { $wgUser->setOption( 'timecorrection', $this->validateTimeZone( $this->mHourDiff, -12, 14 ) ); $wgUser->setOption( 'imagesize', $this->mImageSize ); $wgUser->setOption( 'thumbsize', $this->mThumbSize ); + $wgUser->setOption( 'underline', $this->validateInt($this->mUnderline, 0, 2) ); # Set search namespace options foreach( $this->mSearchNs as $i => $value ) { @@ -315,6 +319,7 @@ class PreferencesForm { $this->mImageSize = $wgUser->getOption( 'imagesize' ); $this->mThumbSize = $wgUser->getOption( 'thumbsize' ); $this->mRecent = $wgUser->getOption( 'rclimit' ); + $this->mUnderline = $wgUser->getOption( 'underline' ); $togs = $wgLang->getUserToggles(); foreach ( $togs as $tname ) { @@ -736,6 +741,23 @@ class PreferencesForm { # $wgOut->addHTML('
' . wfMsg('prefs-misc') . ''); + $msgUnderline = htmlspecialchars(wfMsg("tog-underline")); + $msgUnderlinenever = htmlspecialchars(wfMsg("underline-never")); + $msgUnderlinealways = htmlspecialchars(wfMsg("underline-always")); + $msgUnderlinedefault = htmlspecialchars(wfMsg("underline-default")); + $uopt = $wgUser->getOption("underline"); + $s0 = $uopt == 0 ? " selected=\"selected\"" : ""; + $s1 = $uopt == 1 ? " selected=\"selected\"" : ""; + $s2 = $uopt == 2 ? " selected=\"selected\"" : ""; + $wgOut->addHTML(" +
$msgUnderline + +
+"); foreach ( $togs as $tname ) { if( !array_key_exists( $tname, $this->mUsedToggles ) ) { $wgOut->addHTML( $this->getToggle( $tname ) ); diff --git a/languages/Language.php b/languages/Language.php index 61aea4d9d9..15d1c38d2b 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -57,7 +57,7 @@ if(isset($wgExtraNamespaces)) { /* private */ $wgDefaultUserOptionsEn = array( 'quickbar' => 1, - 'underline' => 1, + 'underline' => 2, 'cols' => 80, 'rows' => 25, 'searchlimit' => 20, @@ -123,7 +123,6 @@ if(isset($wgExtraNamespaces)) { ); /* private */ $wgUserTogglesEn = array( - 'underline', 'highlightbroken', 'justify', 'hideminor', @@ -278,7 +277,7 @@ parent class in order maintain consistency across languages. ', # User preference toggles -'tog-underline' => 'Underline links', +'tog-underline' => 'Underline links:', 'tog-highlightbroken' => 'Format broken links like this (alternative: like this?).', 'tog-justify' => 'Justify paragraphs', 'tog-hideminor' => 'Hide minor edits in recent changes', @@ -305,6 +304,10 @@ parent class in order maintain consistency across languages. 'tog-externaleditor' => 'Use external editor by default', 'tog-externaldiff' => 'Use external diff by default', +'underline-always' => 'Always', +'underline-never' => 'Never', +'underline-default' => 'Browser default', + # dates 'sunday' => 'Sunday', 'monday' => 'Monday', diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php index a1c5c09f9c..a808d705ff 100644 --- a/languages/LanguageLi.php +++ b/languages/LanguageLi.php @@ -46,7 +46,6 @@ $wgNamespaceNamesLi = array( ); /* private */ $wgUserTogglesLi = array( - "underline" => "Links ongerstjreipe", "highlightbroken" => "Links noa lege pagina's loate oplichte", "justify" => "Paragrafen oetvullen", "hideminor" => "Kleine wiezigingen verbergen in recente wijzigingen", diff --git a/languages/LanguageNv.php b/languages/LanguageNv.php index 68356b581d..565d684442 100755 --- a/languages/LanguageNv.php +++ b/languages/LanguageNv.php @@ -61,7 +61,6 @@ if($wgMetaNamespace === FALSE) ); /* private */ $wgUserTogglesNv = array( - 'underline' => 'Biyaadi iissoh', 'highlightbroken' => 'Format broken links like this (alternative: like this?).', 'justify' => 'Justify paragraphs', -- 2.20.1