* Integrated the second batch of new icons.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 87412e7ca8f57ff6c92e2ffcafee7577ad816db2..0501db49d4d84f1d744742160abbc30b8fa434d7 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 619.5  2005/06/19 04:11:52  ajc
+* Integrated the second batch of new icons.
+
 Revision 619.4  2005/06/18 22:58:56  ajc
 * Installed the 16x16 "users" icon as favicon.ico, mainly for performance
   reasons -- the browser will cache favicon.ico and won't keep asking for
@@ -2617,3 +2620,4 @@ 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/calendar_view.c b/webcit/calendar_view.c
index f5ec03b6f2f001070a3cc514dc6f295ec53cb616..2ebe3b36b682329e5d18e92c94be3c901e28997e 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -166,7 +166,7 @@ void calendar_month_view(int year, int month, int day) {
        localtime_r(&previous_month, &tm);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/prevdate_32x.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
                "<FONT SIZE=+1 COLOR=\"#FFFFFF\">"
@@ -177,7 +177,7 @@ void calendar_month_view(int year, int month, int day) {
        localtime_r(&next_month, &tm);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\" BORDER=0></A>\n");
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/nextdate_32x.gif\" BORDER=0></A>\n");
 
        wprintf("</TD></TR></TABLE>\n");
 
@@ -403,7 +403,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<TD ALIGN=CENTER>");
        wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
                yesterday.year, yesterday.month, yesterday.day);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>");
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/prevdate_32x.gif\" BORDER=0></A>");
        wprintf("</TD>");
 
        /* Today's date */
@@ -418,7 +418,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<TD ALIGN=CENTER>");
        wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
                tomorrow.year, tomorrow.month, tomorrow.day);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\""
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/nextdate_32x.gif\""
                " BORDER=0></A>\n");
        wprintf("</TD>");
 

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 5747e3c25eca5d45d7971f05fe972f640ebf7a76..3e77abf0435352ad2d24517245f65f0a8a1473f8 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -288,7 +288,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/exit-icon.gif\">");
+                       "SRC=\"/static/logoff_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Log off");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 11629e87cbc0e672caffc563eebb680acf3a6f8c..f61670f4c89d169b4ffe4310f0a32ca39e89dc79 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -410,7 +410,7 @@ void embed_room_banner(char *got, int navbar_style) {
                if (navbar_style == navbar_default) wprintf(
                        "<td>"
                        "<a href=\"/ungoto\">"
-                       "<img align=\"middle\" src=\"/static/back.gif\" border=\"0\">"
+                       "<img align=\"middle\" src=\"/static/ungoto2_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">Ungoto</span></A>"
                        "</td>\n"
                );
@@ -419,7 +419,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        wprintf(
                                "<td>"
                                "<A HREF=\"/readnew\">"
-                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" border=\"0\">"
+                               "<img align=\"middle\" src=\"/static/newmess2_24x.gif\" border=\"0\">"
                                "<span class=\"navbar_link\">Read new messages</span></A>"
                                "</td>\n"
                        );
@@ -442,7 +442,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<td>"
                                                "<A HREF=\"/readfwd?calview=day\">"
-                                               "<img align=\"middle\" src=\"/static/day_view.gif\" "
+                                               "<img align=\"middle\" src=\"/static/taskday2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "Day view"
@@ -451,7 +451,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<td>"
                                                "<A HREF=\"/readfwd?calview=month\">"
-                                               "<img align=\"middle\" src=\"/static/month_view.gif\" "
+                                               "<img align=\"middle\" src=\"/static/monthview_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "Month view"
@@ -506,27 +506,51 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       wprintf(
-                               "<td>"
-                               "<A HREF=\"/display_enter\">"
-                               "<img align=\"middle\" src=\"/static/enter.gif\" border=\"0\">"
-                               "<span class=\"navbar_link\">"
-                       );
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
-                                       wprintf("Add new contact");
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/enter.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "Add new contact"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_CALENDAR:
-                                       wprintf("Add new event");
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/addevent_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "Add new event"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_TASKS:
-                                       wprintf("Add new task");
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/enter.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "Add new task"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_NOTES:
-                                       wprintf("Add new note");
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/enter.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "Add new note"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                default:
-                                       wprintf("Enter a message");
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/enter.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "Enter a message"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                        }
                        wprintf("</span></a></td>\n");
@@ -536,8 +560,8 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<td>"
                        "<A HREF=\"/skip\" "
                        "TITLE=\"Leave all messages marked as unread, go to next room with unread messages\">"
