* When viewing a calendar room, the "Read all messages" link in the

  room banner has been replaced by "Day view" and "Month view" links.
  (I have also imported icons for week and year views, in case we add
  these later.)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8a37d46702e4763b9ca41f8055935f6b11d80ded..e790d18d50500d9a5cf5210665f83a7d295f1cfd 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 528.15  2005/01/20 21:24:27  ajc
+* When viewing a calendar room, the "Read all messages" link in the
+  room banner has been replaced by "Day view" and "Month view" links.
+  (I have also imported icons for week and year views, in case we add
+  these later.)
+
 Revision 528.14  2005/01/20 16:13:56  ajc
 * Added in a bunch of stupid JavaScript to allow the instant message
   window to be dismissed.
@@ -2203,3 +2209,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 f9f8164dff18ef89b37e5d33a4f6f0db2c00c35b..4f46c51cd3e0515ac459326b3df7da3f8aebe6e4 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -167,9 +167,6 @@ void calendar_month_view(int year, int month, int day) {
                "bgcolor=#204B78><TR><TD>\n");
 
        wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
-       wprintf("<TD align=left><font color=#FFFFFF size=-2>"
-               "Click on any date for day view&nbsp;"
-               "</FONT></TD>\n");
 
        wprintf("<TD ALIGN=CENTER>");
 
@@ -189,9 +186,7 @@ void calendar_month_view(int year, int month, int day) {
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\" BORDER=0></A>\n");
 
-       wprintf("</TD><TD align=right><font color=#FFFFFF size=-2>"
-               "Click on any date for day view&nbsp;"
-               "</FONT></TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "

diff --git a/webcit/roomops.c b/webcit/roomops.c
index b20dafd3f1067f2cef1c80f78ac32809b748e29a..a9e3566f7655033a28c8345827f047d6a41ba6ca 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -389,30 +389,71 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       wprintf(
-                               "<td>"
-                               "<A HREF=\"/readfwd\">"
-                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" border=\"0\">"
-                               "<span class=\"navbar_link\">"
-                       );
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
-                                       wprintf("View contacts");
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View contacts"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_CALENDAR:
-                                       wprintf("View calendar");
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=day\">"
+                                               "<img align=\"middle\" src=\"/static/day_view.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "Day view"
+                                               "</span></a></td>\n"
+                                       );
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=month\">"
+                                               "<img align=\"middle\" src=\"/static/month_view.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "Month view"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_TASKS:
-                                       wprintf("View tasks");
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View tasks"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                case VIEW_NOTES:
-                                       wprintf("View notes");
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View notes"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                                default:
-                                       wprintf("All messages");
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "</span></a></td>\n"
+                                       );
                                        break;
                        }
-                       wprintf("</span></a></td>\n");
                }
 
                if (navbar_style == navbar_default) {

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

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

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

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