jenkins-bot has submitted this change and it was merged.
Change subject: Refactor template code
......................................................................
Refactor template code
Break out renderContentWrapper
Move language data construction to inside render languages
Change-Id: Ib31934be8db86a66070f77c27e9993163c89a3b5
---
M includes/skins/MinervaTemplate.php
1 file changed, 30 insertions(+), 23 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 0f0f730..d4e3294 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -26,7 +26,16 @@
return $this->data['page_actions'];
}
- private function renderLanguages( $languageTemplateData ) {
+ protected function renderLanguages( $data ) {
+ $languages = $this->getLanguages();
+ $variants = $this->getLanguageVariants();
+ $languageTemplateData = 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() : '',
+ );
if ( $languageTemplateData['languages'] && count(
$languageTemplateData['languages'] ) > 0 ) {
?>
<div class="section" id="mw-mf-language-section">
@@ -80,17 +89,27 @@
?></ul><?php
}
+ protected function renderContentWrapper( $data ) {
+ $isSpecialPage = $this->getSkin()->getTitle()->isSpecialPage();
+ ?>
+ <div class='show' id='content_wrapper'>
+ <div id="content" class="content">
+ <?php
+ if ( !$isSpecialPage ) {
+ echo $data['prebodytext'];
+ $this->renderPageActions( $data
);
+ }
+ echo $data[ 'bodytext' ];
+ $this->renderLanguages( $data );
+ echo $data['postbodytext'];
+ ?>
+ </div><!-- close #content -->
+ </div><!-- close #content_wrapper -->
+ <?php
+ }
+
protected function render( $data ) { // FIXME: replace with template
engines
$isSpecialPage = $this->getSkin()->getTitle()->isSpecialPage();
- $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() : '',
- );
$showMenuHeaders = isset( $this->data['_show_menu_headers'] )
&& $this->data['_show_menu_headers'];
// begin rendering
@@ -151,20 +170,8 @@
echo $data['userButton'];
?>
</div>
- <div class='show' id='content_wrapper'>
- <div id="content" class="content">
- <?php
- if ( !$isSpecialPage ) {
- echo
$data['prebodytext'];
-
$this->renderPageActions( $data );
- }
- echo $data[ 'bodytext'
];
- $this->renderLanguages(
$languageData );
- echo
$data['postbodytext'];
- ?>
- </div><!-- close #content -->
- </div><!-- close #content_wrapper -->
<?php
+ $this->renderContentWrapper( $data );
$this->renderFooter( $data );
?>
</div><!-- close #mw-mf-page-center -->
--
To view, visit https://gerrit.wikimedia.org/r/68724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib31934be8db86a66070f77c27e9993163c89a3b5
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
