Mostly HTML Validation stuff, also removed the #room_ROOMNAME id until we have a...

[citadel.git] / webcit / userlist.c

diff --git a/webcit/userlist.c b/webcit/userlist.c
index d5ea48081d25e3ef616e80f964cc177910ef0aa9..8889a1996faf1d7b1eea939ae06d3c349616b468 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "webcit.h"
 
@@ -49,12 +46,11 @@ void userlist(void)
        serv_puts("LIST");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wc_printf("<em>%s</em><br />\n", &buf[4]);
+               wc_printf("<em>%s</em><br>\n", &buf[4]);
                goto DONE;
        }
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"userlist_background\"><tr><td>\n");
+       wc_printf("<table class=\"userlist_background\"><tr><td>\n");
        wc_printf("<tr><th>%s</th><th>%s</th><th>%s</th>"
                        "<th>%s</th><th>%s</th><th>%s</th></tr>",
                        _("User Name"),
@@ -99,7 +95,7 @@ void userlist(void)
                        extract_long(buf, 4), extract_long(buf, 5));
 
        }
-       wc_printf("</table></div>\n");
+       wc_printf("</table>\n");
 DONE:  wDumpContent(1);
 }
 
@@ -117,16 +113,25 @@ void showuser(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<img src=\"static/usermanag_48x.gif\">");
+       wc_printf("<img src=\"static/webcit_icons/essen/32x32/account.png\" alt\"\">");
         wc_printf("<h1>");
        wc_printf(_("User profile"));
         wc_printf("</h1>");
+       wc_printf("<div id=\"navbar\">\n");
+       wc_printf("<ul><li><a href=\"display_page?recp=");
+       urlescputs(who);
+        wc_printf("\">"
+                "<img src=\"static/webcit_icons/essen/16x16/chat.png\" alt=\"\">"
+               "<span class=\"navbar_link\">");
+        snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
+        escputs(buf);
+        wc_printf("</span></li></a>\n");
+       wc_printf("</div>");
         wc_printf("</div>");
 
-        wc_printf("<div id=\"content\" class=\"service\">\n");
+        wc_printf("<div id=\"content\" class=\"service bio\">\n");
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"userlist_background\"><tr><td>\n");
+       wc_printf("<table class=\"userlist_background\"><tr><td>\n");
 
        serv_printf("OIMG _userpic_|%s", who);
        serv_getln(buf, sizeof buf);
@@ -140,9 +145,9 @@ void showuser(void)
 
        wc_printf("<center><table><tr><td>");
        if (have_pic == 1) {
-               wc_printf("<img src=\"image?name=_userpic_&parm=");
+               wc_printf("<img src=\"image?name=_userpic_&amp;parm=");
                urlescputs(who);
-               wc_printf("\">");
+               wc_printf("\" alt=\"\">");
        }
        wc_printf("</td><td><h1>");
        escputs(who);
@@ -152,20 +157,11 @@ void showuser(void)
        if (buf[0] == '1') {
                fmout("JUSTIFY");
        }
-       wc_printf("<br /><a href=\"display_page?recp=");
-       urlescputs(who);
-       wc_printf("\">"
-               "<img src=\"static/citadelchat_24x.gif\" "
-               "align=middle border=0>&nbsp;&nbsp;");
-       snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
-       escputs(buf);
-       wc_printf("</a>\n");
-
-       wc_printf("</td></tr></table></div>\n");
+       wc_printf("</td></tr></table>\n");
        wDumpContent(1);
 }
 
-void 
+void
 InitModule_USERLIST
 (void)
 {