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

Merge "Inline PageActionsMenu template"

Browse source
This commit is contained in:
jenkins-bot 2021-10-26 16:34:25 +00:00 committed by Gerrit Code Review
parent d2ad7f133a b41c7ca7be
commit 0ca31231fe
2 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
includes/Skins/SkinMinerva.php
View file

@ -91,30 +91,13 @@ class SkinMinerva extends SkinMustache {
}
/**
* Returns available page actions
* @return array
* Returns available page actions if the page has any.
*
* @return array|null
*/
private function getPageActions() {
return $this->isFallbackEditor() ? [] : $this->pageActionsMenu;
}
/**
* Get the HTML for rendering the available page actions
* @return string
*/
private function getPageActionsHtml() {
$hasPageActions = $this->hasPageActions();
if ( !$hasPageActions ) {
return '';
}
$templateParser = new TemplateParser( __DIR__ . '/../../includes/Skins' );
$pageActions = $this->getPageActions();
$html = '';
if ( $pageActions && $pageActions['toolbar'] ) {
$html = $templateParser->processTemplate( 'PageActionsMenu', $pageActions );
}
return $html;
return $this->isFallbackEditor() || !$this->hasPageActions() ?
null : $this->pageActionsMenu;
}
/**
@ -125,14 +108,12 @@ class SkinMinerva extends SkinMustache {
if ( !$this->hasCategoryLinks() ) {
unset( $data['html-categories'] );
}
$hasPageActions = $this->hasPageActions();
$tpl = $this->prepareQuickTemplate();
$tplData = $tpl->execute();
return $data + $tplData + [
'has-minerva-page-actions' => $hasPageActions,
'data-minerva-tabs' => $this->getTabsData(),
'html-minerva-page-actions' => $this->getPageActionsHtml(),
'data-minerva-page-actions' => $this->getPageActions(),
'html-minerva-subject-link' => $this->getSubjectPage(),
'data-minerva-secondary-actions' => $this->hasSecondaryActions() ? $this->getSecondaryActions() : [],
];

6
includes/Skins/skin.mustache
View file

@ -62,9 +62,9 @@
{{/items}}
</div>
{{/data-minerva-tabs}}
{{#has-minerva-page-actions}}
{{{html-minerva-page-actions}}}
{{/has-minerva-page-actions}}
{{#data-minerva-page-actions}}
{{>PageActionsMenu}}
{{/data-minerva-page-actions}}
{{{postheadinghtml}}}
<div class="minerva__subtitle">{{{html-subtitle}}}</div>
</div>