X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Flogin.html;h=96beced84490f634854b35da11fe95ec3377c80d;hb=86a1d535af8c52cc9536b03b707eed2d8674da31;hp=0dddc2daa3f5571e7c7649de446d33fb97ecde1d;hpb=3b930a310e74bda0a89c86ddf8094cbc9352652b;p=citadel.git

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 0dddc2daa..96beced84 100644
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -1,49 +1,23 @@
 <?=("head")>
+<!-- start login.html -->
 <div id="login_screen">
-<div class="box">
-<div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")> <a href="http://www.citadel.org">Citadel</a></div>
-<div class="boxcontent">
-<?SERV:MESG("hello")>
-
-<?!("COND:IMPMSG", 1)>
-<div class="login_message"><?IMPORTANTMESSAGE></div>
-<?!("X", 1)>
-
-<div class="login_message"></div>
-<form action="login" method="POST"  class="box" id="login_form">
-        <label for="uname"><?_("User name:")></label>
-        <input type="text" name="name" id="uname" > <br>
-        <label for="pname"><?_("Password:")></label>
-        <input type="password" name="pass" id="pname" > <br>
-        <label for="lname"><?_("Language:")></label>
-        <?LANG:SELECT> <br>
-        <div class="logbuttons">
-        <input type="submit" name="login_action" value="<?_("Login")>" class="logbutton">
-	<??("COND:SERV:NEWU", 1)>
-        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
-	<??("X", 1)>
-	<?!("COND:SERV:NEWU", 2)>
-        <div style="display:none;">
-        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
-        </div>
-	<??("X", 2)>
-        <input type="submit" name="exit_action" value="<?_("Exit")>"  class="logbutton">
-        <br>
-        </div>
-</form>
-<??("COND:SERV:OPENID", 3)>
-  <div align=center>
-  <a href="display_openid_login">
-  <img src="static/openid-small.gif" border="0" valign="middle">
-  <?_("Log in using OpenID")></a>
-  </div>
-<??("X", 3)>
-<div class="login_image"><img src="image&name=hello"></div>
-<div class="login_infos">
-<ul><li><b><?_("If you already have an account on")> <?SERV:HUMANNODE></b>,
-<?_("enter your user name and password and click &quot;Login.&quot;<li><b>If you are a new user</b>, enter the name and password you wish to use, and click &quot;New User.&quot; <li>Please log off properly when finished. <li>You must use a browser that supports <i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")>
-<br /> </ul>
- 
-</div>
-<?=("endbox")>
+		<div class="box">
+			<div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")>
+				<a href="http://www.citadel.org">Citadel</a>
+			</div>
+			<div class="boxcontent">
+				<div id="hellomsg"><?SERV:MESG("hello")></div>
+				<?!("COND:IMPMSG", 1)>
+					<div class="login_message"><?IMPORTANTMESSAGE></div>
+				<?!("X", 1)>
+				<div class="login_image"><img src="image?name=hello" alt=""></div>
+				<span class="logbuttons">
+					<a href="javascript:GetLoggedInFirst('do_welcome');"><?_("Log in")></a>
+				</span>
+			</div>
+		</div>
+<!-- end login.html -->
+<script type="text/javascript">
+	GetLoggedInFirst('do_welcome');
+</script>
 <?=("trailing")>