* rework login screen to utilize more modern templating

[citadel.git] / webcit / static / t / login.html

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 495e4919eb435383ff5e8639d05a3f0c2555b926..7afc0edc0fede8c2366bbc9dd5480bbfdaf7a576 100644 (file)
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -1,23 +1,46 @@
-<?=("beginbox")>
-<?HELLO>
-<div class="login_message"><?MESG></div>
+<?=("head")>
+<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)>
+<?IMPORTANTMESSAGE>
+<?!("X", 1)>
+
+<div class="login_message"></div>
 <form action="login" method="POST"  class="box" id="login_form">
-        <label for="uname"><?USERNAME_BOX></label>
+        <label for="uname"><?_("User name:")></label>
         <input type="text" name="name" id="uname" > <br>
-        <label for="pname"><?PASSWORD_BOX></label>
+        <label for="pname"><?_("Password:")></label>
         <input type="password" name="pass" id="pname" > <br>
-        <label for="lname"><?LANGUAGE_BOX></label>
-        <?DO_LANGUAGE_BOX> <br>
+        <label for="lname"><?_("Language:")></label>
+        <?LANG:SELECT> <br>
         <div class="logbuttons">
-        <input type="submit" name="login_action" value="<?LOGIN_BUTTON>" class="logbutton">
-        <?NEWUSER_BUTTON_PRE>
-        <input type="submit" name="newuser_action" value="<?NEWUSER_BUTTON>" class="logbutton" >
-        <?NEWUSER_BUTTON_POST>
-        <input type="submit" name="exit_action" value="<?EXIT_BUTTON>"  class="logbutton">
+        <input type="submit" name="login_action" value="<?_("Login")>" class="logbutton">
+       <??("COND:SERV:NEWU", 1)>
+        <div style="display:none;">
+        <input type="submit" name="newuser_action" value="<?_("New User")>" class="logbutton" >
+        </div>
+       <??("X", 1)>
+        <input type="submit" name="exit_action" value="<?_("Exit")>"  class="logbutton">
         <br>
         </div>
 </form>
-<?OFFER_OPENID_LOGIN>
+<??("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"><?LOGIN_INSTRUCTIONS></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")>
+<?=("trailing")>