Get the public forms consistent

sections/login/recover_step1.php

@@ -24,7 +24,7 @@ if (empty($Sent) || (!empty($Sent) && $Sent != 1)) {
       </td>
       </tr>
       <tr>
-        <td colspan="2" align="right"><input type="submit" name="reset" value="Reset!" class="submit" /></td>
+        <td colspan="2" align="right"><input type="submit" name="reset" value="Reset" class="submit" /></td>
       </tr>
     </table>
 <?php

sections/login/recover_step2.php

@@ -1,38 +1,46 @@
-<?
+<?php
 View::show_header('Recover Password');
 ?>
-<script src="<?=(STATIC_SERVER)?>functions/validate.js" type="text/javascript"></script>
-<script src="<?=(STATIC_SERVER)?>functions/password_validate.js" type="text/javascript"></script>
+<script src="<?=(STATIC_SERVER)?>functions/validate.js" type="text/javascript">
+</script>
+<script src="<?=(STATIC_SERVER)?>functions/password_validate.js"
+  type="text/javascript"></script>
 <form class="auth_form" name="recovery" id="recoverform" method="post" action="" onsubmit="return formVal();">
-  <input type="hidden" name="key" value="<?=display_str($_REQUEST['key'])?>" />
-  <div style="width: 500px;">
-    <span class="titletext">Reset your password - Final Step</span><br /><br />
-<?
+  <input type="hidden" name="key"
+    value="<?=display_str($_REQUEST['key'])?>" />
+  <div style="width: 250px;">
+    <p class="titletext">Reset Your Password</p>
+    <?php
 if (empty($PassWasReset)) {
-  if (!empty($Err)) {
-?>
+    if (!empty($Err)) {
+        ?>
     <strong class="important_text"><?=display_str($Err)?></strong><br /><br />
-<?  } ?> Any password 6 characters or longer is accepted, but a strong password is 8 characters or longer, contains at least 1 lowercase and uppercase letter, and contains at least a number or symbol.<br /><br />
+    <?php
+    } ?>
+    <p>Any password 6 characters or longer is accepted, but a strong password is 8 characters or longer, contains at
+      least 1 lowercase and uppercase letter, and contains at least a number or symbol.</p>
     <table class="layout">
       <tr>
         <td><strong id="pass_strength"></strong></td>
-        <td><input type="password" name="password" id="new_pass_1" class="inputtext" size="40" placeholder="New password" pattern=".{6,307200}" required></td>
+        <td><input type="password" name="password" id="new_pass_1" class="inputtext" size="40"
+            placeholder="New Password" pattern=".{6,307200}" required></td>
       </tr>
       <tr>
         <td><strong id="pass_match"></strong></td>
-        <td><input type="password" name="verifypassword" id="new_pass_2" class="inputtext" size="40" placeholder="Confirm password" pattern=".{6,307200}" required></td>
+        <td><input type="password" name="verifypassword" id="new_pass_2" class="inputtext" size="40"
+            placeholder="Confirm Password" pattern=".{6,307200}" required></td>
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" name="reset" value="Reset!" class="submit"></td>
+        <td><input type="submit" name="reset" value="Reset" class="submit"></td>
       </tr>
     </table>
-<? } else { ?>
-    Your password has been successfully reset.<br />
-    Please <a href="login.php">click here</a> to log in using your new password.
-<? } ?>
+    <?php
+} else { ?>
+    <p>Your password has been successfully reset.</p>
+    <p>Please <a href="login.php">click here</a> to log in using your new password.</p>
+    <?php } ?>
   </div>
 </form>
-<?
+<?php
 View::show_footer(['recover' => true]);
-?>

sections/register/step1.php

@@ -1,85 +1,99 @@
-<?
+<?php
 View::show_header('Register');
 echo $Val->GenerateJS('registerform');
 ?>
-<script src="<?=STATIC_SERVER?>functions/validate.js" type="text/javascript"></script>
-<script src="<?=STATIC_SERVER?>functions/password_validate.js" type="text/javascript"></script>
+<script src="<?=STATIC_SERVER?>functions/validate.js" type="text/javascript">
+</script>
+<script src="<?=STATIC_SERVER?>functions/password_validate.js"
+  type="text/javascript"></script>
 <form class="create_form" name="user" id="registerform" method="post" action="" onsubmit="return formVal();">
