jenkins-bot has submitted this change and it was merged.
Change subject: Restore error messages on account creation page
......................................................................
Restore error messages on account creation page
Bug: 58927
Change-Id: I85400a6b90fc1632c17b00a5de5cbdd7da49898d
---
M includes/skins/UserAccountCreateMobileTemplate.php
M includes/skins/UserLoginAndCreateTemplate.php
M includes/skins/UserLoginMobileTemplate.php
3 files changed, 24 insertions(+), 39 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/UserAccountCreateMobileTemplate.php
b/includes/skins/UserAccountCreateMobileTemplate.php
index 0af8382..0c1ecf0 100644
--- a/includes/skins/UserAccountCreateMobileTemplate.php
+++ b/includes/skins/UserAccountCreateMobileTemplate.php
@@ -23,27 +23,8 @@
$watchArticle = $this->getArticleTitleToWatch();
$stickHTTPS = ( $this->doStickHTTPS() ) ? Html::input(
'wpStickHTTPS', 'true', 'hidden' ) : '';
$username = ( strlen( $this->data['name'] ) ) ?
$this->data['name'] : null;
- $message = $this->data['message'];
- $messageType = $this->data['messagetype'];
- $msgBox = ''; // placeholder for displaying any login-related
system messages (eg errors)
// handle captcha
$captcha = $this->handleCaptcha( $this->data['header'] );
-
- if ( $message ) {
- $heading = '';
- $class = 'alert';
- if ( $messageType == 'error' ) {
- $heading = wfMessage(
'mobile-frontend-sign-in-error-heading' )->text();
- $class .= ' error';
- }
-
- $msgBox .= Html::openElement( 'div', array( 'class' =>
$class ) );
- $msgBox .= ( $heading ) ? Html::rawElement( 'h2',
array(), $heading ) : '';
- $msgBox .= $message;
- $msgBox .= Html::closeElement( 'div' );
- } else {
- $msgBox .= $this->getLogoHtml();
- }
$form =
Html::openElement( 'form',
@@ -94,6 +75,7 @@
Html::closeElement( 'form' );
echo Html::openElement( 'div', array( 'id' =>
'mw-mf-accountcreate', 'class' => 'content' ) );
$this->renderGuiderMessage();
+ $this->renderMessageHtml();
echo $form;
echo Html::closeElement( 'div' );
}
diff --git a/includes/skins/UserLoginAndCreateTemplate.php
b/includes/skins/UserLoginAndCreateTemplate.php
index 7b85ccd..70ad76b 100644
--- a/includes/skins/UserLoginAndCreateTemplate.php
+++ b/includes/skins/UserLoginAndCreateTemplate.php
@@ -35,6 +35,28 @@
$this->copyObjectProperties( $template );
}
+ protected function renderMessageHtml() {
+ $msgBox = ''; // placeholder for displaying any login-related
system messages (eg errors)
+ $message = $this->data['message'];
+ $messageType = $this->data['messagetype'];
+ if ( $message ) {
+ $heading = '';
+ $class = 'alert';
+ if ( $messageType == 'error' ) {
+ $heading = wfMessage(
'mobile-frontend-sign-in-error-heading' )->text();
+ $class .= ' error';
+ }
+
+ $msgBox .= Html::openElement( 'div', array( 'class' =>
$class ) );
+ $msgBox .= ( $heading ) ? Html::rawElement( 'h2',
array(), $heading ) : '';
+ $msgBox .= $message;
+ $msgBox .= Html::closeElement( 'div' );
+ } else {
+ $msgBox .= $this->getLogoHtml();
+ }
+ echo $msgBox;
+ }
+
/**
* Copy public properties of one object to this one
* @param object $obj: The object whose properties should be copied
diff --git a/includes/skins/UserLoginMobileTemplate.php
b/includes/skins/UserLoginMobileTemplate.php
index b3c28df..20adc27 100644
--- a/includes/skins/UserLoginMobileTemplate.php
+++ b/includes/skins/UserLoginMobileTemplate.php
@@ -22,9 +22,6 @@
$watchArticle = $this->getArticleTitleToWatch();
$stickHTTPS = ( $this->doStickHTTPS() ) ? Html::input(
'wpStickHTTPS', 'true', 'hidden' ) : '';
$username = ( strlen( $this->data['name'] ) ) ?
$this->data['name'] : null;
- $message = $this->data['message'];
- $messageType = $this->data['messagetype'];
- $msgBox = ''; // placeholder for displaying any login-related
system messages (eg errors)
// @TODO make sure this also includes returnto and
returntoquery from the request
$query = array(
@@ -53,22 +50,6 @@
array( 'class'=> 'mw-mf-create-account' ), $query );
$login = Html::openElement( 'div', array( 'id' =>
'mw-mf-login', 'class' => 'content' ) );
-
- if ( $message ) {
- $heading = '';
- $class = 'alert';
- if ( $messageType == 'error' ) {
- $heading = wfMessage(
'mobile-frontend-sign-in-error-heading' )->text();
- $class .= ' error';
- }
-
- $msgBox .= Html::openElement( 'div', array( 'class' =>
$class ) );
- $msgBox .= ( $heading ) ? Html::rawElement( 'h2',
array(), $heading ) : '';
- $msgBox .= $message;
- $msgBox .= Html::closeElement( 'div' );
- } else {
- $msgBox .= $this->getLogoHtml();
- }
$form = Html::openElement( 'div', array() ) .
Html::openElement( 'form',
@@ -105,7 +86,7 @@
Html::closeElement( 'div' );
echo $login;
$this->renderGuiderMessage();
- echo $msgBox;
+ $this->renderMessageHtml();
echo $form;
echo Html::closeElement( 'div' );
}
--
To view, visit https://gerrit.wikimedia.org/r/103581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85400a6b90fc1632c17b00a5de5cbdd7da49898d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
