wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-28 08:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix history link"

Browse source
This commit is contained in:
jenkins-bot 2021-11-29 23:36:42 +00:00 committed by Gerrit Code Review
parent 76a12a2ad4 11b703f616
commit f4b3b11053
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
includes/Skins/SkinMinerva.php
View file

@ -439,29 +439,36 @@ class SkinMinerva extends SkinMustache {
->getRevisionLookup()
->getTimestampFromId( $out->getRevisionId() );
}
$historyIconClasses = [
'historyIconClass' => MinervaUI::iconClass(
'history-base20', 'mw-ui-icon-small', '', 'wikimedia'
),
'arrowIconClass' => MinervaUI::iconClass(
'expand-gray', 'small',
'mf-mw-ui-icon-rotate-anti-clockwise indicator',
// Uses icon in MobileFrontend so must be prefixed mf.
// Without MobileFrontend it will not render.
// Rather than maintain 2 versions (and variants) of the arrow icon which can conflict
// with each othe and bloat CSS, we'll
// use the MobileFrontend one. Long term when T177432 and T160690 are resolved
// we should be able to use one icon definition and break this dependency.
'mf'
),
];
$historyLink = !$isLatestRevision || $title->isMainPage() ?
$this->getGenericHistoryLink( $title ) :
$this->getRelativeHistoryLink( $title, $timestamp );
// Create history link and corresponding icons.
$historyLinkAndIcons = [];
if ( Action::getActionName( RequestContext::getMain() ) === 'view' ) {
$historyIconClasses = [
'historyIconClass' => MinervaUI::iconClass(
'history-base20', 'mw-ui-icon-small', '', 'wikimedia'
),
'arrowIconClass' => MinervaUI::iconClass(
'expand-gray', 'small',
'mf-mw-ui-icon-rotate-anti-clockwise indicator',
// Uses icon in MobileFrontend so must be prefixed mf.
// Without MobileFrontend it will not render.
// Rather than maintain 2 versions (and variants) of the arrow icon which can conflict
// with each othe and bloat CSS, we'll
// use the MobileFrontend one. Long term when T177432 and T160690 are resolved
// we should be able to use one icon definition and break this dependency.
'mf'
),
];
$historyLink = !$isLatestRevision || $title->isMainPage() ?
$this->getGenericHistoryLink( $title ) :
$this->getRelativeHistoryLink( $title, $timestamp );
$historyLinkAndIcons = $historyLink + $historyIconClasses;
}
$title = $this->getTitle();
return $title->canExist() && $title->exists()
? $historyLink + $historyIconClasses
return $title->canExist() && $title->exists() && !empty( $historyLinkAndIcons )
? $historyLinkAndIcons
: null;
}