jenkins-bot has submitted this change and it was merged.
Change subject: Completely remove the $wgMFCustomLogos['logo'] stuff
......................................................................
Completely remove the $wgMFCustomLogos['logo'] stuff
It's been broken for a long time and doesn't comply with our current
designs anyway. Remove mw.png and don't default the mobile logo to it:
it's too small for our current usage of mobile logo and it's kinda pointless
to use a MW logo there.
Change-Id: I5501842553334e93cb67f213df7bc898fd7e2802
---
M MobileFrontend.php
D images/mw.png
M includes/MobileFrontend.body.php
M includes/skins/SkinMobile.php
4 files changed, 5 insertions(+), 34 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
awjrichards: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 34ef53d..1b66e37 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -164,9 +164,8 @@
$wgMFPhotoUploadWiki = null;
/**
- * Path to the logo used in the mobile view
- *
- * Should be 22px tall at most
+ * Path to the logo used in the login/signup form
+ * The standard height is 72px
*/
$wgMobileFrontendLogo = false;
diff --git a/images/mw.png b/images/mw.png
deleted file mode 100644
index a88b40a..0000000
--- a/images/mw.png
+++ /dev/null
Binary files differ
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index 1f4a2f2..b712cac 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -23,19 +23,6 @@
return $zeroRatedBanner;
}
- /**
- * @param $out OutputPage
- */
- protected function beforePageDisplay( $out ) {
- wfProfileIn( __METHOD__ );
-
- $this->setDefaultLogo();
-
- $this->sendHeaders();
-
- wfProfileOut( __METHOD__ );
- }
-
private function sendHeaders() {
global $wgMFVaryResources;
@@ -67,7 +54,8 @@
public function DOMParse( OutputPage $out ) {
wfProfileIn( __METHOD__ );
- $this->beforePageDisplay( $out );
+ $this->sendHeaders();
+
$html = $out->getHTML();
wfProfileIn( __METHOD__ . '-formatter-init' );
@@ -100,21 +88,5 @@
wfProfileOut( __METHOD__ );
return $contentHtml;
- }
-
- /**
- * Sets up the default logo image used in mobile view if none is set
- */
- public function setDefaultLogo() {
- global $wgMobileFrontendLogo, $wgExtensionAssetsPath,
$wgMFCustomLogos;
- wfProfileIn( __METHOD__ );
- if ( $wgMobileFrontendLogo === false ) {
- $wgMobileFrontendLogo = $wgExtensionAssetsPath .
'/MobileFrontend/images/mw.png';
- }
-
- if ( MobileContext::singleton()->isBetaGroupMember() && isset(
$wgMFCustomLogos['logo'] ) ) {
- $wgMobileFrontendLogo = $wgMFCustomLogos['logo'];
- }
- wfProfileOut( __METHOD__ );
}
}
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 5df8723..d0778ea 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -181,7 +181,7 @@
$footerSitename = $this->msg( 'mobile-frontend-footer-sitename'
)->text();
- if ( is_array( $wgMFCustomLogos ) && isset(
$wgMFCustomLogos['copyright'] ) ) {
+ if ( isset( $wgMFCustomLogos['copyright'] ) ) {
$suffix = $wgMFTrademarkSitename ? ' ®' : '';
$sitename = Html::element( 'img', array(
'src' => $wgMFCustomLogos['copyright'],
--
To view, visit https://gerrit.wikimedia.org/r/67472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5501842553334e93cb67f213df7bc898fd7e2802
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
