* (bug 4298) Include rc_id on enhanced RC singleton diff links for patrolling
[lhc/web/wiklou.git] / includes / templates / Userlogin.php
index 6188d88..aa7eff3 100644 (file)
@@ -15,58 +15,139 @@ require_once( 'includes/SkinTemplate.php' );
  */
 class UserloginTemplate extends QuickTemplate {
        function execute() {
-               if( $this->data['error'] ) {
+               if( $this->data['message'] ) {
 ?>
-       <h2><?php $this->msg('loginerror') ?>:</h2>
-       <p class='error'><?php $this->html('error') ?></p>
-<?php } else { ?>
-       <h2><?php $this->msg('login'      ) ?>:</h2>
-       <?php  $this->msgWiki('loginprompt') ?>
+       <div class="<?php $this->text('messagetype') ?>box">
+               <?php if ( $this->data['messagetype'] == 'error' ) { ?>
+                       <h2><?php $this->msg('loginerror') ?>:</h2>
+               <?php } ?>
+               <?php $this->html('message') ?>
+       </div>
+       <div class="visualClear"></div>
 <?php } ?>
-<form name="userlogin" id="userlogin" method="post" action="<?php $this->text('action') ?>">
-       <table border='0'>
+
+<div id="userloginForm">
+<form name="userlogin" method="post" action="<?php $this->text('action') ?>">
+       <h2><?php $this->msg('login') ?></h2>
+       <p id="userloginlink"><?php $this->html('link') ?></p>
+       <div id="userloginprompt"><?php  $this->msgWiki('loginprompt') ?></div>
+       <table>
                <tr>
-                       <td align='right'><label for='wpName'><?php $this->msg('yourname') ?>:</label></td>
+                       <td align='right'><label for='wpName1'><?php $this->msg('yourname') ?>:</label></td>
                        <td align='left'>
-                               <input tabindex='1' type='text' name="wpName" id="wpName"
+                               <input type='text' class='loginText' name="wpName" id="wpName1"
                                        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'>
+                               <input type='password' class='loginPassword' name="wpPassword" id="wpPassword1"
+                                       value="<?php $this->text('password') ?>" size='20' />
+                       </td>
+               </tr>
+       <?php if( $this->data['usedomain'] ) {
+               $doms = "";
+               foreach( $this->data['domainnames'] as $dom ) {
+                       $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+               }
+       ?>
+               <tr>
+                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+                       <td align='left'>
+                               <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>">
+                                       <?php echo $doms ?>
+                               </select>
+                       </td>
+               </tr>
+       <?php } ?>
+               <tr>
+                       <td></td>
                        <td align='left'>
-                               <input tabindex='3' type='checkbox' name="wpRemember"
+                               <input type='checkbox' name="wpRemember"
                                        value="1" id="wpRemember"
                                        <?php if( $this->data['remember'] ) { ?>checked="checked"<?php } ?>
-                                       /><label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
+                                       /> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
                        </td>
                </tr>
                <tr>
-                       <td align='right'><label for='wpPassword'><?php $this->msg('yourpassword') ?>:</label></td>
+                       <td></td>
+                       <td align='left' style="white-space:nowrap">
+                               <input type='submit' name="wpLoginattempt" id="wpLoginattempt" value="<?php $this->msg('login') ?>" />&nbsp;<?php if( $this->data['useemail'] ) { ?><input type='submit' name="wpMailmypassword" id="wpMailmypassword"
+                                                                       value="<?php $this->msg('mailmypassword') ?>" />
+                               <?php } ?>
+                       </td>
+               </tr>
+       </table>
+</form>
+</div>
+<div id="loginend"><?php $this->msgWiki( 'loginend' ); ?></div>
+<?php
+
+       }
+}
+
+class UsercreateTemplate extends QuickTemplate {
+       function execute() {
+               if( $this->data['message'] ) {
+?>
+       <div class="<?php $this->text('messagetype') ?>box">
+               <?php if ( $this->data['messagetype'] == 'error' ) { ?>
+                       <h2><?php $this->msg('loginerror') ?>:</h2>
+               <?php } ?>
+               <?php $this->html('message') ?>
+       </div>
+       <div class="visualClear"></div>
+<?php } ?>
+<div id="userlogin">
+
+<?php if( $this->data['create'] ) { ?>
+<form name="userlogin2" id="userlogin2" method="post" action="<?php $this->text('action') ?>">
+       <h2><?php $this->msg('createaccount') ?></h2>
+       <p id="userloginlink"><?php $this->html('link') ?></p>
+       <table>
+               <tr>
+                       <td align='right'><label for='wpName2'><?php $this->msg('yourname') ?>:</label></td>
                        <td align='left'>
-                               <input tabindex='2' type='password' name="wpPassword" id="wpPassword"
-                                       value="<?php $this->text('password') ?>" size='20' />
+                               <input type='text' class='loginText' name="wpName" id="wpName2"
+                                       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'>
-                               <input tabindex='4' type='submit' name="wpLoginattempt"
-                                       value="<?php $this->msg('login') ?>" />
+                               <input type='password' class='loginPassword' name="wpPassword" id="wpPassword2"
+                                       value="<?php $this->text('password') ?>" size='20' />
                        </td>
                </tr>
-       <?php if( $this->data['create'] ) { ?>
+       <?php if( $this->data['usedomain'] ) {
+               $doms = "";
+               foreach( $this->data['domainnames'] as $dom ) {
+                       $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+               }
+       ?>
                <tr>
-                       <td colspan='3'>&nbsp;</td>
+                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+                       <td align='left'>
+                               <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>">
+                                       <?php echo $doms ?>
+                               </select>
+                       </td>
                </tr>
+       <?php } ?>
                <tr>
                        <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?>:</label></td>
                        <td align='left'>
-                               <input tabindex='5' type='password' name="wpRetype" id="wpRetype"
+                               <input type='password' class='loginPassword' name="wpRetype" id="wpRetype"
                                        value="<?php $this->text('retype') ?>" 
                                        size='20' />
                        </td>
-                       <td><?php $this->msg('newusersonly') ?></td>
                </tr>
                <tr>
                        <?php if( $this->data['useemail'] ) { ?>
                                <td align='right'><label for='wpEmail'><?php $this->msg('youremail') ?>:</label></td>
                                <td align='left'>
-                                       <input tabindex='7' type='text' name="wpEmail" id="wpEmail"
+                                       <input type='text' class='loginText' name="wpEmail" id="wpEmail"
                                                value="<?php $this->text('email') ?>" size='20' />
                                </td>
                        <?php } ?>
@@ -75,39 +156,48 @@ class UserloginTemplate extends QuickTemplate {
                                <tr>
                                        <td align='right'><label for='wpRealName'><?php $this->msg('yourrealname') ?>:</label></td>
                                        <td align='left'>
-                                               <input tabindex='8' type='text' name="wpRealName" id="wpRealName"
+                                               <input type='text' class='loginText' name="wpRealName" id="wpRealName"
                                                        value="<?php $this->text('realname') ?>" size='20' />
                                        </td>
                        <?php } ?>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td align='left'>
+                               <input type='checkbox' name="wpRemember"
+                                       value="1" id="wpRemember"
+                                       <?php if( $this->data['remember'] ) { ?>checked="checked"<?php } ?>
+                                       /> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
+                       </td>
+               </tr>
+               <tr>
+                       <td></td>
                        <td align='left'>
-                               <input tabindex='9' type='submit' name="wpCreateaccount"
+                               <input type='submit' name="wpCreateaccount" id="wpCreateaccount"
                                        value="<?php $this->msg('createaccount') ?>" />
                                <?php if( $this->data['createemail'] ) { ?>
-                               <input tabindex='6' type='submit' name="wpCreateaccountMail"
+                               <input type='submit' name="wpCreateaccountMail" id="wpCreateaccountMail"
                                        value="<?php $this->msg('createaccountmail') ?>" />
                                <?php } ?>
                        </td>
                </tr>
        <?php } ?>
-       <?php if( $this->data['useemail'] ) { ?>
-               <tr>
-                       <td colspan='3'>&nbsp;</td>
-               </tr>
-               <tr>
-                       <td colspan='3' align='left'>
-                               <p>
-                                       <?php $this->msgHtml( 'emailforlost' ) ?><br />
-                                       <input tabindex='10' type='submit' name="wpMailmypassword"
-                                               value="<?php $this->msg('mailmypassword') ?>" />
-                               </p>
-                       </td>
-               </tr>
-       <?php } ?>
        </table>
+       <?php
+               
+               if( $this->data['useemail'] ) {
+                       echo '<div id="login-emailforlost">';
+                       $this->msgHtml( 'emailforlost' );
+                       echo '</div>';
+               }
+
+       ?>
 </form>
+</div>
+<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div>
 <?php
-               $this->msgWiki( 'loginend' );
+
        }
 }
 
-?>
\ No newline at end of file
+?>