jenkins-bot has submitted this change and it was merged.
Change subject: Kill navigationStart
......................................................................
Kill navigationStart
make it part of MinervaTemplate->render
Change-Id: If631c77ad98cd126ea1b48f342e26dfbb2f22b48
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobileTemplate.php
2 files changed, 16 insertions(+), 22 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
JGonera: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 201dcb1..580d7e0 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -61,5 +61,21 @@
private function render( $data ) { // FIXME: replace with template
engines
echo $data[ 'headelement' ];
+ ?>
+ <div id="mw-mf-viewport">
+ <div id="mw-mf-page-left">
+ <ul id="mw-mf-menu-main">
+ <?php
+ foreach( $this->getDiscoveryTools() as $key =>
$val ):
+ echo $this->makeListItem( $key, $val );
+ endforeach;
+ foreach( $this->getPersonalTools() as $key =>
$val ):
+ echo $this->makeListItem( $key, $val );
+ endforeach;
+ ?>
+ </ul>
+ </div>
+ <div id='mw-mf-page-center'>
+ <?php
}
}
diff --git a/includes/skins/SkinMobileTemplate.php
b/includes/skins/SkinMobileTemplate.php
index f5ad1d49..b887c6d 100644
--- a/includes/skins/SkinMobileTemplate.php
+++ b/includes/skins/SkinMobileTemplate.php
@@ -11,7 +11,6 @@
'languageSummary' => wfMessage(
'mobile-frontend-language-header', count( $languages ) )->text(),
'variantSummary' => count( $variants ) > 1 ? wfMessage(
'mobile-frontend-language-variant-header' )->text() : '',
);
- $this->navigationStart();
?>
<?php $this->html( 'zeroRatedBanner' ) ?>
<?php $this->html( 'notice' ) ?>
@@ -54,27 +53,6 @@
$this->html( 'bottomScripts' ) ?>
</body>
</html><?php
- }
-
- public function navigationStart() {
- global $wgMFNearby;
-
- ?>
- <div id="mw-mf-viewport">
- <div id="mw-mf-page-left">
- <ul id="mw-mf-menu-main">
- <?php
- foreach( $this->getDiscoveryTools() as $key => $val ):
- echo $this->makeListItem( $key, $val );
- endforeach;
- foreach( $this->getPersonalTools() as $key => $val ):
- echo $this->makeListItem( $key, $val );
- endforeach;
- ?>
- </ul>
- </div>
- <div id='mw-mf-page-center'>
- <?php
}
public function navigationEnd() {
--
To view, visit https://gerrit.wikimedia.org/r/58992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If631c77ad98cd126ea1b48f342e26dfbb2f22b48
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
