http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73316
Revision: 73316
Author: nikerabbit
Date: 2010-09-19 12:12:32 +0000 (Sun, 19 Sep 2010)
Log Message:
-----------
Remove the redundant legend line from recent changes and watchlist. The symbols
itself contain tooltips.
Modified Paths:
--------------
trunk/phase3/includes/ChangesList.php
trunk/phase3/includes/specials/SpecialRecentchanges.php
trunk/phase3/includes/specials/SpecialWatchlist.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/includes/ChangesList.php
===================================================================
--- trunk/phase3/includes/ChangesList.php 2010-09-19 12:06:45 UTC (rev
73315)
+++ trunk/phase3/includes/ChangesList.php 2010-09-19 12:12:32 UTC (rev
73316)
@@ -130,47 +130,6 @@
}
/**
- * 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 '<div class="mw-rc-label-legend">' .
- wfMsgExt( 'recentchanges-label-legend', 'parseinline',
- $wgLang->commaList( $flags ) ) . '</div>';
- }
-
- /**
* Returns text for the start of the tabular part of RC
* @return String
*/
Modified: trunk/phase3/includes/specials/SpecialRecentchanges.php
===================================================================
--- trunk/phase3/includes/specials/SpecialRecentchanges.php 2010-09-19
12:06:45 UTC (rev 73315)
+++ trunk/phase3/includes/specials/SpecialRecentchanges.php 2010-09-19
12:12:32 UTC (rev 73316)
@@ -506,8 +506,6 @@
Xml::fieldset( wfMsg( 'recentchanges-legend' ),
$panelString, array( 'class' => 'rcoptions' ) )
);
- $wgOut->addHTML( ChangesList::flagLegend() );
-
$this->setBottomText( $wgOut, $opts );
}
Modified: trunk/phase3/includes/specials/SpecialWatchlist.php
===================================================================
--- trunk/phase3/includes/specials/SpecialWatchlist.php 2010-09-19 12:06:45 UTC
(rev 73315)
+++ trunk/phase3/includes/specials/SpecialWatchlist.php 2010-09-19 12:12:32 UTC
(rev 73316)
@@ -331,8 +331,6 @@
$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' );
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2010-09-19 12:06:45 UTC
(rev 73315)
+++ trunk/phase3/languages/messages/MessagesEn.php 2010-09-19 12:12:32 UTC
(rev 73316)
@@ -2003,14 +2003,9 @@
'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).",
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2010-09-19 12:06:45 UTC
(rev 73315)
+++ trunk/phase3/maintenance/language/messages.inc 2010-09-19 12:12:32 UTC
(rev 73316)
@@ -1162,14 +1162,9 @@
'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',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