-<div style="width: 500px;">
-  <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-<?
+  <div style="width: 250px;">
+    <input type="hidden" name="auth"
+      value="<?=$LoggedUser['AuthKey']?>" />
+    <?php
 
 if (empty($Sent)) {
-  if (!empty($_REQUEST['invite'])) {
-    echo '<input type="hidden" name="invite" value="'.display_str($_REQUEST['invite']).'" />'."\n";
-  }
-  if (!empty($Err)) {
-?>
-  <strong class="important_text"><?=$Err?></strong><br /><br />
-<?  } ?>
-  <table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
-    <tr valign="top">
-      <td align="right" style="width: 100px;">Username&nbsp;</td>
-      <td align="left">
-        <input type="text" name="username" id="username" class="inputtext" placeholder="Username" value="<?=(!empty($_REQUEST['username']) ? display_str($_REQUEST['username']) : '')?>" />
-        <p>Use common sense when choosing your username. <strong>Do not choose a username that can be associated with your real name.</strong> If you do so, we will not be changing it for you.</p>
-      </td>
-    </tr>
-    <tr valign="top">
-      <td align="right">Email Address&nbsp;</td>
-      <td align="left">
-        <input type="email" name="email" id="email" class="inputtext" placeholder="Email" value="<?=(!empty($_REQUEST['email']) ? display_str($_REQUEST['email']) : (!empty($InviteEmail) ? display_str($InviteEmail) : ''))?>" />
-      </td>
-    </tr>
-    <tr valign="top">
-      <td align="right">Password&nbsp;</td>
-      <td align="left">
-        <input type="password" name="password" id="new_pass_1" class="inputtext" placeholder="Password" /> <strong id="pass_strength"></strong>
-      </td>
-    </tr>
-    <tr valign="top">
-      <td align="right">Verify Password&nbsp;</td>
-      <td align="left">
-        <input type="password" name="confirm_password" id="new_pass_2" class="inputtext" placeholder="Verify Password" /> <strong id="pass_match"></strong>
-        <p>An acceptable password is 6 characters or longer (please make it longer)</p>
-      </td>
-    </tr>
-    <tr valign="top">
-      <td></td>
-      <td align="left">
-        <input type="checkbox" name="readrules" id="readrules" value="1"<? if (!empty($_REQUEST['readrules'])) { ?> checked="checked"<? } ?> />
-        <label for="readrules">I will read the rules</label>
-      </td>
-    </tr>
-    <tr valign="top">
-      <td></td>
-      <td align="left">
-        <input type="checkbox" name="readwiki" id="readwiki" value="1"<? if (!empty($_REQUEST['readwiki'])) { ?> checked="checked"<? } ?> />
-        <label for="readwiki">I will read the wiki</label>
-      </td>
-    </tr>
-    <tr valign="top">
-      <td></td>
-      <td align="left">
-        <input type="checkbox" name="agereq" id="agereq" value="1"<? if (!empty($_REQUEST['agereq'])) { ?> checked="checked"<? } ?> />
-        <label for="agereq">I am 18 years of age or older</label>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" height="10"></td>
-    </tr>
-    <tr>
-      <td colspan="2" align="right"><input type="submit" name="submit" value="Submit" class="submit" /></td>
-    </tr>
-  </table>
-<? } else { ?>
-  An email has been sent to the address that you provided. After you confirm your email address, you will be able to log into your account.
+    if (!empty($_REQUEST['invite'])) {
+        echo '<input type="hidden" name="invite" value="'.display_str($_REQUEST['invite']).'" />'."\n";
+    }
+    if (!empty($Err)) {
+        ?>
+    <strong class="important_text"><?=$Err?></strong><br /><br />
+    <?php
+    } ?>
+    <table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
+      <tr valign="top">
+        <!-- <td align="right" style="width: 100px;">Username&nbsp;</td> -->
+        <td align="left">
+          <input type="text" name="username" id="username" class="inputtext" placeholder="Username"
+            value="<?=(!empty($_REQUEST['username']) ? display_str($_REQUEST['username']) : '')?>" />
+          <p>Use common sense when choosing your username. <strong>Do not choose a username that can be associated with
+              your real name.</strong> If you do so, we will not be changing it for you.</p>
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td align="right">Email Address&nbsp;</td> -->
+        <td align="left">
+          <input type="email" name="email" id="email" class="inputtext" placeholder="Email"
+            value="<?=(!empty($_REQUEST['email']) ? display_str($_REQUEST['email']) : (!empty($InviteEmail) ? display_str($InviteEmail) : ''))?>" />
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td align="right">Password&nbsp;</td> -->
+        <td align="left">
+          <input type="password" name="password" id="new_pass_1" class="inputtext" placeholder="Password" /> <strong
+            id="pass_strength"></strong>
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td align="right">Verify Password&nbsp;</td> -->
+        <td align="left">
+          <input type="password" name="confirm_password" id="new_pass_2" class="inputtext"
+            placeholder="Confirm Password" /> <strong id="pass_match"></strong>
+          <p>An acceptable password is 6 characters or longer (please make it longer).</p>
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td></td> -->
+        <td align="left">
+          <input type="checkbox" name="readrules" id="readrules" value="1" <?php if (!empty($_REQUEST['readrules'])) { ?>
+          checked="checked"<?php } ?> />
+          <label for="readrules">I will read the rules</label>
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td></td> -->
+        <td align="left">
+          <input type="checkbox" name="readwiki" id="readwiki" value="1" <?php if (!empty($_REQUEST['readwiki'])) { ?>
+          checked="checked"<?php } ?> />
+          <label for="readwiki">I will read the wiki</label>
+        </td>
+      </tr>
+      <tr valign="top">
+        <!-- <td></td> -->
+        <td align="left">
+          <input type="checkbox" name="agereq" id="agereq" value="1" <?php if (!empty($_REQUEST['agereq'])) { ?>
+          checked="checked"<?php } ?> />
+          <label for="agereq">I am 18 years of age or older</label>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" height="10"></td>
+      </tr>
+      <tr>
+        <td colspan="2" align="right"><input type="submit" name="submit" value="Submit" class="submit" /></td>
+      </tr>
+    </table>
+    <?php
+} else { ?>
+    <p>An email has been sent to the address that you provided. After you confirm your email address, you will be able
+      to log into your account.</p>
 
-<?  if ($NewInstall) {
-      echo "Since this is a new installation, you can log in directly without having to confirm your account.";
+    <?php  if ($NewInstall) {
+        echo "Since this is a new installation, you can log in directly without having to confirm your account.";
     }
 } ?>
-</div>
+  </div>
 </form>
-<?
+<?php
 View::show_footer();

sections/register/step2.php

@@ -1,10 +1,11 @@
-<?
+<?php
 View::show_header('Registration Complete');
 ?>
-<div style="width: 500px;">
-  <strong>Congratulations! Your account has been created.</strong><br />
-  You can now log into your account using the <a href="login.php">login page</a>.
+
+<div style="width: 250px;">
+  <p><strong>Congratulations! Your account has been created.</strong></p>
+  <p>You can now log into your account using the <a href="login.php">login page</a>.</p>
 </div>
-<?
+
+<?php
 View::show_footer();
-?>

static/styles/public/style.css

@@ -67,7 +67,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
   border-radius: 5px 5px 0 0;
 }
 
-#loginform input[type="submit"], #recoverform input[type="submit"] {
+#loginform input[type="submit"], #recoverform input[type="submit"], input[type="submit"] {
   width: 100%;
   background-color: #fbe180;
   font: 500 14px/29px Helvetica, Arial, sans-serif;
@@ -75,7 +75,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
   border-radius: 0 0 5px 5px;
   cursor: pointer;
 }
-#loginform input[type="submit"]:hover, #recoverform input[type="submit"]:hover {
+#loginform input[type="submit"]:hover, #recoverform input[type="submit"]:hover, input[type="submit"]:hover {
   background-color: #fff9c7;
 }