From aa62201ed9018fa6150ebc69213a6c9e4afadb9e Mon Sep 17 00:00:00 2001
From: Thierry Pasqualier <thierry@uncensored.citadel.org>
Date: Tue, 28 Aug 2007 22:00:04 +0000
Subject: [PATCH] Advanced menu items - clean HTML/CSS code - display in the
 current room screen

---
 webcit/auth.c                 | 49 ++++++++++++++---------------------
 webcit/graphics.c             | 40 ++++++++++++----------------
 webcit/po/fr.po               |  2 +-
 webcit/preferences.c          | 11 ++++----
 webcit/static/roombanner.html |  6 ++---
 webcit/static/webcit.css      | 10 +++----
 webcit/sysmsgs.c              | 16 +++++-------
 webcit/vcard_edit.c           | 19 ++++++--------
 8 files changed, 65 insertions(+), 88 deletions(-)

diff --git a/webcit/auth.c b/webcit/auth.c
index 0a64641a2..f7a35c780 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -463,27 +463,17 @@ void display_changepw(void)
 {
 	char buf[SIZ];
 
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Change your password"));
-	wprintf("</h1>");
-	wprintf("</div>");
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
+	do_template("beginbox");
 
 	if (!IsEmptyStr(WC->ImportantMessage)) {
-		do_template("beginbox_nt");
-		wprintf("<SPAN CLASS=\"errormsg\">"
-			"%s</SPAN><br />\n", WC->ImportantMessage);
-		do_template("endbox");
+		wprintf("<span class=\"errormsg\">"
+			"%s</span><br />\n", WC->ImportantMessage);
 		safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table class=\"auth_validate\"><tr><td>\n");
-
-	wprintf("<CENTER><br />");
 	serv_puts("MESG changepw");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
@@ -492,24 +482,25 @@ void display_changepw(void)
 
 	wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-	wprintf("<CENTER>"
-		"<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
-		"BGCOLOR=\"#EEEEEE\">"
-		"<TR><TD>");
+	wprintf("<table class=\"altern\" ");
+	wprintf("<tr class=\"even\"><td>");
 	wprintf(_("Enter new password:"));
-	wprintf("</TD>\n");
-	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-	wprintf("<TR><TD>");
+	wprintf("</td><td>");
+	wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wprintf("<tr class=\"odd\"><td>");
 	wprintf(_("Enter it again to confirm:"));
-	wprintf("</TD>\n");
-	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
+	wprintf("</td><td>");
+	wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wprintf("</table>\n");
 
-	wprintf("</TABLE><br />\n");
-	wprintf("<INPUT type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+	wprintf("<div class=\"buttons\">\n");
+	wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</form></center>\n");
-	wprintf("</td></tr></table></div>\n");
+	wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+	wprintf("</div>\n");
+	wprintf("</form>\n");
+
+	do_template("endbox");
 	wDumpContent(1);
 }
 
diff --git a/webcit/graphics.c b/webcit/graphics.c
index f040f22cd..6c210e156 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -20,25 +20,16 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 	}
 	output_headers(1, 1, 0, 0, 0, 0);
 
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Image upload"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
-
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table class=\"graphics_background\"><tr><td>\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Image upload"));
+	do_template("beginbox");
 
-	wprintf("<CENTER>\n");
-
-	wprintf("<FORM ENCTYPE=\"multipart/form-data\" action=\"%s\" "
-		"METHOD=\"POST\" NAME=\"graphicsupload\">\n", uplurl);
+	wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
+		"method=\"post\" name=\"graphicsupload\">\n", uplurl);
 
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"which_room\" VALUE=\"");
+	wprintf("<input type=\"hidden\" name=\"which_room\" value=\"");
 	urlescputs(bstr("which_room"));
 	wprintf("\">\n");
 
@@ -48,17 +39,18 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 	wprintf("<br /><br />\n");
 
 	wprintf(_("Please select a file to upload:"));