-                       "<span class=\"navbar_link\">Skip this room</span>"
-                       "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
+                       "<img align=\"middle\" src=\"/static/skipthisroom_24x.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">Skip this room</span></a>"
                        "</td>\n"
                );
 
@@ -545,8 +569,8 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<td>"
                        "<A HREF=\"/gotonext\" "
                        "TITLE=\"Mark all messages as read, go to next room with unread messages\">"
-                       "<span class=\"navbar_link\">Goto next room</span>"
-                       "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
+                       "<img align=\"middle\" src=\"/static/markngo_24x.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">Goto next room</span></a>"
                        "</td>\n"
                );
 

diff --git a/webcit/static/addevent_24x.gif b/webcit/static/addevent_24x.gif
new file mode 100644 (file)
index 0000000..f07fcef
Binary files /dev/null and b/webcit/static/addevent_24x.gif differ

diff --git a/webcit/static/advanpage2_32x.gif b/webcit/static/advanpage2_32x.gif
new file mode 100644 (file)
index 0000000..bb37452
Binary files /dev/null and b/webcit/static/advanpage2_32x.gif differ

diff --git a/webcit/static/advanpage2_48x.gif b/webcit/static/advanpage2_48x.gif
new file mode 100644 (file)
index 0000000..2e79a9c
Binary files /dev/null and b/webcit/static/advanpage2_48x.gif differ

diff --git a/webcit/static/back.gif b/webcit/static/back.gif
deleted file mode 100644 (file)
index 294632c..0000000
Binary files a/webcit/static/back.gif and /dev/null differ

diff --git a/webcit/static/day_view.gif b/webcit/static/day_view.gif
deleted file mode 100644 (file)
index 64eada5..0000000
Binary files a/webcit/static/day_view.gif and /dev/null differ

diff --git a/webcit/static/exit-icon.gif b/webcit/static/exit-icon.gif
deleted file mode 100644 (file)
index 60a35dd..0000000
Binary files a/webcit/static/exit-icon.gif and /dev/null differ

diff --git a/webcit/static/forward.gif b/webcit/static/forward.gif
deleted file mode 100644 (file)
index 0f1b16a..0000000
Binary files a/webcit/static/forward.gif and /dev/null differ

diff --git a/webcit/static/logoff_32x.gif b/webcit/static/logoff_32x.gif
new file mode 100644 (file)
index 0000000..da17164
Binary files /dev/null and b/webcit/static/logoff_32x.gif differ

diff --git a/webcit/static/markngo_24x.gif b/webcit/static/markngo_24x.gif
new file mode 100644 (file)
index 0000000..ce3d993
Binary files /dev/null and b/webcit/static/markngo_24x.gif differ

diff --git a/webcit/static/month_view.gif b/webcit/static/month_view.gif
deleted file mode 100644 (file)
index b8c930d..0000000
Binary files a/webcit/static/month_view.gif and /dev/null differ

diff --git a/webcit/static/monthview_24x.gif b/webcit/static/monthview_24x.gif
new file mode 100644 (file)
index 0000000..f8acc5c
Binary files /dev/null and b/webcit/static/monthview_24x.gif differ

diff --git a/webcit/static/newmess2_24x.gif b/webcit/static/newmess2_24x.gif
new file mode 100644 (file)
index 0000000..c38a1b7
Binary files /dev/null and b/webcit/static/newmess2_24x.gif differ

diff --git a/webcit/static/nextdate_32x.gif b/webcit/static/nextdate_32x.gif
new file mode 100644 (file)
index 0000000..d4ade0b
Binary files /dev/null and b/webcit/static/nextdate_32x.gif differ

diff --git a/webcit/static/prevdate_32x.gif b/webcit/static/prevdate_32x.gif
new file mode 100644 (file)
index 0000000..4aacfc9
Binary files /dev/null and b/webcit/static/prevdate_32x.gif differ

diff --git a/webcit/static/skipthisroom_24x.gif b/webcit/static/skipthisroom_24x.gif
new file mode 100644 (file)
index 0000000..fbc56ab
Binary files /dev/null and b/webcit/static/skipthisroom_24x.gif differ

diff --git a/webcit/static/taskday2_24x.gif b/webcit/static/taskday2_24x.gif
new file mode 100644 (file)
index 0000000..a6608a5
Binary files /dev/null and b/webcit/static/taskday2_24x.gif differ

diff --git a/webcit/static/ungoto2_24x.gif b/webcit/static/ungoto2_24x.gif
new file mode 100644 (file)
index 0000000..7ed7178
Binary files /dev/null and b/webcit/static/ungoto2_24x.gif differ