jenkins-bot has submitted this change and it was merged.
Change subject: Promote all the banners into MinervaTemplate
......................................................................
Promote all the banners into MinervaTemplate
Use the time to refactor into one variable
Change-Id: Ic065c8b358e736f5aa281efa05f2cb5ad389e368
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobile.php
M includes/skins/SkinMobileTemplate.php
3 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 580d7e0..f430175 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -17,9 +17,24 @@
public function prepareData() { // expects to be overriden
}
+ private function prepareBannerData() {
+ global $wgMFEnableSiteNotice;
+ $banners = '';
+ if ( isset( $this->data['zeroRatedBanner'] ) ) { // FIXME: Add
hook and move to Zero extension?
+ $banners .= $this->data['zeroRatedBanner'];
+ }
+ if ( isset( $this->data['notice'] ) ) {
+ $banners .= $this->data['notice'];
+ }
+ if ( $wgMFEnableSiteNotice ) {
+ $banners .= '<div id="siteNotice"><div>';
+ }
+ $this->set( 'banners', $banners );
+ }
public function execute() {
$this->prepareCommonData();
$this->prepareData();
+ $this->prepareBannerData();
$this->render( $this->data );
}
@@ -76,6 +91,8 @@
</ul>
</div>
<div id='mw-mf-page-center'>
- <?php
+ <!-- start -->
+ <?php
+ echo $this->html( 'banners' );
}
}
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 03265e3..afc34c9 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -6,8 +6,7 @@
public $template = 'SkinMobileTemplate';
protected function prepareTemplate() {
- global $wgAppleTouchIcon, $wgMFCustomLogos, $wgVersion,
$wgMFTrademarkSitename,
- $wgMFEnableSiteNotice;
+ global $wgAppleTouchIcon, $wgMFCustomLogos, $wgVersion,
$wgMFTrademarkSitename;
wfProfileIn( __METHOD__ );
$tpl = parent::prepareTemplate();
@@ -62,8 +61,6 @@
// footer
$tpl->set( 'copyright', $this->getCopyright() );
- // display site notice
- $tpl->set( 'enableSiteNotice', $wgMFEnableSiteNotice );
$footerSitename = $this->msg( 'mobile-frontend-footer-sitename'
)->text();
if ( is_array( $wgMFCustomLogos ) && isset(
$wgMFCustomLogos['copyright'] ) ) {
diff --git a/includes/skins/SkinMobileTemplate.php
b/includes/skins/SkinMobileTemplate.php
index b887c6d..bab508a 100644
--- a/includes/skins/SkinMobileTemplate.php
+++ b/includes/skins/SkinMobileTemplate.php
@@ -12,11 +12,6 @@
'variantSummary' => count( $variants ) > 1 ? wfMessage(
'mobile-frontend-language-variant-header' )->text() : '',
);
?>
- <?php $this->html( 'zeroRatedBanner' ) ?>
- <?php $this->html( 'notice' ) ?>
- <?php if ( $this->data[ 'enableSiteNotice' ] ) { ?>
- <div id="siteNotice"></div>
- <?php } ?>
<?php $this->renderArticleHeader() ?>
<div class='show' id='content_wrapper'>
<div id="content" class="content">
--
To view, visit https://gerrit.wikimedia.org/r/58993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic065c8b358e736f5aa281efa05f2cb5ad389e368
Gerrit-PatchSet: 6
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
