Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270336
Change subject: Hygiene: Embrace templates
......................................................................
Hygiene: Embrace templates
So much cleaner...
In future we can hope to kill methods such as getHeaderHtml
and include printTrail and closing body and html tags in the template
Change-Id: I667c1487be76e3ec9eaceffa9de7df47a149591a
---
M includes/skins/MinervaTemplate.php
M includes/skins/minerva.mustache
2 files changed, 12 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/36/270336/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index bb7428c..36bbe16 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -325,35 +325,19 @@
protected function render( $data ) {
$templateParser = new TemplateParser( __DIR__ );
+ // prepare template data
+ $templateData = array(
+ 'banners' => $data['banners'],
+ 'headelement' => $data[ 'headelement' ],
+ 'headerhtml' => $this->getHeaderHtml( $data ),
+ 'mainmenuhtml' => $this->getMainMenuHtml( $data ),
+ 'contenthtml' => $this->getContentWrapperHtml( $data ),
+ 'footerhtml' => $this->getFooterHtml( $data ),
+ );
// begin rendering
- echo $data[ 'headelement' ];
+ echo $templateParser->processTemplate( 'minerva', $templateData
);
+ $this->printTrail();
?>
- <div id="mw-mf-viewport">
- <nav id="mw-mf-page-left" class="navigation-drawer
view-border-box">
- <?php echo $this->getMainMenuHtml( $data ); ?>
- </nav>
- <div id="mw-mf-page-center">
- <div class="banner-container">
- <?php
- echo $templateParser->processTemplate(
'banners', $data );
- ?>
- </div>
- <div class="header">
- <?php
- echo $this->getHeaderHtml(
$data );
- ?>
- </div>
- <div id="content" class="mw-body">
- <?php
- echo $this->getContentWrapperHtml(
$data );
- ?>
- </div>
- <?php
- echo $this->getFooterHtml( $data );
- ?>
- </div>
- </div>
- <?php $this->printTrail(); ?>
</body>
</html>
<?php
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index b6abdd4..8fbf20f 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,3 +1,4 @@
+{{{headelement}}}
<div id="mw-mf-viewport">
<nav id="mw-mf-page-left" class="navigation-drawer view-border-box">
{{{mainmenuhtml}}}
--
To view, visit https://gerrit.wikimedia.org/r/270336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I667c1487be76e3ec9eaceffa9de7df47a149591a
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
