Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216150
Change subject: Hygiene: Use getter to get main menu and header html
......................................................................
Hygiene: Use getter to get main menu and header html
Change-Id: I864715af082c6596762ae586eb4148084a2ce033
---
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateAlpha.php
2 files changed, 17 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/50/216150/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 22646b5..ec03bbe 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -236,23 +236,26 @@
* On other pages the menu is rendered via JS.
* @param array [$data] Data used to build the page
*/
- protected function renderMainMenu( $data ) {
+ protected function getMainMenuHtml( $data ) {
if ( $this->isSpecialMobileMenuPage ) {
$templateParser = new TemplateParser(
__DIR__ . '/../../resources/mobile.mainMenu/' );
- echo $templateParser->processTemplate( 'menu',
$data['menu_data'] );
+ return $templateParser->processTemplate( 'menu',
$data['menu_data'] );
+ } else {
+ return '';
}
}
/**
* Render Header elements
* @param array $data Data used to build the header
+ * @return string
*/
- protected function renderHeader( $data ) {
- $this->html( 'menuButton' );
- echo $this->getChromeHeaderContentHtml( $data );
- echo $data['secondaryButton'];
+ protected function getHeaderHtml( $data ) {
+ return $data['menuButton']
+ . $this->getChromeHeaderContentHtml( $data )
+ . $data['secondaryButton'];
}
/**
@@ -277,7 +280,7 @@
?>
<div id="mw-mf-viewport">
<nav id="mw-mf-page-left" class="navigation-drawer">
- <?php $this->renderMainMenu( $data ); ?>
+ <?php echo $this->getMainMenuHtml( $data ); ?>
</nav>
<div id="mw-mf-page-center">
<?php
@@ -285,7 +288,7 @@
?>
<div class="header">
<?php
- $this->renderHeader( $data );
+ echo $this->getHeaderHtml(
$data );
?>
</div>
<div id="content_wrapper">
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index 40cbce5..2ea63d7 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -54,7 +54,7 @@
* @inheritdoc
* Renders a search link and branding.
*/
- protected function getChromeHeaderContentHtml( $data ) {
+ protected function getHeaderHtml( $data ) {
$templateParser = new TemplateParser( __DIR__ );
$args = array(
'siteName' => SkinMinerva::getSitename(),
@@ -63,7 +63,8 @@
'mobileMenuTitle' => wfMessage(
'mobile-frontend-main-menu' )->parse()
);
- return $templateParser->processTemplate( 'header', $args );
+ return $templateParser->processTemplate( 'header', $args )
+ . $data['secondaryButton'];
}
protected function getSearchAttributes() {
@@ -97,25 +98,16 @@
}
/**
- * Render Header elements
- * @param array $data Data used to build the header
- */
- protected function renderHeader( $data ) {
- echo $this->getChromeHeaderContentHtml( $data );
- echo $data['secondaryButton'];
- }
-
- /**
* In addition to the main menu, this function renders the search form
on top of the menu
* @inheritdoc
*/
- protected function renderMainMenu( $data ) {
+ protected function getMainMenuHtml( $data ) {
$templateParser = new TemplateParser( __DIR__ );
$args = array(
'searchForm' => $this->makeSearchForm( $data )
);
- echo $templateParser->processTemplate( 'searchForm', $args );
- parent::renderMainMenu( $data );
+ return $templateParser->processTemplate( 'searchForm', $args )
+ . parent::getMainMenuHtml( $data );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/216150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I864715af082c6596762ae586eb4148084a2ce033
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
