Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64607
Change subject: Identify zero code that needs to move out of MobileFrontend
......................................................................
Identify zero code that needs to move out of MobileFrontend
Move zeroRatedBanner to ZeroRatedMobileAccess
onMinervaPreRender hook
Change-Id: Iae196225c5da00b95af70f0f7afdd4fd6d5ea286
---
M includes/MobileFormatter.php
M includes/MobileFrontend.body.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobileBase.php
M less/modules/mf-search.less
5 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/07/64607/1
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index e3c634a..fe71bd3 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -370,6 +370,7 @@
protected function parseMainPage( DOMDocument $mainPage ) {
wfProfileIn( __METHOD__ );
+ // FIXME: Move to ZeroRatedMobileAccess extension
$zeroLandingPage = $mainPage->getElementById(
'zero-landing-page' );
$featuredArticle = $mainPage->getElementById( 'mp-tfa' );
$newsItems = $mainPage->getElementById( 'mp-itn' );
@@ -382,6 +383,7 @@
$content = $mainPage->createElement( 'div' );
$content->setAttribute( 'id', 'mainpage' );
+ // FIXME: Move to ZeroRatedMobileAccess extension
if ( $zeroLandingPage ) {
$content->appendChild( $zeroLandingPage );
}
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index 6894d9d..870c383 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -9,6 +9,7 @@
}
/**
+ * FIXME: Move to ZeroRatedMobileAccess extension
* @return string
*/
public function getZeroRatedBanner() {
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 3f85005..9639447 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -46,9 +46,6 @@
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'];
}
diff --git a/includes/skins/SkinMobileBase.php
b/includes/skins/SkinMobileBase.php
index b62e2d8..1341589 100644
--- a/includes/skins/SkinMobileBase.php
+++ b/includes/skins/SkinMobileBase.php
@@ -101,6 +101,7 @@
$tpl = $this->prepareTemplate();
$tpl->set( 'headelement', $out->headElement( $this ) );
$tpl->set( 'bodytext', $html );
+ // FIXME: Move to ZeroRatedMobileAccess extension
$tpl->set( 'zeroRatedBanner',
$this->extMobileFrontend->getZeroRatedBanner() );
$notice = '';
wfRunHooks( 'GetMobileNotice', array( $this, &$notice )
);
diff --git a/less/modules/mf-search.less b/less/modules/mf-search.less
index 2ee5d6e..9d33864 100644
--- a/less/modules/mf-search.less
+++ b/less/modules/mf-search.less
@@ -60,8 +60,8 @@
#mw-mf-page-left,
#mw-mf-main-menu-button,
#footer,
- #zero-rated-banner-red,
- #zero-rated-banner,
+ #zero-rated-banner-red, // FIXME: Move to ZeroRatedMobileAccess
extension
+ #zero-rated-banner, // FIXME: Move to ZeroRatedMobileAccess extension
#mw-mf-logo,
#content_wrapper,
.goButton {
--
To view, visit https://gerrit.wikimedia.org/r/64607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae196225c5da00b95af70f0f7afdd4fd6d5ea286
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
