* When no icon is present on the server for a room, display the default

  icon for that room's current view.
* Replace "graphic" with "icon" throughout the system messages.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 031c8bcf049b6af7ae0838046d93f67608853150..1b73a1c7edb26c7e057fe6904344671331cd8d72 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 611.13  2005/06/14 03:21:57  ajc
+* When no icon is present on the server for a room, display the default
+  icon for that room's current view.
+* Replace "graphic" with "icon" throughout the system messages.
+
 Revision 611.12  2005/06/14 01:59:43  ajc
 * 16x16 icons in the new tree view.  Nice!
 
@@ -2585,4 +2590,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 948dc8905b82d0839eb7b5803f39830d15627f83..7bf365ab8f4d4961bc4046f3a777e1e93ddc7183 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -41,7 +41,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        output_headers(1, 1, 2, 0, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">Set/change your photo</SPAN>"
+               "<SPAN CLASS=\"titlebar\">Image upload</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 73fe104cc7363898ba34ef0ab094987c55def323..366e2c4a6cb612f795cdc1fe14443bce6ef5f914 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -399,7 +399,7 @@ void display_customize_iconbar(void) {
                "SRC=\"/image&name=hello\" ALT=\" \">"
                "</TD><TD>"
                "<B>Site logo</B><br />"
-               "A graphic describing this site"
+               "An icon describing this site"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_logo ? "CHECKED" : "")
@@ -552,7 +552,7 @@ void display_customize_iconbar(void) {
                "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Citadel logo</B><br />"
-               "Displays the &quot;Powered by Citadel&quot; graphic"
+               "Displays the &quot;Powered by Citadel&quot; icon"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_citadel ? "CHECKED" : "")

diff --git a/webcit/roomops.c b/webcit/roomops.c
index d859aa2bc12d4c1ee654943a365291e64b0efac6..d35560eddad6b1864b148cbea4111255a8f62e16 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -256,9 +256,9 @@ void readinfo(void)
 
 
 
-/* Display room graphic.  The server doesn't actually
+/* Display room banner icon.  The server doesn't actually
  * need the room name, but we supply it in order to
- * keep the browser from using a cached graphic from 
+ * keep the browser from using a cached icon from 
  * another room.
  */
 void embed_room_graphic(void) {
@@ -274,6 +274,49 @@ void embed_room_graphic(void) {
                serv_puts("CLOS");
                serv_getln(buf, sizeof buf);
        }
+       else if (WC->wc_view == VIEW_ADDRESSBOOK) {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/savecontact_48x.gif"
+                       "\">\n"
+               );
+       }
+       else if (WC->wc_view == VIEW_CALENDAR) {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/calarea_48x.gif"
+                       "\">\n"
+               );
+       }
+       else if (WC->wc_view == VIEW_TASKS) {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/taskmanag_48x.gif"
+                       "\">\n"
+               );
+       }
+       else if (WC->wc_view == VIEW_NOTES) {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/storenotes_48x.gif"
+                       "\">\n"
+               );
+               wprintf("'static/storenotes_16x.gif'");
+       }
+       else if (WC->wc_view == VIEW_MAILBOX) {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/privatemess_48x.gif"
+                       "\">\n"
+               );
+       }
+       else {
+               wprintf("<td bgcolor=\"#444455\">"
+                       "<img height=48 width=48 src=\""
+                       "static/chatrooms_48x.gif"
+                       "\">\n"
+               );
+       }
 
 }
 
@@ -952,7 +995,7 @@ void display_editroom(void)
                        "onClick=\"return confirm('Are you sure you want to delete this room?');\">\n"
                        "Delete this room</A>\n"
                        "<LI><A HREF=\"/display_editroompic\">\n"
-                       "Set or change the graphic for this room's banner</A>\n"
+                       "Set or change the icon for this room's banner</A>\n"
                        "<LI><A HREF=\"/display_editinfo\">\n"
                        "Edit this room's Info file</A>\n"
                        "</UL>");

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 426ad76812322b190e0e99aec91105f0ea7d7d79..f1190b8f5a0d8cf5b157aac41f7c026c3fbf5537 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1245,7 +1245,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editpic")) {
                do_graphics_upload("UIMG 1|_userpic_");
        } else if (!strcasecmp(action, "display_editroompic")) {
-               display_graphics_upload("the graphic for this room",
+               display_graphics_upload("the icon for this room",
                                        "UIMG 0|_roompic_",
                                        "/editroompic");
        } else if (!strcasecmp(action, "editroompic")) {
@@ -1259,7 +1259,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "display_editfloorpic")) {
                sprintf(buf, "UIMG 0|_floorpic_|%s",
                        bstr("which_floor"));
-               display_graphics_upload("the graphic for this floor",
+               display_graphics_upload("the icon for this floor",
                                        buf,
                                        "/editfloorpic");
        } else if (!strcasecmp(action, "editfloorpic")) {