Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58993
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, 24 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/93/58993/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 7382a33..406bccb 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -21,9 +21,28 @@
public function prepareData() { // expects to be overriden
}
+ private function prepareBannerData() {
+ global $wgMFEnableSiteNotice;
+ if ( $wgMFEnableSiteNotice ) {
+ if ( isset( $this->data['sitenotice'] ) ) {
+ $siteNotice = '<div id="siteNotice">' .
$this->data['sitenotice'] . '</div>';
+ } else {
+ $siteNotice = '';
+ }
+ if ( isset( $this->data['notice'] ) ) {
+ $siteNotice = $this->data['notice'] .
$siteNotice;
+ }
+ } else {
+ $siteNotice = '';
+ }
+ if ( isset( $this->data['zeroRatedBanner'] ) ) {
+ $siteNotice = $this->data['zeroRatedBanner'] .
$siteNotice;
+ }
+ $this->set( 'banners', $siteNotice );
+ }
public function execute() {
$this->prepareCommonData();
- $this->prepareData();
+ $this->prepareBannerData();
$this->render( $this->data );
}
@@ -80,6 +99,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 2fa820c..e8e2ae5 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();
@@ -66,8 +65,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 e09870b..f6ed1cb 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: newchange
Gerrit-Change-Id: Ic065c8b358e736f5aa281efa05f2cb5ad389e368
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
