Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164413
Change subject: Hygiene: Use SkinMinerva::iconClass helper in Special classes
......................................................................
Hygiene: Use SkinMinerva::iconClass helper in Special classes
Change-Id: Iff5d72a86500b3c8f86716c512da6ae8de0b72da
---
M includes/specials/MobileSpecialPageFeed.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileDiff.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialUserProfile.php
5 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/13/164413/1
diff --git a/includes/specials/MobileSpecialPageFeed.php
b/includes/specials/MobileSpecialPageFeed.php
index 2664d37..44adb0a 100644
--- a/includes/specials/MobileSpecialPageFeed.php
+++ b/includes/specials/MobileSpecialPageFeed.php
@@ -86,9 +86,9 @@
$lang = $this->getLanguage();
if ( $isAnon ) {
- $usernameClass = 'mw-mf-user mw-mf-anon icon icon-text
icon-16px';
+ $usernameClass = SkinMinerva::iconClass( 'anonymous',
'before', 'icon-16px mw-mf-user mw-mf-anon' );
} else {
- $usernameClass = 'mw-mf-user icon icon-16px icon-text';
+ $usernameClass = SkinMinerva::iconClass( 'user',
'before', 'icon-16px mw-mf-user' );
}
$html = Html::openElement( 'li', array( 'class' =>
'page-summary' ) );
@@ -122,9 +122,9 @@
$formattedBytes = $lang->formatNum( $bytes );
if ( $bytes > 0 ) {
$formattedBytes = '+' . $formattedBytes;
- $bytesClass = 'mw-mf-bytesadded icon icon-text
icon-12px';
+ $bytesClass = SkinMinerva::iconClass(
'bytesadded', 'before', 'icon-12px mw-mf-bytesadded' );
} else {
- $bytesClass = 'mw-mf-bytesremoved icon
icon-text icon-12px';
+ $bytesClass = SkinMinerva::iconClass(
'bytesremoved', 'before', 'icon-12px mw-mf-bytesremoved' );
}
$html .= Html::element(
'p',
diff --git a/includes/specials/SpecialMobileContributions.php
b/includes/specials/SpecialMobileContributions.php
index ae0cdbb..c77ca39 100644
--- a/includes/specials/SpecialMobileContributions.php
+++ b/includes/specials/SpecialMobileContributions.php
@@ -34,7 +34,7 @@
protected function getHeaderBarLink( $title ) {
return Html::element( 'a',
array(
- 'class' => 'mw-mf-user icon icon-16px
icon-text',
+ 'class' => SkinMinerva::iconClass( 'user',
'before', 'mw-mf-user icon-16px' ),
'href' => SpecialPage::getTitleFor(
'UserProfile', $title->getText() )->getLocalUrl(),
),
$title->getText() );
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index 9d16f26..361290a 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -151,13 +151,13 @@
}
if ( $bytesChanged > 0 ) {
$changeMsg = 'mobile-frontend-diffview-bytesadded';
- $sizeClass = 'mw-mf-bytesadded meta icon icon-12px
icon-text';
+ $sizeClass = SkinMinerva::iconClass( 'bytesadded',
'before', 'icon-12px meta mw-mf-bytesadded' );
} elseif ( $bytesChanged === 0 ) {
$changeMsg = 'mobile-frontend-diffview-bytesnochange';
- $sizeClass = 'mw-mf-bytesneutral meta icon icon-12px
icon-text';
+ $sizeClass = SkinMinerva::iconClass( 'bytesneutral',
'before', 'icon-12px meta mw-mf-bytesneutral' );
} else {
$changeMsg = 'mobile-frontend-diffview-bytesremoved';
- $sizeClass = 'mw-mf-bytesremoved meta icon icon-12px
icon-text';
+ $sizeClass = SkinMinerva::iconClass( 'bytesremoved',
'before', 'icon-12px meta mw-mf-bytesremoved' );
$bytesChanged = abs( $bytesChanged );
}
@@ -271,7 +271,7 @@
$user = User::newFromId( $userId );
$edits = $user->getEditCount();
$attrs = array(
- 'class' => 'mw-mf-user icon icon-16px
icon-text',
+ 'class' => SkinMinerva::iconClass( 'user',
'before', 'mw-mf-user icon-16px' ),
'data-revision-id' => $this->revId,
'data-user-name' => $user->getName(),
'data-user-gender' => $user->getOption(
'gender' ),
@@ -299,9 +299,9 @@
$ipAddr = $this->rev->getUserText();
$userPage = SpecialPage::getTitleFor( 'Contributions',
$ipAddr );
$output->addHtml(
- '<div class="mw-mf-user mw-mf-anon icon
icon-16px icon-text">' .
- $this->msg(
'mobile-frontend-diffview-anonymous' )->escaped() .
- '</div>' .
+ Html::element( 'div', array(
+ 'class' => SkinMinerva::iconClass(
'anonymous', 'before', 'mw-mf-user icon-16px mw-mf-anon' ),
+ ), $this->msg(
'mobile-frontend-diffview-anonymous' ) ) .
'<div>' .
Linker::link( $userPage,
htmlspecialchars( $ipAddr ) ) .
'</div>'
diff --git a/includes/specials/SpecialMobileHistory.php
b/includes/specials/SpecialMobileHistory.php
index a59c783..0fb3c16 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -64,7 +64,7 @@
// manually style it as a userlink
$headerTitle = Html::element(
'span',
- array( 'class' => 'mw-mf-user icon icon-16px
icon-text'),
+ array( 'class' => SkinMinerva::iconClass(
'user', 'before', 'mw-mf-user icon-16px' ) ),
$title
);
}
diff --git a/includes/specials/SpecialUserProfile.php
b/includes/specials/SpecialUserProfile.php
index 71fadb0..1fd91ff 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -144,7 +144,7 @@
protected function getTalkLink() {
// replace secondary icon
$attrs = array(
- 'class' => 'icon-talk mw-ui-button icon icon-text',
+ 'class' => SkinMinerva::iconClass( 'talk', 'before',
'mw-ui-button' ),
'href' =>
$this->targetUser->getTalkPage()->getLocalUrl(),
);
// FIXME: What if this is the user's own profile? Should we
change the message?
--
To view, visit https://gerrit.wikimedia.org/r/164413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff5d72a86500b3c8f86716c512da6ae8de0b72da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
