From 13b1a9f83267ced23f59c853314fcc98b1ae6db6 Mon Sep 17 00:00:00 2001 From: Daniel Friesen Date: Sat, 29 Sep 2012 11:26:44 -0700 Subject: [PATCH] Remove the showjumplinks user preference This preference does not appear to have a valid purpose. Jump links are part of accessibility, sites must never force users to turn this on. For logged in users there is no value in removing the links. They take up practically no space in the markup, and that would be a dubious reason. And these links are not even visible so users should have no reason to be bothered by them. Change-Id: Ib506ffad41ac7f65629368bc41774fb689b882db --- RELEASE-NOTES-1.22 | 2 ++ includes/DefaultSettings.php | 1 - includes/Preferences.php | 5 ----- includes/SkinTemplate.php | 2 +- languages/messages/MessagesEn.php | 1 - maintenance/language/messages.inc | 1 - skins/Modern.php | 2 +- skins/MonoBook.php | 4 ++-- skins/Vector.php | 2 -- 9 files changed, 6 insertions(+), 14 deletions(-) diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index e67bb00ea3..932e02d1ca 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -365,6 +365,8 @@ changes to languages because of Bugzilla reports. jobs to the job table to update pages which use the edited page as a template. * The LivePreviewPrepare and LivePreviewDone events triggered on "jQuery( mw )" have been deprecated in favour of using mw.hook. +* The 'showjumplinks' user preference has been removed, jump links are now + always included. == Compatibility == diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f8e67f5c10..440d4d0d95 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3676,7 +3676,6 @@ $wgDefaultUserOptions = array( 'rows' => 25, 'searchlimit' => 20, 'showhiddencats' => 0, - 'showjumplinks' => 1, 'shownumberswatching' => 1, 'showtoc' => 1, 'showtoolbar' => 1, diff --git a/includes/Preferences.php b/includes/Preferences.php index 6f4f327a3c..709f15cba3 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -721,11 +721,6 @@ class Preferences { 'section' => 'rendering/advancedrendering', 'label-message' => 'tog-showhiddencats' ); - $defaultPreferences['showjumplinks'] = array( - 'type' => 'toggle', - 'section' => 'rendering/advancedrendering', - 'label-message' => 'tog-showjumplinks', - ); if ( $wgAllowUserCssPrefs ) { $defaultPreferences['justify'] = array( diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index a2ffb8e6c4..cca1c6ca91 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -339,7 +339,7 @@ class SkinTemplate extends Skin { $tpl->set( 'rtl', $userLang->isRTL() ); $tpl->set( 'capitalizeallnouns', $userLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' ); - $tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) ); + $tpl->set( 'showjumplinks', true ); // showjumplinks preference has been removed $tpl->set( 'username', $this->loggedin ? $this->username : null ); $tpl->setRef( 'userpage', $this->userpage ); $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 3c616db0d4..0111d38d01 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -675,7 +675,6 @@ future releases. Also note that since each list value is wrapped in a unique 'tog-shownumberswatching' => 'Show the number of watching users', 'tog-oldsig' => 'Existing signature:', 'tog-fancysig' => 'Treat signature as wikitext (without an automatic link)', -'tog-showjumplinks' => 'Enable "jump to" accessibility links', 'tog-uselivepreview' => 'Use live preview (requires JavaScript) (experimental)', 'tog-forceeditsummary' => 'Prompt me when entering a blank edit summary', 'tog-watchlisthideown' => 'Hide my edits from the watchlist', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 388904a8ad..f3b7185819 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -56,7 +56,6 @@ $wgMessageStructure = array( 'tog-shownumberswatching', 'tog-oldsig', 'tog-fancysig', - 'tog-showjumplinks', 'tog-uselivepreview', 'tog-forceeditsummary', 'tog-watchlisthideown', diff --git a/skins/Modern.php b/skins/Modern.php index 52f9fa22b5..56acd7ed88 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -96,7 +96,7 @@ class ModernTemplate extends MonoBookTemplate {
html( 'userlangattributes' ) ?>>html( 'subtitle' ) ?>
data['undelete'] ) { ?>
html( 'undelete' ) ?>
- data['showjumplinks'] ) { ?>
msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>msg( 'jumptosearch' ) ?>
+
msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>msg( 'jumptosearch' ) ?>
html( 'bodytext' ) ?>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php index e805acadbd..c7a3ffcb48 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -89,9 +89,9 @@ class MonoBookTemplate extends BaseTemplate {
html( 'undelete' ) ?>
data['newtalk'] ) { ?>
html( 'newtalk' ) ?>
-data['showjumplinks'] ) { ?> -
msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>msg( 'jumptosearch' ) ?>
+
msg('jumpto') ?> msg('jumptonavigation') ?>msg( 'comma-separator' ) ?>msg('jumptosearch') ?>
+ html( 'bodytext' ) ?> data['catlinks'] ) { $this->html( 'catlinks' ); } ?> diff --git a/skins/Vector.php b/skins/Vector.php index d0305f0093..713ec8b3db 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -175,13 +175,11 @@ class VectorTemplate extends BaseTemplate { data['newtalk'] ) { ?>
html( 'newtalk' ) ?>
- data['showjumplinks'] ) { ?>
msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?> msg( 'jumptosearch' ) ?>
- html( 'bodycontent' ) ?> data['printfooter'] ) { ?>
-- 2.20.1