From 1935b6f545a9a5dea9b6caccb9979e0a0d52f1ad Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 14 Jun 2005 03:21:57 +0000 Subject: [PATCH 1/1] * 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. --- webcit/ChangeLog | 6 +++++- webcit/graphics.c | 2 +- webcit/iconbar.c | 4 ++-- webcit/roomops.c | 49 ++++++++++++++++++++++++++++++++++++++++++++--- webcit/webcit.c | 4 ++-- 5 files changed, 56 insertions(+), 9 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 031c8bcf0..1b73a1c7e 100644 --- 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 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/graphics.c b/webcit/graphics.c index 948dc8905..7bf365ab8 100644 --- 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("
\n" "
" - "Set/change your photo" + "Image upload" "
\n" "
\n
\n" ); diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 73fe104cc..366e2c4a6 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -399,7 +399,7 @@ void display_customize_iconbar(void) { "SRC=\"/image&name=hello\" ALT=\" \">" "" "Site logo
" - "A graphic describing this site" + "An icon describing this site" "\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=\" \">" "" "Citadel logo
" - "Displays the "Powered by Citadel" graphic" + "Displays the "Powered by Citadel" icon" "\n", ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), (ib_citadel ? "CHECKED" : "") diff --git a/webcit/roomops.c b/webcit/roomops.c index d859aa2bc..d35560edd 100644 --- 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("" + "\n" + ); + } + else if (WC->wc_view == VIEW_CALENDAR) { + wprintf("" + "\n" + ); + } + else if (WC->wc_view == VIEW_TASKS) { + wprintf("" + "\n" + ); + } + else if (WC->wc_view == VIEW_NOTES) { + wprintf("" + "\n" + ); + wprintf("'static/storenotes_16x.gif'"); + } + else if (WC->wc_view == VIEW_MAILBOX) { + wprintf("" + "\n" + ); + } + else { + wprintf("" + "\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\n" "
  • \n" - "Set or change the graphic for this room's banner\n" + "Set or change the icon for this room's banner\n" "
  • \n" "Edit this room's Info file\n" ""); diff --git a/webcit/webcit.c b/webcit/webcit.c index 426ad7681..f1190b8f5 100644 --- 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")) { -- 2.39.2