Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58994
Change subject: Move header to generic MinervaTemplate
......................................................................
Move header to generic MinervaTemplate
Slight modifications to handling of special page headers to store
them in one template variable
Change-Id: I95d3cdacb6c07744541f0a0d5d04d2b976dcf22b
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobile.php
M includes/skins/SkinMobileTemplate.php
3 files changed, 54 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/94/58994/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 406bccb..d5c9000 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -7,13 +7,35 @@
) );
$this->set( 'language_urls', array() );
+ $this->set( 'search-input-placeholder', wfMessage(
'mobile-frontend-placeholder' )->escaped() );
+
+ $searchBox = $this->makeSearchInput(
+ array(
+ 'id' => 'searchInput',
+ 'class' => 'search',
+ 'autocomplete' => 'off',
+ 'placeholder' =>
$this->data['search-input-placeholder'],
+ )
+ );
+ $script = $this->data['wgScript'];
+ $searchButton = $this->makeSearchButton( 'go', array( 'class'
=> 'searchSubmit' ) );
+ $header = <<<HTML
+<form action="{$script}" class="search-box">
+ <div class="divclearable">
+ {$searchBox}
+ {$searchButton}
+ </div>
+</form>
+HTML;
+ $this->set( 'header', $header );
+
// menu button
$url = SpecialPage::getTitleFor( 'MobileMenu' )->getLocalUrl()
. '#mw-mf-page-left';
$this->set( 'menuButton',
Html::element( 'a', array(
- 'title' => wfMessage(
'mobile-frontend-main-menu-button-tooltip' )->escaped(),
- 'href' => $url,
- 'id'=> 'mw-mf-main-menu-button',
+ 'title' => wfMessage(
'mobile-frontend-main-menu-button-tooltip' )->escaped(),
+ 'href' => $url,
+ 'id'=> 'mw-mf-main-menu-button',
) )
);
}
@@ -42,6 +64,7 @@
}
public function execute() {
$this->prepareCommonData();
+ $this->prepareData();
$this->prepareBannerData();
$this->render( $this->data );
}
@@ -102,5 +125,15 @@
<!-- start -->
<?php
echo $this->html( 'banners' );
+ ?>
+ <div id="mw-mf-header">
+ <?php
+ echo $this->html( 'menuButton' );
+ echo $this->html( 'header' );
+ ?>
+ <ul id="mw-mf-menu-page">
+ </ul>
+ </div>
+ <?php
}
}
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index e8e2ae5..d1e904a 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -22,6 +22,15 @@
$inBeta = $context->isBetaGroupMember();
$inAlpha = $context->isAlphaGroupMember();
+ if ( $inAlpha ) {
+ $placeholder = wfMessage(
'mobile-frontend-placeholder-alpha' )->escaped();
+ } else if ( $inBeta ) {
+ $placeholder = wfMessage(
'mobile-frontend-placeholder-beta' )->escaped();
+ } else {
+ $placeholder = wfMessage( 'mobile-frontend-placeholder'
)->escaped();
+ }
+ $tpl->set( 'search-input-placeholder', $placeholder );
+
$tpl->set( 'action', $context->getRequest()->getText( 'action'
) );
$tpl->set( 'isAlphaGroupMember', $inAlpha );
$tpl->set( 'isBetaGroupMember', $inBeta );
@@ -204,13 +213,15 @@
}
$htmlHeader = $this->getOutput()->getProperty(
'mobile.htmlHeader' );
- if ( !$htmlHeader && $isSpecialPage ) {
- $htmlHeader = Html::element( 'h1', array( 'class' =>
'header' ), $pageHeading );
+ if ( $isSpecialPage ) {
+ if ( !$htmlHeader ) {
+ $htmlHeader = Html::element( 'h1', array(
'class' => 'header' ), $pageHeading );
+ }
+ $tpl->set( 'specialPageHeader', $htmlHeader );
}
$tpl->set( 'prebodytext', $preBodyText );
$tpl->set( 'postbodytext', $postBodyText );
- $tpl->set( 'htmlHeader', $htmlHeader );
}
/**
diff --git a/includes/skins/SkinMobileTemplate.php
b/includes/skins/SkinMobileTemplate.php
index f6ed1cb..8898868 100644
--- a/includes/skins/SkinMobileTemplate.php
+++ b/includes/skins/SkinMobileTemplate.php
@@ -12,7 +12,6 @@
'variantSummary' => count( $variants ) > 1 ? wfMessage(
'mobile-frontend-language-variant-header' )->text() : '',
);
?>
- <?php $this->renderArticleHeader() ?>
<div class='show' id='content_wrapper'>
<div id="content" class="content">
<?php
@@ -29,17 +28,6 @@
} ?>
<?php
$this->navigationEnd();
- }
-
- public function renderArticleHeader() {
- echo '<div id="mw-mf-header">';
- if ( $this->data['htmlHeader'] ) {
- $this->html( 'menuButton' );
- echo $this->data['htmlHeader'];
- } else {
- $this->searchBox();
- }
- echo '</div>';
}
public function execute() {
@@ -62,36 +50,16 @@
public function prepareData() {
global $wgExtensionAssetsPath,
$wgMobileFrontendLogo;
+ $data = $this->data;
wfProfileIn( __METHOD__ );
$this->setRef( 'wgExtensionAssetsPath', $wgExtensionAssetsPath
);
$this->set( 'wgMobileFrontendLogo', $wgMobileFrontendLogo );
- wfProfileOut( __METHOD__ );
- }
-
- private function searchBox() {
- if ( $this->data['isAlphaGroupMember'] ) {
- $placeholder = wfMessage(
'mobile-frontend-placeholder-alpha' )->text();
- } else if ( $this->data['isBetaGroupMember'] ) {
- $placeholder = wfMessage(
'mobile-frontend-placeholder-beta' )->text();
- } else {
- $placeholder = wfMessage( 'mobile-frontend-placeholder'
)->text();
+ if ( isset( $data['specialPageHeader'] ) ) {
+ $this->set( 'header', $data['specialPageHeader'] );
}
- ?>
- <?php $this->html( 'menuButton' ) ?>
- <form id="mw-mf-searchForm" action="<?php $this->text(
'wgScript' ) ?>" class="search-box" method="get">
- <input type="hidden" value="Special:Search"
name="title" />
- <div id="mw-mf-sq" class="divclearable">
- <input type="search" name="search"
id="searchInput" size="22" value="<?php $this->text( 'searchField' )
- ?>" autocomplete="off" maxlength="1024"
class="search"
- placeholder="<?php echo $placeholder ?>"
- />
- <input class='searchSubmit' type="submit"
value="<?php $this->msg( 'mobile-frontend-search-submit' ) ?>">
- </div>
- </form>
- <ul id="mw-mf-menu-page"></ul>
- <?php
+ wfProfileOut( __METHOD__ );
}
private function footer() {
--
To view, visit https://gerrit.wikimedia.org/r/58994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95d3cdacb6c07744541f0a0d5d04d2b976dcf22b
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
