Make the subtitle of Special:Watchlist more consistent with other subtitles.

Enclose tool links by s span with a class.
Especially I see no need for the extra linebreak

diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php
index 638b47a..1f10a85 100644 (file)
--- a/includes/WatchlistEditor.php
+++ b/includes/WatchlistEditor.php
@@ -503,14 +503,13 @@ class WatchlistEditor {
                $modes = array( 'view' => false, 'edit' => 'edit', 'raw' => 'raw' );
                foreach( $modes as $mode => $subpage ) {
                        // can use messages 'watchlisttools-view', 'watchlisttools-edit', 'watchlisttools-raw'
-                       $tools[] = $skin->link(
+                       $tools[] = $skin->linkKnown(
                                SpecialPage::getTitleFor( 'Watchlist', $subpage ),
-                               wfMsgHtml( "watchlisttools-{$mode}" ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
+                               wfMsgHtml( "watchlisttools-{$mode}" )
                        );
                }
-               return $wgLang->pipeList( $tools );
+               return Html::rawElement( 'span',
+                                       array( 'class' => 'mw-watchlist-toollinks' ),
+                                       wfMsg( 'parentheses', $wgLang->pipeList( $tools ) ) );
        }
 }

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 52ac4a5..ec230a2 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -66,8 +66,7 @@ function wfSpecialWatchlist( $par ) {
 
        $wgOut->setPageTitle( wfMsg( 'watchlist' ) );
 
-       $sub  = wfMsgExt( 'watchlistfor', 'parseinline', $wgUser->getName() );
-       $sub .= '<br />' . WatchlistEditor::buildTools( $wgUser->getSkin() );
+       $sub  = wfMsgExt( 'watchlistfor2', array( 'parseinline', 'replaceafter' ), $wgUser->getName(), WatchlistEditor::buildTools( $wgUser->getSkin() ) );
        $wgOut->setSubtitle( $sub );
 
        if( ( $mode = WatchlistEditor::getMode( $wgRequest, $par ) ) !== false ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 637badd..674972a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2661,7 +2661,7 @@ The e-mail address you entered in [[Special:Preferences|your user preferences]]
 # Watchlist
 'watchlist'            => 'My watchlist',
 'mywatchlist'          => 'My watchlist',
-'watchlistfor'         => "(for '''$1''')",
+'watchlistfor2'        => 'For $1 $2',
 'nowatchlist'          => 'You have no items on your watchlist.',
 'watchlistanontext'    => 'Please $1 to view or edit items on your watchlist.',
 'watchnologin'         => 'Not logged in',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 3a2a203..c43d81e 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2280,9 +2280,10 @@ Special:EmailUser appears when you click on the link "E-mail this user" in the s
 'mywatchlist'          => 'Link at the upper right corner of the screen.
 
 {{Identical|My watchlist}}',
-'watchlistfor'         => 'Subtitle on [[Special:Watchlist]].
+'watchlistfor2'        => 'Subtitle on [[Special:Watchlist]].
 
 *$1: Username of current user
+*$2: Tool links (View relevant changes | View and edit watchlist | Edit raw watchlist)
 {{Identical|For $1}}',
 'nowatchlist'          => 'Displayed when there is no pages in the watchlist.',
 'watchlistanontext'    => '* $1 is a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 2367e37..ee8cfed 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1746,7 +1746,7 @@ $wgMessageStructure = array(
        'watchlist' => array(
                'watchlist',
                'mywatchlist',
-               'watchlistfor',
+               'watchlistfor2',
                'nowatchlist',
                'watchlistanontext',
                'watchnologin',