Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58996
Change subject: Code move: Lift and shift html rendering to MinervaTemplate
......................................................................
Code move: Lift and shift html rendering to MinervaTemplate
Mostly a direct one to one move with exception that footer is
now printed regardless but due to css rules will not show on special
pages so no visible changes
Change-Id: I9b4f41c96a9b497634b71c889bf7628c44ad5be7
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobileTemplate.php
2 files changed, 46 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/96/58996/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 4c2f3d7..2eb9bc5 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -107,6 +107,17 @@
}
private function render( $data ) { // FIXME: replace with template
engines
+ $languages = $this->getLanguages();
+ $variants = $this->getLanguageVariants();
+ $languageData = array(
+ 'heading' => wfMessage(
'mobile-frontend-language-article-heading' )->text(),
+ 'languages' => $languages,
+ 'variants' => $variants,
+ 'languageSummary' => wfMessage(
'mobile-frontend-language-header', count( $languages ) )->text(),
+ 'variantSummary' => count( $variants ) > 1 ? wfMessage(
'mobile-frontend-language-variant-header' )->text() : '',
+ );
+
+ // begin rendering
echo $data[ 'headelement' ];
?>
<div id="mw-mf-viewport">
@@ -123,10 +134,10 @@
</ul>
</div>
<div id='mw-mf-page-center'>
- <!-- start -->
- <?php
- echo $this->html( 'banners' );
- ?>
+ <!-- start -->
+ <?php
+ echo $this->html( 'banners' );
+ ?>
<div id="mw-mf-header">
<?php
echo $this->html( 'menuButton' );
@@ -135,6 +146,37 @@
<ul id="mw-mf-menu-page">
</ul>
</div>
+ <div class='show' id='content_wrapper'>
+ <div id="content" class="content">
+ <?php
+ echo
$data['prebodytext'];
+ echo $data[ 'bodytext'
];
+ echo
$this->renderLanguages( $languageData );
+ echo
$data['postbodytext'];
+ ?>
+ </div><!-- close #content -->
+ </div><!-- close #content_wrapper -->
+ <div id="footer">
+ <h2 id="section_footer">
+ <?php $this->html( 'sitename'
); ?>
+ </h2>
+ <div id="content_footer">
+ <?php
+ foreach( $this->getFooterLinks() as
$category => $links ):
+ ?>
+ <ul class="footer-<?php echo
$category; ?>">
+ <?php foreach( $links
as $link ): ?><li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php
$this->html( $link ) ?></li><?php endforeach; ?>
+ </ul>
+ <?php endforeach; ?>
+ </div>
+ </div>
+ </div><!-- close #mw-mf-page-center -->
+ </div><!-- close #mw-mf-viewport -->
+ <?php
+ echo $data['bottomScripts'];
+ ?>
+ </body>
+ </html>
<?php
}
}
diff --git a/includes/skins/SkinMobileTemplate.php
b/includes/skins/SkinMobileTemplate.php
index 8898868..f2d7642 100644
--- a/includes/skins/SkinMobileTemplate.php
+++ b/includes/skins/SkinMobileTemplate.php
@@ -1,52 +1,6 @@
<?php
class SkinMobileTemplate extends MinervaTemplate {
- public function renderArticleSkin() {
- $languages = $this->getLanguages();
- $variants = $this->getLanguageVariants();
- $languageData = array(
- 'heading' => wfMessage(
'mobile-frontend-language-article-heading' )->text(),
- 'languages' => $languages,
- 'variants' => $variants,
- 'languageSummary' => wfMessage(
'mobile-frontend-language-header', count( $languages ) )->text(),
- 'variantSummary' => count( $variants ) > 1 ? wfMessage(
'mobile-frontend-language-variant-header' )->text() : '',
- );
- ?>
- <div class='show' id='content_wrapper'>
- <div id="content" class="content">
- <?php
- $this->html( 'prebodytext' );
- $this->html( 'bodytext' );
- $this->renderLanguages( $languageData );
- $this->html( 'postbodytext' );
- ?>
- </div><!-- close #content -->
- </div><!-- close #content_wrapper -->
- <?php
- if ( !$this->data[ 'isSpecialPage' ] ) {
- $this->footer();
- } ?>
- <?php
- $this->navigationEnd();
- }
-
- public function execute() {
- parent::execute();
- $this->renderArticleSkin();
- $this->html( 'bcHack' );
- $this->html( 'bottomScripts' ) ?>
- </body>
- </html><?php
- }
-
- public function navigationEnd() {
- //close #mw-mf-page-center then viewport;
- ?>
- </div><!-- close #mw-mf-page-center -->
- </div><!-- close #mw-mf-viewport -->
- <?php
- }
-
public function prepareData() {
global $wgExtensionAssetsPath,
$wgMobileFrontendLogo;
@@ -60,25 +14,6 @@
$this->set( 'header', $data['specialPageHeader'] );
}
wfProfileOut( __METHOD__ );
- }
-
- private function footer() {
- ?>
- <div id="footer">
- <h2 id="section_footer">
- <?php $this->html( 'sitename' ); ?>
- </h2>
- <div id="content_footer">
- <?php
- foreach( $this->getFooterLinks() as $category => $links
):
- ?>
- <ul class="footer-<?php echo $category; ?>">
- <?php foreach( $links as $link ): ?><li
id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html(
$link ) ?></li><?php endforeach; ?>
- </ul>
- <?php endforeach; ?>
- </div>
- </div>
- <?php
}
public function getPersonalTools() {
--
To view, visit https://gerrit.wikimedia.org/r/58996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b4f41c96a9b497634b71c889bf7628c44ad5be7
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
