- Simplified the user list for summary

- Added CSS for Who's online and Summary screens

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index d732223e7ddf112dbc937baa313cf508f94766dd..37ea57889e53fe0295a22e2b227db494d18c8b98 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -853,7 +853,7 @@ div.auto_complete ul strong.highlight {
         width: 100%;
 }
 
-.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .downloads_background, .vcard_edit_background, .who_background   {
+.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .downloads_background, .vcard_edit_background    {
         border: 0;
         width: 100%;
         background-color: #ffffff;
@@ -1020,11 +1020,11 @@ div.auto_complete ul strong.highlight {
         color: #000;
 }
 
-.from_host {
+.edit_col, .host_col {
        display: none;
 }
 
-.who_is_online .from_host {
+.who_is_online .edit_col, .who_is_online .host_col {
        display: block;
 }
 
@@ -1046,4 +1046,15 @@ div.auto_complete ul strong.highlight {
        border-top: 1px solid #aaaaaa;
 }
 
+table.altern {
+       background-color: #ffffff;
+       width: 100%;
+}
 
+table.altern .even {
+       background-color: #dddddd;
+}
+
+table.altern .odd {
+       background-color: #ffffff;
+}

diff --git a/webcit/who.c b/webcit/who.c
index 7143ba29dc6669967da1385131557ce110393cf8..3ac20bc3865a075d45d7f1c9c17813056ca80d8d 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 class=\"from_host\">%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\" "
@@ -109,7 +110,7 @@ void who_inner_div(void) {
                                escputs(realroom);
                                wprintf("</i>");
                        }
-                       wprintf("</td>\n\t<td class=\"from_host\">");
+                       wprintf("</td>\n\t<td class=\"host_col\">");
 
                        /** hostname */
                        escputs(host);