-	wprintf("<br /><br />\n");
-	wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-	wprintf("<br /><br />");
-	wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"upload_button\" VALUE=\"%s\">\n", _("Upload"));
+	wprintf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
+	wprintf("<div class=\"buttons\">");
+	wprintf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"RESET\" VALUE=\"%s\">\n", _("Reset form"));
+	wprintf("<input type=\"reset\" value=\"%s\">\n", _("Reset form"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
-	wprintf("</FORM>\n");
-	wprintf("</CENTER>\n");
-	wprintf("</td></tr></table></div>\n");
+	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+	wprintf("</div>\n");
+	wprintf("</form>\n");
+
+	do_template("endbox");
+
 	wDumpContent(1);
 }
 
diff --git a/webcit/po/fr.po b/webcit/po/fr.po
index 707f8b153..ab90266d8 100644
--- a/webcit/po/fr.po
+++ b/webcit/po/fr.po
@@ -3012,7 +3012,7 @@ msgstr "Modifier l'information du contact"
 
 #: ../vcard_edit.c:199
 msgid "Prefix"
-msgstr "Titre"
+msgstr "Civilité"
 
 #: ../vcard_edit.c:199
 msgid "First"
diff --git a/webcit/preferences.c b/webcit/preferences.c
index 2f1e8ac09..02d410749 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -377,19 +377,18 @@ void display_preferences(void)
 	wprintf("\">");
 	wprintf("</td></tr>");
 
+	/** end table */
+	wprintf("</table>\n");
+
 	/** submit buttons */
-	wprintf("<tr class=\"even buttons\"><td colspan=\"2\">");
+	wprintf("<div class=\"buttons\"> ");
 	wprintf("<input type=\"submit\" name=\"change_button\" value=\"%s\">"
 		"&nbsp;"
 		"<INPUT type=\"submit\" name=\"cancel_button\" value=\"%s\">\n",
 		_("Change"),
 		_("Cancel")
 	);
-	wprintf("</td></tr>");
-
-
-	/** end table */
-	wprintf("</table>\n");
+	wprintf("</div>\n");
 
 	/** end form */
 	wprintf("</form>\n");
diff --git a/webcit/static/roombanner.html b/webcit/static/roombanner.html
index 8f61c3198..2fd4e00a8 100644
--- a/webcit/static/roombanner.html
+++ b/webcit/static/roombanner.html
@@ -3,11 +3,11 @@
 <?ROOMPIC>
 <h1><?ROOMNAME></h1>
 <?ROOMINFO>
+<p class="nummsgs"><?NUMMSGS></p>
 </div>
-<ul>
+<ul class="room_actions">
+<li class="start_page"><?START></li>
 <li class="search"><?SEARCHOMATIC></li>
 <li class="view"><?VIEWOMATIC></li>
-<li class="nummsgs"><?NUMMSGS></li>
-<li class="start_page"><?START></li>
 </ul>
 <! end roombanner.html>
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 549f68396..d8dda6cf8 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -167,9 +167,9 @@ li.search form, li.view form {
 	padding: 0;
 }
 
-li.nummsgs {
+p.nummsgs {
         font-size: 10pt;
-        color: #DDDDCC;
+        color: #FFFFFF;
 }
 
 li.start_page {
@@ -899,7 +899,7 @@ div.auto_complete ul strong.highlight {
 }
 
 
-.auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background { 
+.event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background { 
         border: 0;
         width: 100%;
         background-color: #ffffff;
@@ -910,13 +910,13 @@ div.auto_complete ul strong.highlight {
         width: 100%;
 }
 
-.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .downloads_background, .vcard_edit_background    {
+.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .downloads_background    {
         border: 0;
         width: 100%;
         background-color: #ffffff;
 }
 
-.vcard_edit_background_alt, .roomops_background_alt {
+.roomops_background_alt {
         border: 0;
         width: 100%;
         background-color: #dddddd;
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index dea770bbe..3c139232a 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -40,25 +40,23 @@ void display_edit(char *description, char *check_cmd,
 	svprintf("BOXTITLE", WCS_STRING, _("Edit %s"), description);
 	do_template("beginbox");
 
-	wprintf("<div>");
 	wprintf(_("Enter %s below. Text is formatted to the reader's browser."
 		" A newline is forced by preceding the next line by a blank."), description);
-	wprintf("<br />");
 
-	wprintf("<FORM METHOD=\"POST\" action=\"%s\">\n", save_cmd);
+	wprintf("<form method=\"post\" action=\"%s\">\n", save_cmd);
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft "
-		"ROWS=10 COLS=80 WIDTH=80>\n");
+	wprintf("<textarea name=\"msgtext\" wrap=soft "
+		"rows=10 cols=80 width=80>\n");
 	serv_puts(read_cmd);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1')
 		server_to_text();
-	wprintf("</TEXTAREA><br /><br />\n");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">", _("Save changes"));
+	wprintf("</textarea><div class=\"buttons\" >\n");
+	wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\"><br />\n", _("Cancel"));
+	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+	wprintf("</div></form>\n");
 
-	wprintf("</FORM></div>\n");
 	do_template("endbox");
 	wDumpContent(1);
 }
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 4f6183dc5..d7edb879f 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -174,14 +174,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	}
 
 	/** Display the form */
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<img src=\"static/savecontact_48x.gif\">");
-	wprintf("<h1>");
-	wprintf(_("Edit contact information"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	output_headers(1, 1, 1, 0, 0, 0);
+
+	svprintf("BOXTITLE", WCS_STRING, _("Edit contact information"));
+	do_template("beginbox");
 
 	wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
@@ -324,16 +320,17 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	urlescputs(return_to);
 	wprintf("\">\n");
 
-	wprintf("<center>\n"
+	wprintf("<div class=\"buttons\">\n"
 		"<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
 		"&nbsp;"
 		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
-		"</center></form>\n",
+		"</div></form>\n",
 		_("Save changes"),
 		_("Cancel")
 	);
 	
-	wprintf("</td></tr></table></div>\n");
+	wprintf("</td></tr></table>\n");
+	do_template("endbox");
 	wDumpContent(1);
 }
 
-- 
2.30.2