From 704cf56a812fcce01f842ff68e952d583db93ced Mon Sep 17 00:00:00 2001
From: Thierry Pasqualier <thierry@uncensored.citadel.org>
Date: Thu, 18 Jan 2007 23:08:23 +0000
Subject: [PATCH] Change HTML in login screen to improve customization

---
 webcit/gettext.c         |  2 +-
 webcit/static/login.html | 38 +++++++++++++++++---------------------
 webcit/static/webcit.css | 39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/webcit/gettext.c b/webcit/gettext.c
index e4b369202..4526bfcdf 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -195,7 +195,7 @@ void httplang_to_locale(char *LocaleString)
 void offer_languages(void) {
 	int i;
 
-	wprintf("<select name=\"language\" size=\"1\">\n");
+	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
 	for (i=0; i < NUM_LANGS; ++i) {
 		wprintf("<option %s value=%s>%s</option>\n",
diff --git a/webcit/static/login.html b/webcit/static/login.html
index 369c74939..2db76382f 100644
--- a/webcit/static/login.html
+++ b/webcit/static/login.html
@@ -1,25 +1,21 @@
 <?=beginbox>
-<div class="login_message"><?MESG></div>
 <div class="login_hello"><?HELLO></div>
-<div class="login_form">
-	<form action="login" method="POST">
-	<table border="0" cellspacing="5" cellpadding="5">
-		<tr><td><?USERNAME_BOX></td>
-		<td><input type="text" name="name" maxlength="25"></td></tr>
-		<tr><td><?PASSWORD_BOX></td>
-		<td><input type="password" name="pass" maxlength="20"></td></tr>
-		<tr><td><?LANGUAGE_BOX></td>
-		<td><?DO_LANGUAGE_BOX></td></tr>
-
-	<tr><td align=center colspan=2>
-	<input type="submit" name="login_action" value="<?LOGIN_BUTTON>">
-	<?NEWUSER_BUTTON_PRE>
-	<input type="submit" name="newuser_action" value="<?NEWUSER_BUTTON>">
-	<?NEWUSER_BUTTON_POST>
-	<input type="submit" name="exit_action" value="<?EXIT_BUTTON>">
-	</td></tr>
-	</table>
-	</form>
-</div>
+<div class="login_message"><?MESG></div>
+<form action="login" method="POST"  class="login_form">
+        <label for="uname"><?USERNAME_BOX></label>
+        <input type="text" name="name" id="uname" class="name" > <br>
+        <label for="pname"><?PASSWORD_BOX></label>
+        <input type="password" name="pass" id="pname" class="name" > <br>
+        <label for="lname"><?LANGUAGE_BOX></label>
+        <?DO_LANGUAGE_BOX> <br>
+        <div class="buttons">
+        <input type="submit" name="login_action" value="<?LOGIN_BUTTON>" class="button">
+        <?NEWUSER_BUTTON_PRE>
+        <input type="submit" name="newuser_action" value="<?NEWUSER_BUTTON>" class="button" >
+        <?NEWUSER_BUTTON_POST>
+        <input type="submit" name="exit_action" value="<?EXIT_BUTTON>"  class="button">
+        <br>
+        </div>
+</form>
 <div class="login_infos"><?LOGIN_INSTRUCTIONS></div>
 <?=endbox>
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index fe23c5ac5..a7be6fbed 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -678,13 +678,50 @@ div.auto_complete ul strong.highlight {
 	font-size: 16px;
 }
 
-.login_form table {
+
+.login_form {
+        display: block;
+        margin-top: 20px;
         margin-left: auto;
         margin-right: auto;
+        margin-bottom: 20px;
+        padding: 6px;
+        width: 290px;
         background-color: #DDDDDD;
 }
 
+.login_form input, .login_form label, .login_form select {
+        display: block;
+        float: left;
+        margin: 6px;
+}
+
+.login_form label {
+        width: 80px;
+        text-align: left;
+}
+
+.login_form input.name {
+        width: 175px;
+        text-align: left;
+}
+
+.login_form br {
+        clear: left;
+}
+
+.login_form .buttons {
+        margin-left: auto;
+        margin-right: auto;
+}
+
+.login_form .button {
+        text-align: center;
+}
+
 .login_infos {
+        display: block;
+        margin-top: 30px;
         margin-left: auto;
         margin-right: auto;
         width: 80% ;
-- 
2.39.2