summaryrefslogtreecommitdiff
path: root/includes/templates/Userlogin.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/templates/Userlogin.php')
-rw-r--r--includes/templates/Userlogin.php49
1 files changed, 19 insertions, 30 deletions
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index ccddfa66..127c30a0 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -28,11 +28,12 @@ class UserloginTemplate extends QuickTemplate {
<form name="userlogin" method="post" action="<?php $this->text('action') ?>">
<h2><?php $this->msg('login') ?></h2>
<p id="userloginlink"><?php $this->html('link') ?></p>
+ <?php $this->html('header'); /* pre-table point for form plugins... */ ?>
<div id="userloginprompt"><?php $this->msgWiki('loginprompt') ?></div>
<?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='right'><label for='wpName1'><?php $this->msg('yourname') ?></label></td>
<td align='left'>
<input type='text' class='loginText' name="wpName" id="wpName1"
tabindex="1"
@@ -40,11 +41,11 @@ class UserloginTemplate extends QuickTemplate {
</td>
</tr>
<tr>
- <td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?>:</label></td>
+ <td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?></label></td>
<td align='left'>
<input type='password' class='loginPassword' name="wpPassword" id="wpPassword1"
tabindex="2"
- value="<?php $this->text('password') ?>" size='20' />
+ value="" size='20' />
</td>
</tr>
<?php if( $this->data['usedomain'] ) {
@@ -54,7 +55,7 @@ class UserloginTemplate extends QuickTemplate {
}
?>
<tr>
- <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+ <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
<td align='left'>
<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
tabindex="3">
@@ -116,7 +117,7 @@ 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='right'><label for='wpName2'><?php $this->msg('yourname') ?></label></td>
<td align='left'>
<input type='text' class='loginText' name="wpName" id="wpName2"
tabindex="1"
@@ -124,11 +125,11 @@ class UsercreateTemplate extends QuickTemplate {
</td>
</tr>
<tr>
- <td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?>:</label></td>
+ <td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td>
<td align='left'>
<input type='password' class='loginPassword' name="wpPassword" id="wpPassword2"
tabindex="2"
- value="<?php $this->text('password') ?>" size='20' />
+ value="" size='20' />
</td>
</tr>
<?php if( $this->data['usedomain'] ) {
@@ -138,7 +139,7 @@ class UsercreateTemplate extends QuickTemplate {
}
?>
<tr>
- <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+ <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
<td align='left'>
<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
tabindex="3">
@@ -148,31 +149,37 @@ class UsercreateTemplate extends QuickTemplate {
</tr>
<?php } ?>
<tr>
- <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?>:</label></td>
+ <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td>
<td align='left'>
<input type='password' class='loginPassword' name="wpRetype" id="wpRetype"
tabindex="4"
- value="<?php $this->text('retype') ?>"
+ value=""
size='20' />
</td>
</tr>
<tr>
<?php if( $this->data['useemail'] ) { ?>
- <td align='right'><label for='wpEmail'><?php $this->msg('youremail') ?></label></td>
+ <td align='right' style='vertical-align: top'><label for='wpEmail'><?php $this->msg('youremail') ?></label></td>
<td align='left'>
<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'); ?>
+ </div>
</td>
<?php } ?>
<?php if( $this->data['userealname'] ) { ?>
</tr>
<tr>
- <td align='right'><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td>
+ <td align='right' style='vertical-align: top'><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td>
<td align='left'>
<input type='text' class='loginText' name="wpRealName" id="wpRealName"
tabindex="6"
value="<?php $this->text('realname') ?>" size='20' />
+ <div class="prefsectiontip">
+ <?php $this->msgWiki('prefs-help-realname'); ?>
+ </div>
</td>
<?php } ?>
</tr>
@@ -200,24 +207,6 @@ class UsercreateTemplate extends QuickTemplate {
</td>
</tr>
</table>
- <?php
-
- if ($this->data['userealname'] || $this->data['useemail']) {
- echo '<div id="login-sectiontip">';
- if ( $this->data['useemail'] ) {
- echo '<div>';
- $this->msgHtml('prefs-help-email');
- echo '</div>';
- }
- if ( $this->data['userealname'] ) {
- echo '<div>';
- $this->msgHtml('prefs-help-realname');
- echo '</div>';
- }
- echo '</div>';
- }
-
- ?>
<?php if( @$this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
</form>
</div>