Style Reset Password screen correctly

webapp/_lib/controller/class.PasswordResetController.php

@@ -34,6 +34,7 @@ public function control() {
         $session = new Session();
         $owner_dao = DAOFactory::getDAO('OwnerDAO');
 
+        $this->view_mgr->addHelp('reset', 'userguide/accounts/index');
         $this->setViewTemplate('session.resetpassword.tpl');
         $this->disableCaching();
 

webapp/_lib/view/session.resetpassword.tpl

@@ -1,46 +1,63 @@
 {include file="_header.tpl"}
 {include file="_statusbar.tpl"}
 
-<div class="container_24 thinkup-canvas round-all">
-  <div class="prepend_20" style="padding:20px">
-    <h1>Reset Password</h1>
-  </div>
-  <div class="clearfix prepend_20">
-    <div class="grid_17 prefix_3 left">
+<div class="container_24 thinkup-canvas round-all clearfix" style="margin-top : 30px;">
       {if isset($error_msg)}
-        <div class="error">
+        <div class="grid_18 alert urgent" style="margin-bottom : 20px; margin-left : 100px;">
           {$error_msg}
         </div>
       {/if}
-    </div>
-  </div>
-  <form method="post" action="" class="reset_password">
-    <div class="clearfix">
-      <div class="grid_4 prefix_5 right">
-        <label for="password">
-          New password:
-        </label>
-      </div>
-      <div class="grid_10 left">
-        <input type="password" name="password" id="password">
+      {if isset($success_msg)}
+        <div class="grid_18 alert helpful" style="margin-bottom : 20px; margin-left : 100px;">
+             <p>
+               <span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
+               {$success_msg}
+             </p>
+         </div> 
+      {/if}
+
+{if !isset($error_msg) && !isset($success_msg)}
+<div class="grid_18 section" style="margin-bottom : 100px; margin-left : 100px;">
+    {insert name="help_link" id='reset'}
+
+    <h2>Reset Your Password</h2>
+
+    <div class="article">
+    <form name="form1" method="post" action="" class="login append_20">
+      <div class="clearfix">
+        <div class="grid_6 prefix_2 right">
+            <label for="password">
+              New password:
+            </label>
+        </div>
+        <div class="grid_8 left">
+            <input type="password" name="password" id="password">
+        </div>
       </div>
-    </div>
+      
     <div class="clearfix">
-      <div class="grid_4 prefix_5 right">
+      <div class="grid_6 prefix_2 right">
         <label for="password_confirm">
           Retype password:
         </label>
       </div>
-      <div class="grid_10 left">
+      <div class="grid_8 left">
         <input type="password" name="password_confirm" id="password_confirm">
       </div>
     </div>
-    <div class="clearfix">
-      <div class="grid_10 prefix_9 left">
-        <input type="submit" id="login-save" name="Submit" class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Submit">
+      <div class="clearfix">
+        <div class="grid_10 prefix_9 left">
+          <input type="submit" id="login-save" name="Submit" class="linkbutton emphasized" value="Submit">
+        </div>
       </div>
+    </form>
+    </div>
+    <div class="view-all">
+      <a href="register.php">Register</a> |
+      <a href="login.php">Log In</a>
     </div>
-  </form>
 </div>
+</div>
+{/if}
 
 {include file="_footer.tpl"}