X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fget_logged_in.html;h=7287f0500177a60980fd962b870fbafe615023c6;hb=702510bb9567507cf346b00955c0c9ba042a3e0b;hp=3648eee1790d8b9854939ce4aca5a4b268030fe2;hpb=7e6ca72a12c831b14984f03d294c2e7877b5f02c;p=citadel.git

diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index 3648eee17..7287f0500 100644
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -6,7 +6,7 @@
 </div>
 <div id="loginbox_closebutton">
 <a href="javascript:toggleModal(0);">
-<?_("Close window")>&nbsp;<img src="static/closewindow.gif" border="0"></a>
+<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></a>
 </div>
 </div>
 <br><br>
@@ -14,15 +14,21 @@
 <div id="auth_container">
 <div id="authbar">
 <ul id="button">
-<li class="ib_button" style='background-image: url("/static/citadel-button-32x32.gif");'>
+<li class="ib_button" style='background-image: url("/static/webcit_icons/citadel-button-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_userpass');" title="<?SERV:HUMANNODE>"><span>
         <?SERV:HUMANNODE>
     </span></a>
 </li>
-<li class="ib_button" style='background-image: url("/static/openid-32x32.gif");'>
+<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/webcit_icons/openid-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>
+</li><??("X", 1)>
+<??("COND:SERV:OPENID",2)>
+<li class="ib_button">
+</li>
+</li><??("X", 2)>
+<li class="ib_button">
 </li>
 <li class="ib_button">
 </li>
@@ -38,22 +44,38 @@
 <div class="authbox" id="authbox_userpass" style="display: block">
 <h2><?_("Log in using a user name and password")></h2>
 <form id="ajax_username_password_form" method="POST" action="ajax_login_username_password">
-<?_("User name:")>
-<input type="text" name="name" id="uname">
+<label for="uname"><?_("User name:")></label>
+<input type="text" name="name" id="uname" onKeyPress="username_and_password_onkeypress(event);">
+<br><br>
+<label for="pname"><?_("Password:")></label>
+<input type="password" name="pass" id="pname" onKeyPress="username_and_password_onkeypress(event);">
+<br><br>
+</form>
+<div class="logbuttons"><a href="javascript:ajax_try_username_and_password();"><?_("Log in")></a></div>
+<div class="registernow"><a href="javascript:authtoggle('authbox_newuser');"><?_("New user?  Register now")></a></div>
+</div>
+
+<div class="authbox" id="authbox_newuser" style="display: none">
+<h2><?_("New user?  Register now")></h2>
+<?_("enter the name and password you wish to use, and click &quot;New User.&quot; ")><br><br>
+<form id="ajax_newuser_form" method="POST" action="ajax_login_newuser">
+<label for="uname"><?_("User name:")></label>
+<input type="text" name="name" id="uname" onKeyPress="newuser_onkeypress(event);">
 <br><br>
-<?_("Password:")>
-<input type="password" name="pass" id="pname">
+<label for="pname"><?_("Password:")></label>
+<input type="password" name="pass" id="pname" onKeyPress="newuser_onkeypress(event);">
 <br><br>
 </form>
-<div class="buttons"><a href="javascript:ajax_try_username_and_password();"><?_("Log in")></a></div>
+<div class="logbuttons"><a href="javascript:ajax_try_newuser();"><?_("New User")></a></div>
 </div>
 
 <div class="authbox" id="authbox_openid" style="display: none">
 <h2><?_("Log in using OpenID")></h2>
 <form id="ajax_openid_form" method="POST" action="ajax_login_openid">
 <?_("OpenID URL:")>
-<input type="text" name="openid_url" id="openid_url" class="openid_urlarea">
+<input type="text" name="openid_url" id="openid_url" class="openid_urlarea" onKeyPress="openid_onkeypress(event);">
 </form>
+<div class="logbuttons"><a href="javascript:ajax_try_openid();"><?_("Log in")></a></div>
 </div>
 
 </div>