8100ffb739545f127794dc6a18fc56c0e3b456f1
chinhli
  Thu Apr 5 10:43:14 2012 -0700
Finish cancel button to go back to previous page.
diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index 9601dd3..57568f9 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -212,31 +212,31 @@
 
 void lostPasswordPage(struct sqlConnection *conn)
 /* draw the lost password page */
 {
 hPrintf(
 "<h2>UCSC Genome Browser</h2>"
 "<p align=\"left\">"
 "</p>"
 "<span style='color:red;'>%s</span>"
 "<h3>Send Me A New Password</h3>"
 "<form method=post action=\"hgLogin\" name=lostPasswordForm >"
 "<table>"
 "<tr><td>E-mail</td><td><input type=text name=hgLogin_email size=20> "
   "(your e-mail is also your user-id)</td></tr>"
 "<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.lostPassword value=submit>"
-"&nbsp;<input type=submit name=hgLogin.do.signupPage value=cancel></td></tr>"
+"&nbsp;<input type=button value=cancel ONCLICK=\"history.go(-1)\"></td></tr>"
 "</table>"
 "<br>"
 , errMsg ? errMsg : ""
 );
 
 cartSaveSession(cart);
 
 hPrintf("</FORM>");
 
 }
 
 
 void lostPassword(struct sqlConnection *conn)
 /* process the lost password form */
 {
@@ -303,31 +303,31 @@
 /* change password page */
 {
 hPrintf(
 "<h2>UCSC Genome Browser</h2>"
 "<p align=\"left\">"
 "</p>"
 "<span style='color:red;'>%s</span>"
 "<h3>Change Password</h3>"
 "<form method=post action=\"hgLogin\" name=changePasswordForm >"
 "<table>"
 "<tr><td>E-mail</td><td><input type=text name=hgLogin_email size=20 value=\"%s\"> "
   "(your e-mail is also your user-id)</td></tr>"
 "<tr><td>Current Password</td><td><input type=password name=hgLogin_password value=\"\" size=10></td></tr>\n"
 "<tr><td>New Password</td><td><input type=password name=hgLogin_newPassword value=\"\" size=10></td></tr>\n"
 "<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.changePassword value=submit>"
-"&nbsp;<input type=submit name=hgLogin.do.signupPage value=cancel></td></tr>"
+"&nbsp;<input type=button value=cancel ONCLICK=\"history.go(-1)\"></td></tr>"
 "</table>"
 "<br>"
 , errMsg ? errMsg : ""
 , cartUsualString(cart, "hgLogin_email", "")
 );
 
 cartSaveSession(cart);
 
 hPrintf("</FORM>");
 
 }
 
 void changePassword(struct sqlConnection *conn)
 /* process the change password form */
 {
@@ -428,31 +428,32 @@
 "Academic and non-profit researchers get a substantial discount. <br>\n"
 "<br>\n"
 "If you are already a member, click <a href=https://%s/>here</a> to access UCSC Genome Browser.<br>\n"
 "To view your existing account, click <a href=\"hgLogin?hgLogin.do.displayUserInfo=1\">here</a>.<br>\n"
 "To change your password, click <a href=\"hgLogin?hgLogin.do.changePasswordPage=1\">here</a>.<br>\n"
 "Lost your password? Click <a href=\"hgLogin?hgLogin.do.lostPasswordPage=1\">here</a>.<br>\n"
 "<span style='color:red;'>%s</span>"
 "<h3>Sign up</h3>\n"
 "<form method=post action=\"hgLogin\" name=mainForm >\n"
 "NOTE: Your e-mail is also your user-id.\n"
 "<table>\n"
 "<tr><td>Name</td><td><input type=text name=hgLogin_user value=\"%s\" size=20></td></tr>\n"
 "<tr><td>E-mail</td><td><input type=text name=hgLogin_email value=\"%s\"size=20>\n"
 "<tr><td>Password</td><td><input type=password name=hgLogin_password value=\"%s\" size=10></td></tr>\n"
 "<tr><td>Real name (optional)</td><td><input type=text name=hgLogin_realName value=\"%s\" size=20></td></tr>\n"
-"<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.signup value=submit></td></tr>\n"
+"<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.signup value=submit>"
+"&nbsp;<input type=button value=cancel ONCLICK=\"history.go(-1)\"></td></tr>\n"
 "</table>\n"
 "<br>\n"
 , getenv("HTTP_HOST")
 , errMsg ? errMsg : ""
 , cartUsualString(cart, "hgLogin_user", "")
 , cartUsualString(cart, "hgLogin_email", "")
 , cartUsualString(cart, "hgLogin_password", "")
 , cartUsualString(cart, "hgLogin_realName", "")
 );
 
 
 cartSaveSession(cart);
 
 hPrintf("</FORM>");
 
@@ -533,49 +534,52 @@
 
 hPrintf(
 "Click <a href=hgLogin?hgLogin.do.signupPage=1>here</a> to return.<br>\n"
 );
 
 
 }
 
 
 /* ----- account login/display functions ---- */
 
 
 void displayLoginPage(struct sqlConnection *conn)
 /* draw the account login page */
 {
-char *email = cartUsualString(cart, "hgLogin_email", "");
+char *username = cartUsualString(cart, "hgLogin_userName", "");
 /* for password security, use cgi hash instead of cart */
 char *password = cgiUsualString("hgLogin_password", "");
 hPrintf(
 "<h2>UCSC Genome Browser</h2>"
 "<p align=\"left\">"
 "</p>"
 "<span style='color:red;'>%s</span>"
-"<h3>Account Login</h3>"
+"<h3>Login</h3>"
 "<form method=post action=\"hgLogin\" name=accountLoginForm >"
 "<table>"
 "<tr><td>User Name</td><td><input type=text name=hgLogin_userName value=\"%s\" size=20> <BR> "
-"<tr><td>Password</td><td><input type=password name=hgLogin_password value=\"%s\" size=10></td></tr><BR>"
-"<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.displayLogin value=submit>"
-"&nbsp;<input type=submit name=hgLogin.do.signupPage value=cancel></td></tr>"
+"<tr><td>Password</td><td><input type=password name=hgLogin_password value=\"%s\" size=20></td></tr><BR>"
+"</table>"
+"<p><a href=\"hgLogin?hgLogin.do.lostPasswordPage=1\">Forgot</a> your password?  <a href=\"hgLogin?do.signupPage=1\">Need an account</a>?</p>"
+"<table>"
+"<tr><td>&nbsp;</td><td><input type=submit name=hgLogin.do.displayLogin value=login>\n"
+"&nbsp;<input type=button value=cancel ONCLICK=\"history.go(-1)\"></td></tr>"
 "</table>"
 "<BR>"
 , errMsg ? errMsg : ""
-, email
+, username
 , password
 );
 
 cartSaveSession(cart);
 
 hPrintf("</FORM>");
 
 }
 
 
 /******* BEGIN dispalyLogin *************************/
 void displayLogin(struct sqlConnection *conn)
 /* display user account info */
 {
 struct sqlResult *sr;