a8566f2994a868dfe2521ac7fca7529f75cdfa16
chinhli
  Thu May 31 09:55:14 2012 -0700
iFinished new hgSession welcome and account info UI change.
diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index 9d6f5bb..edbc608 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -577,31 +577,31 @@
     "<div class=\"inputGroup\">"
     "<label for=\"password\">Password</label>"
     "<input type=password name=\"hgLogin_password\" value=\"\" size=\"30\" id=\"password\">"
     "</div>"
     "\n"
     "<div class=\"formControls\">"
     "   <input type=\"submit\" name=\"hgLogin.do.displayLogin\" value=\"Login\" class=\"largeButton\">"
     "    &nbsp;<a href=\"javascript:history.go(-1)\">Cancel</a>"
     "</div>"
     "</form>"
     "\n"
     "\n"
     "<div id=\"helpBox\">"
     "<a href=\"hgLogin?hgLogin.do.displayAccHelpPage=1\">Can't access your account?</a><br>"
     "Need an account? <a href=\"hgLogin?hgLogin.do.signupPage=1\">Sign up</a>.<br>"
-    "To change password, click <a href=\"hgLogin?hgLogin.do.changePasswordPage=1\">here</a>."
+//    "To change password, click <a href=\"hgLogin?hgLogin.do.changePasswordPage=1\">here</a>."
     "</div><!-- END - helpBox -->"
     "</div><!-- END - loginBox -->"
     "\n"
     "\n"
     "</body>"
     "</html>", username);
 cartSaveSession(cart);
 }
 
 void activateAccount(struct sqlConnection *conn)
 /* activate account */
 {
 char query[256];
 char *token = cgiUsualString("token", "");
 char *username = cgiUsualString("user","");
@@ -746,31 +746,32 @@
     return;
     }
 char encPwd[45] = "";
 encryptNewPwd(newPassword1, encPwd, sizeof(encPwd));
 safef(query,sizeof(query), "update gbMembers set password='%s' where userName='%s'", sqlEscapeString(encPwd), sqlEscapeString(user));
 sqlUpdate(conn, query);
 clearNewPasswordFields(conn, user);
 
 hPrintf("<h2>UCSC Genome Browser</h2>"
     "<p align=\"left\">"
     "</p>"
     "<h3>Password has been changed.</h3>");
 cartRemove(cart, "hgLogin_password");
 cartRemove(cart, "hgLogin_newPassword1");
 cartRemove(cart, "hgLogin_newPassword2");
-backToDoLoginPage(1);
+// backToDoLoginPage(1);
+returnToURL(1);
 }
 
 void signupPage(struct sqlConnection *conn)
 /* draw the signup page */
 {
 hPrintf("<div id=\"signUpBox\" class=\"centeredContainer formBox\">"
     "<h2>UCSC Genome Browser</h2>"
     "\n"
     "<p>Signing up enables you to save multiple sessions and to share your sessions with others.</p>"
     "Already have an account? <a href=\"hgLogin?hgLogin.do.displayLoginPage=1\">Login</a>.<br>"
     "\n");
 hPrintf("<h3>Sign Up</h3>"
     "<form method=\"post\" action=\"hgLogin\" name=\"mainForm\">"
     "<span style='color:red;'>%s</span>"
     "\n", errMsg ? errMsg : "");