dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "SpecialMovepage: Convert form to use OOUI controls"
[lhc/web/wiklou.git]
/
includes
/
templates
/
Usercreate.php
diff --git
a/includes/templates/Usercreate.php
b/includes/templates/Usercreate.php
index
b185cb3
..
a39690a
100644
(file)
--- a/
includes/templates/Usercreate.php
+++ b/
includes/templates/Usercreate.php
@@
-38,8
+38,6
@@
class UsercreateTemplate extends BaseTemplate {
}
function execute() {
}
function execute() {
- global $wgCookieExpiration;
- $expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
?>
<div class="mw-ui-container">
<?php if ( $this->haveData( 'languages' ) ) { ?>
?>
<div class="mw-ui-container">
<?php if ( $this->haveData( 'languages' ) ) { ?>
@@
-73,6
+71,12
@@
class UsercreateTemplate extends BaseTemplate {
<?php } ?>
</div>
<?php } ?>
</div>
+ <?php if ( $this->data['formheader'] ) { ?>
+ <div class="mw-form-formheader">
+ <?php $this->html( 'formheader' ); /* extensions such as MobileFrontend add html here */ ?>
+ </div>
+ <?php } ?>
+
<div class="mw-ui-vform-field">
<label for='wpName2'>
<?php $this->msg( 'userlogin-yourname' ); ?>
<div class="mw-ui-vform-field">
<label for='wpName2'>
<?php $this->msg( 'userlogin-yourname' ); ?>
@@
-217,8
+221,10
@@
class UsercreateTemplate extends BaseTemplate {
<?php if ( !empty( $inputItem['value'] ) ) {
echo 'checked="checked"';
} ?>
<?php if ( !empty( $inputItem['value'] ) ) {
echo 'checked="checked"';
} ?>
- ><label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"></label>
- </div><?php $this->msgHtml( $inputItem['msg'] ); ?>
+ ><label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>">
+ <?php $this->msg( $inputItem['msg'] ); ?>
+ </label>
+ </div>
<?php
} else {
// Not a checkbox.
<?php
} else {
// Not a checkbox.
@@
-259,7
+265,7
@@
class UsercreateTemplate extends BaseTemplate {
<?php
echo Html::submitButton(
$this->getMsg( $this->data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ),
<?php
echo Html::submitButton(
$this->getMsg( $this->data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ),
-
$attrs =
array(
+ array(
'id' => 'wpCreateaccount',
'name' => 'wpCreateaccount',
'tabindex' => $tabIndex++
'id' => 'wpCreateaccount',
'name' => 'wpCreateaccount',
'tabindex' => $tabIndex++