From 4d7a8b877917b5a7e3f98400135d0a1e1f480e70 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Fri, 19 Apr 2019 14:44:27 -0700 Subject: [PATCH] UsersPager: Use CSS-based parentheses Tell Linker::userToolLinks() and Linker::userToolLinksRedContribs() to omit parentheses, and load the CSS that fills them in. Change-Id: Ie979537abed226e945cf1918b3ee240ae78ee24e --- includes/specials/SpecialActiveUsers.php | 1 + includes/specials/SpecialListUsers.php | 4 +++- includes/specials/pagers/ActiveUsersPager.php | 13 ++++++++++++- includes/specials/pagers/UsersPager.php | 4 +++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/includes/specials/SpecialActiveUsers.php b/includes/specials/SpecialActiveUsers.php index f52a6f35c6..7995e3ef92 100644 --- a/includes/specials/SpecialActiveUsers.php +++ b/includes/specials/SpecialActiveUsers.php @@ -67,6 +67,7 @@ class SpecialActiveUsers extends SpecialPage { Html::rawElement( 'ul', [], $usersBody ) . $pager->getNavigationBar() ); + $out->addModuleStyles( 'mediawiki.interface.helpers.styles' ); } else { $out->addWikiMsg( 'activeusers-noresult' ); } diff --git a/includes/specials/SpecialListUsers.php b/includes/specials/SpecialListUsers.php index 7aef4aef28..f8aac327d0 100644 --- a/includes/specials/SpecialListUsers.php +++ b/includes/specials/SpecialListUsers.php @@ -59,7 +59,9 @@ class SpecialListUsers extends IncludableSpecialPage { $s .= $this->msg( 'listusers-noresult' )->parseAsBlock(); } - $this->getOutput()->addHTML( $s ); + $out = $this->getOutput(); + $out->addHTML( $s ); + $out->addModuleStyles( 'mediawiki.interface.helpers.styles' ); } /** diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index 39da07676f..368c6d1828 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -225,7 +225,18 @@ class ActiveUsersPager extends UsersPager { $userName = $row->user_name; $ulinks = Linker::userLink( $row->user_id, $userName ); - $ulinks .= Linker::userToolLinks( $row->user_id, $userName ); + $ulinks .= Linker::userToolLinks( + $row->user_id, + $userName, + // Should the contributions link be red if the user has no edits (using default) + false, + // Customisation flags (using default 0) + 0, + // User edit count (using default) + null, + // do not wrap the message in parentheses (CSS will provide these) + false + ); $lang = $this->getLanguage(); diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 8dd6e23431..4453772fb2 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -178,7 +178,9 @@ class UsersPager extends AlphabeticPager { $ulinks .= Linker::userToolLinksRedContribs( $row->user_id, $userName, - (int)$row->edits + (int)$row->edits, + // don't render parentheses in HTML markup (CSS will provide) + false ); $lang = $this->getLanguage(); -- 2.20.1