use the same way to display all banners and services contents

[citadel.git] / webcit / who.c

diff --git a/webcit/who.c b/webcit/who.c
index deae59d45640985c6aeafa7976508ba610d5daad..959abc9629af7f57720fa071a80c8b24c78c731d 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -21,12 +21,13 @@ void who_inner_div(void) {
        time_t now;
        int bg = 0;
 
-       wprintf("<table class=\"who_background\">"
+       wprintf("<table class=\"altern\">"
                "<tr>\n");
-       wprintf("<th colspan=\"3\"> </th>\n");
+       wprintf("<th class=\"edit_col\"> </th>\n");
+       wprintf("<th colspan=\"2\"> </th>\n");
        wprintf("<th>%s</th>\n", _("User name"));
        wprintf("<th>%s</th>", _("Room"));
-       wprintf("<th>%s</th>\n</tr>\n", _("From host"));
+       wprintf("<th class=\"host_col\">%s</th>\n</tr>\n", _("From host"));
 
        serv_puts("TIME");
        serv_getln(buf, sizeof buf);
@@ -50,12 +51,12 @@ void who_inner_div(void) {
                        last_activity = extract_long(buf, 5);
 
                        bg = 1 - bg;
-                       wprintf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
+                       wprintf("<tr class=\"%s\">",
+                               (bg ? "even" : "odd")
                        );
 
 
-                       wprintf("<td>");
+                       wprintf("<td class=\"edit_col\">");
                        if ((WC->is_aide) &&
                            (sess != WC->ctdl_pid)) {
                                wprintf(" <a href=\"terminate_session?which_session=%d", sess);
@@ -67,7 +68,7 @@ void who_inner_div(void) {
                        wprintf("</td>");
 
                        /** (link to page this user) */
-                       wprintf("<td><a href=\"display_page?recp=");
+                       wprintf("<td width=\"5%\"><a href=\"display_page?recp=");
                        urlescputs(user);
                        wprintf("\">"
                                "<img align=\"middle\" "
@@ -77,7 +78,7 @@ void who_inner_div(void) {
                        wprintf("</td>");
 
                        /** (idle flag) */
-                       wprintf("<td>");
+                       wprintf("<td width=\"5%\">");
                        if ((now - last_activity) > 900L) {
                                wprintf(" "
                                        "<img align=\"middle\" "
@@ -104,16 +105,16 @@ void who_inner_div(void) {
                        /** room */
                        wprintf("</td>\n\t<td>");
                        escputs(room);
-                       if (strlen(realroom) > 0) {
+                       if (!IsEmptyStr(realroom) ) {
                                wprintf("<br /><i>");
                                escputs(realroom);
                                wprintf("</i>");
                        }
-                       wprintf("</td>\n\t<td>");
+                       wprintf("</td>\n\t<td class=\"host_col\">");
 
                        /** hostname */
                        escputs(host);
-                       if (strlen(realhost) > 0) {
+                       if (!IsEmptyStr(realhost)) {
                                wprintf("<br /><i>");
                                escputs(realhost);
                                wprintf("</i>");
@@ -142,21 +143,17 @@ void who(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table class=\"who_banner\"><tr><td>");
-       wprintf("<img src=\"static/usermanag_48x.gif\" alt=\" \" "
-               "align=middle "
-               ">");
-       wprintf("<span class=\"titlebar\"> ");
-
+       wprintf("<img src=\"static/usermanag_48x.gif\">");
+       wprintf("<h1>");
        snprintf(title, sizeof title, _("Users currently on %s"), serv_info.serv_humannode);
        escputs(title);
-
-       wprintf("</span></td><td align=right>");
+       wprintf("</h1>");
+        wprintf("<ul><li class=\"start_page\">");
        offer_start_page();
-       wprintf("</td></tr></table>\n");
-       wprintf("</div>\n");
+       wprintf("</li></ul>");
+       wprintf("</div>");
 
-       wprintf("<div id=\"content\">\n");
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div style=\"display:inline\" id=\"fix_scrollbar_bug\">");
        who_inner_div();
@@ -205,19 +202,19 @@ void edit_me(void)
 {
        char buf[SIZ];
 
-       if (strlen(bstr("change_room_name_button")) > 0) {
+       if (!IsEmptyStr(bstr("change_room_name_button"))) {
                serv_printf("RCHG %s", bstr("fake_roomname"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (strlen(bstr("change_host_name_button")) > 0) {
+       } else if (!IsEmptyStr(bstr("change_host_name_button"))) {
                serv_printf("HCHG %s", bstr("fake_hostname"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (strlen(bstr("change_user_name_button")) > 0) {
+       } else if (!IsEmptyStr(bstr("change_user_name_button"))) {
                serv_printf("UCHG %s", bstr("fake_username"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (strlen(bstr("cancel_button")) > 0) {
+       } else if (!IsEmptyStr(bstr("cancel_button"))) {
                http_redirect("who");
        } else {
                output_headers(1, 1, 0, 0, 0, 0);