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

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index e67bb00..932e02d 100644 (file)
--- 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 f8e67f5..440d4d0 100644 (file)
--- 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 6f4f327..709f15c 100644 (file)
--- 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 a2ffb8e..cca1c6c 100644 (file)
--- 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 3c616db..0111d38 100644 (file)
--- 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 388904a..f3b7185 100644 (file)
--- 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 52f9fa2..56acd7e 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -96,7 +96,7 @@ class ModernTemplate extends MonoBookTemplate {
                <div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
 
                <?php if ( $this->data['undelete'] ) { ?><div id="contentSub2"><?php $this->html( 'undelete' ) ?></div><?php } ?>
-               <?php if ( $this->data['showjumplinks'] ) { ?><div id="jump-to-nav"><?php $this->msg( 'jumpto' ) ?> <a href="#mw_portlets"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a></div><?php } ?>
+               <div id="jump-to-nav"><?php $this->msg( 'jumpto' ) ?> <a href="#mw_portlets"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a></div>
 
                <?php $this->html( 'bodytext' ) ?>
                <div class='mw_clear'></div>

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index e805aca..c7a3ffc 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -89,9 +89,9 @@ class MonoBookTemplate extends BaseTemplate {
                <div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
 <?php } ?><?php if ( $this->data['newtalk'] ) { ?>
                <div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
-<?php } ?><?php if ( $this->data['showjumplinks'] ) { ?>
-               <div id="jump-to-nav" class="mw-jump"><?php $this->msg( 'jumpto' ) ?> <a href="#column-one"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a></div>
 <?php } ?>
+               <div id="jump-to-nav" class="mw-jump"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div>
+
                <!-- start content -->
 <?php $this->html( 'bodytext' ) ?>
                <?php if ( $this->data['catlinks'] ) { $this->html( 'catlinks' ); } ?>

diff --git a/skins/Vector.php b/skins/Vector.php
index d0305f0..713ec8b 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -175,13 +175,11 @@ class VectorTemplate extends BaseTemplate {
                                <?php if ( $this->data['newtalk'] ) { ?>
                                <div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
                                <?php } ?>
-                               <?php if ( $this->data['showjumplinks'] ) { ?>
                                <div id="jump-to-nav" class="mw-jump">
                                        <?php $this->msg( 'jumpto' ) ?>
                                        <a href="#mw-navigation"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
                                        <a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
                                </div>
-                               <?php } ?>
                                <?php $this->html( 'bodycontent' ) ?>
                                <?php if ( $this->data['printfooter'] ) { ?>
                                <div class="printfooter">