249f4a8dc0c2d606a69d86693178cecb65197067
chinhli
  Wed Apr 25 12:28:26 2012 -0700
Finished Greg's Login UI.
diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index 1e69eee..3426b18 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -722,83 +722,77 @@
 
 
 }
 
 
 /* ----- account login/display functions ---- */
 
 
 void displayLoginPage(struct sqlConnection *conn)
 /* draw the account login page */
 {
 char *username = cartUsualString(cart, "hgLogin_userName", "");
 /* for password security, use cgi hash instead of cart */
 // char *password = cgiUsualString("hgLogin_password", "");
 
+
 hPrintf(
-"<div id=\"hgLoginBox\" class=\"centeredContainer\">\n"
+"<div id=\"loginBox\" class=\"centeredContainer formBox\">"
+"\n"
 "<h2>UCSC Genome Browser</h2>"
 "\n"
-);
-printf(
-"<P>"
-"Signing in enables you to save current settings into a "
-"named session, and then restore settings from the session later.<BR> "
-"If you wish, you can share named sessions with other users. "
-"</P>"
-);
-hPrintf(
+"<h3>Login</h3>"
+"\n"
 "<span style='color:red;'>%s</span>"
+"\n"
 , errMsg ? errMsg : ""
 );
 hPrintf(
-"<h3>Login</h3>"
-"\n"
-"<form method=post action=\"hgLogin\" name=accountLoginForm >"
-"\n");
-hPrintf(
-"<label style=\"display: block; margin-top: 10px;\" " 
-" for=\"userName\">User Name</label>"
-"\n"
-"<input type=text name=\"hgLogin_userName\" value=\"%s\" size=\"30\" id=\"userName\"> <br>"
+"<form method=post action=\"hgLogin\" name=\"accountLoginForm\" id=\"accountLoginForm\">"
 "\n"
-"<label style=\"display: block; margin-top: 10px;\" "
-" for=\"password\">Password</label>"
+"<div class=\"inputGroup\">"
+"<label for=\"userName\">Username</label>"
+"<input type=text name=\"hgLogin_userName\" value=\"%s\" size=\"30\" id=\"userName\">"
+"</div>"
 "\n"
+"<div class=\"inputGroup\">"
+"<label for=\"password\">Password</label>"
 "<input type=password name=\"hgLogin_password\" value=\"\" size=\"30\" id=\"password\">"
+"</div>"
 "\n"
-"<p>"
-"<a href=\"hgLogin?hgLogin.do.lostPasswordPage=1\">Forgot your password?</a><br>"
-"<a href=\"hgLogin?do.signupPage=1\">Need an account</a>?"
-"</p>"
+"<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"
-"<p>"
-"<input type=\"submit\" name=\"hgLogin.do.displayLogin\" value=\"Login\" id=\"loginButton\">"
 "\n"
-// "&nbsp;<a href=\"\" onclick=\"history.go(-1)\">Cancel</a>"
-"&nbsp;<input type=button value=cancel ONCLICK=\"history.go(-1)\"></td></tr>"
-"</p>"
+"<div id=\"helpBox\">"
+"<a href=\"accounthelp.html\">Can't access your account?</a><br>"
+"Need an account? <a href=\"signupScreen.html\">Sign up</a>."
+"</div><!-- END - helpBox -->"
+"</div><!-- END - loginBox -->"
 "\n"
-"</form>"
-"</div><!-- END - hgLoginBox -->"
+"\n"
+"</body>"
+"</html>"
 , username
-//, password
 );
 
 cartSaveSession(cart);
 
-hPrintf("</FORM>");
+
 
 }
 
 
 /******* BEGIN dispalyLogin *************************/
 void displayLogin(struct sqlConnection *conn)
 /* display user account info */
 {
 struct sqlResult *sr;
 char **row;
 char query[256];
 char *userName = cartUsualString(cart, "hgLogin_userName", "");
 if (sameString(userName,""))
     {
     freez(&errMsg);
@@ -1120,23 +1114,23 @@
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
   "hgLogin - administer gsid hiv membership functions - a cgi script\n"
   "usage:\n"
   "   hgLogin\n"
   );
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
 pushCarefulMemHandler(100000000);
 cgiSpoof(&argc, argv);
-htmlSetStyleSheet("userAccount.css");
+htmlSetStyleSheet("/style/userAccounts.css");
 htmlSetStyle(htmlStyleUndecoratedLink);
 htmlSetBgColor(HG_CL_OUTSIDE);
 htmlSetFormClass("accountScreen");
 oldCart = hashNew(10);
 cartHtmlShell("Login - UCSC Genome Browser", doMiddle, hUserCookie(), excludeVars, oldCart);
 return 0;
 }