From 17e2351dcdfb90303e56a8a75f5177e28c6684fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sun, 19 Sep 2010 12:12:32 +0000 Subject: [PATCH] Remove the redundant legend line from recent changes and watchlist. The symbols itself contain tooltips. --- includes/ChangesList.php | 41 ---------------------- includes/specials/SpecialRecentchanges.php | 2 -- includes/specials/SpecialWatchlist.php | 2 -- languages/messages/MessagesEn.php | 5 --- maintenance/language/messages.inc | 5 --- 5 files changed, 55 deletions(-) diff --git a/includes/ChangesList.php b/includes/ChangesList.php index fd8adfedcb..0a824d16a0 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -129,47 +129,6 @@ class ChangesList { . ''; } - /** - * Some explanatory wrapper text for the given flag, to be used in a legend - * explaining what the flags mean. For instance, "N - new page". See - * also flag(). - * - * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot' - * @return String: Raw HTML - */ - private static function flagLine( $key ) { - return wfMsgExt( "recentchanges-legend-$key", array( 'escapenoentities', - 'replaceafter' ), self::flag( $key ) ); - } - - /** - * A handy legend to tell users what the little "m", "b", and so on mean. - * - * @return String: Raw HTML - */ - public static function flagLegend() { - global $wgGroupPermissions, $wgLang; - - $flags = array( self::flagLine( 'newpage' ), - self::flagLine( 'minor' ) ); - - # Don't show info on bot edits unless there's a bot group of some kind - foreach ( $wgGroupPermissions as $rights ) { - if ( isset( $rights['bot'] ) && $rights['bot'] ) { - $flags[] = self::flagLine( 'bot' ); - break; - } - } - - if ( self::usePatrol() ) { - $flags[] = self::flagLine( 'unpatrolled' ); - } - - return '
' . - wfMsgExt( 'recentchanges-label-legend', 'parseinline', - $wgLang->commaList( $flags ) ) . '
'; - } - /** * Returns text for the start of the tabular part of RC * @return String diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 0a9ad82a86..638355f9c3 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -506,8 +506,6 @@ class SpecialRecentChanges extends IncludableSpecialPage { Xml::fieldset( wfMsg( 'recentchanges-legend' ), $panelString, array( 'class' => 'rcoptions' ) ) ); - $wgOut->addHTML( ChangesList::flagLegend() ); - $this->setBottomText( $wgOut, $opts ); } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index d0eda2593c..5dc17ee303 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -331,8 +331,6 @@ function wfSpecialWatchlist( $par ) { $form .= Xml::closeElement( 'fieldset' ); $wgOut->addHTML( $form ); - $wgOut->addHTML( ChangesList::flagLegend() ); - # If there's nothing to show, stop here if( $numRows == 0 ) { $wgOut->addWikiMsg( 'watchnochange' ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d2dd78a0a7..02ea64e4db 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2003,14 +2003,9 @@ You can also choose to let others contact you through your user or talk page wit 'recentchanges-legend' => 'Recent changes options', 'recentchangestext' => 'Track the most recent changes to the wiki on this page.', 'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', -'recentchanges-label-legend' => 'Legend: $1.', -'recentchanges-legend-newpage' => '$1 - new page', 'recentchanges-label-newpage' => 'This edit created a new page', -'recentchanges-legend-minor' => '$1 - minor edit', 'recentchanges-label-minor' => 'This is a minor edit', -'recentchanges-legend-bot' => '$1 - bot edit', 'recentchanges-label-bot' => 'This edit was performed by a bot', -'recentchanges-legend-unpatrolled' => '$1 - unpatrolled edit', 'recentchanges-label-unpatrolled' => 'This edit has not yet been patrolled', 'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $5, $4.", 'rcnotefrom' => "Below are the changes since '''$2''' (up to '''$1''' shown).", diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 7f406afc4b..63ef92c696 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1162,14 +1162,9 @@ $wgMessageStructure = array( 'recentchanges-legend', 'recentchangestext', 'recentchanges-feed-description', - 'recentchanges-label-legend', - 'recentchanges-legend-newpage', 'recentchanges-label-newpage', - 'recentchanges-legend-minor', 'recentchanges-label-minor', - 'recentchanges-legend-bot', 'recentchanges-label-bot', - 'recentchanges-legend-unpatrolled', 'recentchanges-label-unpatrolled', 'rcnote', 'rcnotefrom', -- 2.20.1