summaryrefslogtreecommitdiff
path: root/includes/templates
diff options
context:
space:
mode:
Diffstat (limited to 'includes/templates')
-rw-r--r--includes/templates/Userlogin.php51
1 files changed, 28 insertions, 23 deletions
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 127c30a0..ac24800a 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -24,6 +24,7 @@ class UserloginTemplate extends QuickTemplate {
<div class="visualClear"></div>
<?php } ?>
+<div id="loginstart"><?php $this->msgWiki( 'loginstart' ); ?></div>
<div id="userloginForm">
<form name="userlogin" method="post" action="<?php $this->text('action') ?>">
<h2><?php $this->msg('login') ?></h2>
@@ -33,16 +34,16 @@ class UserloginTemplate extends QuickTemplate {
<?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
<table>
<tr>
- <td align='right'><label for='wpName1'><?php $this->msg('yourname') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpName1'><?php $this->msg('yourname') ?></label></td>
+ <td class="mw-input">
<input type='text' class='loginText' name="wpName" id="wpName1"
tabindex="1"
value="<?php $this->text('name') ?>" size='20' />
</td>
</tr>
<tr>
- <td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpPassword1'><?php $this->msg('yourpassword') ?></label></td>
+ <td class="mw-input">
<input type='password' class='loginPassword' name="wpPassword" id="wpPassword1"
tabindex="2"
value="" size='20' />
@@ -55,8 +56,8 @@ class UserloginTemplate extends QuickTemplate {
}
?>
<tr>
- <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
- <td align='left'>
+ <td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td>
+ <td class="mw-input">
<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
tabindex="3">
<?php echo $doms ?>
@@ -66,7 +67,7 @@ class UserloginTemplate extends QuickTemplate {
<?php } ?>
<tr>
<td></td>
- <td align='left'>
+ <td class="mw-input">
<input type='checkbox' name="wpRemember"
tabindex="4"
value="1" id="wpRemember"
@@ -76,7 +77,7 @@ class UserloginTemplate extends QuickTemplate {
</tr>
<tr>
<td></td>
- <td align='left' style="white-space:nowrap">
+ <td class="mw-submit">
<input type='submit' name="wpLoginattempt" id="wpLoginattempt" tabindex="5" value="<?php $this->msg('login') ?>" />&nbsp;<?php if( $this->data['useemail'] && $this->data['canreset']) { ?><input type='submit' name="wpMailmypassword" id="wpMailmypassword"
tabindex="6"
value="<?php $this->msg('mailmypassword') ?>" />
@@ -117,16 +118,16 @@ class UsercreateTemplate extends QuickTemplate {
<?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
<table>
<tr>
- <td align='right'><label for='wpName2'><?php $this->msg('yourname') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpName2'><?php $this->msg('yourname') ?></label></td>
+ <td class="mw-input">
<input type='text' class='loginText' name="wpName" id="wpName2"
tabindex="1"
value="<?php $this->text('name') ?>" size='20' />
</td>
</tr>
<tr>
- <td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td>
+ <td class="mw-input">
<input type='password' class='loginPassword' name="wpPassword" id="wpPassword2"
tabindex="2"
value="" size='20' />
@@ -139,8 +140,8 @@ class UsercreateTemplate extends QuickTemplate {
}
?>
<tr>
- <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
- <td align='left'>
+ <td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td>
+ <td class="mw-input">
<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
tabindex="3">
<?php echo $doms ?>
@@ -149,8 +150,8 @@ class UsercreateTemplate extends QuickTemplate {
</tr>
<?php } ?>
<tr>
- <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td>
+ <td class="mw-input">
<input type='password' class='loginPassword' name="wpRetype" id="wpRetype"
tabindex="4"
value=""
@@ -159,21 +160,25 @@ class UsercreateTemplate extends QuickTemplate {
</tr>
<tr>
<?php if( $this->data['useemail'] ) { ?>
- <td align='right' style='vertical-align: top'><label for='wpEmail'><?php $this->msg('youremail') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpEmail'><?php $this->msg('youremail') ?></label></td>
+ <td class="mw-input">
<input type='text' class='loginText' name="wpEmail" id="wpEmail"
tabindex="5"
value="<?php $this->text('email') ?>" size='20' />
<div class="prefsectiontip">
- <?php $this->msgWiki('prefs-help-email'); ?>
+ <?php if( $this->data['emailrequired'] ) {
+ $this->msgWiki('prefs-help-email-required');
+ } else {
+ $this->msgWiki('prefs-help-email');
+ } ?>
</div>
</td>
<?php } ?>
<?php if( $this->data['userealname'] ) { ?>
</tr>
<tr>
- <td align='right' style='vertical-align: top'><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td>
- <td align='left'>
+ <td class="mw-label"><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td>
+ <td class="mw-input">
<input type='text' class='loginText' name="wpRealName" id="wpRealName"
tabindex="6"
value="<?php $this->text('realname') ?>" size='20' />
@@ -185,7 +190,7 @@ class UsercreateTemplate extends QuickTemplate {
</tr>
<tr>
<td></td>
- <td align='left'>
+ <td class="mw-input">
<input type='checkbox' name="wpRemember"
tabindex="7"
value="1" id="wpRemember"
@@ -195,7 +200,7 @@ class UsercreateTemplate extends QuickTemplate {
</tr>
<tr>
<td></td>
- <td align='left'>
+ <td class="mw-submit">
<input type='submit' name="wpCreateaccount" id="wpCreateaccount"
tabindex="8"
value="<?php $this->msg('createaccount') ?>" />