new mail notification

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 4c1718064ecedb7e805ffe425cd3f72c476d5357..04405c3fb05f712a263210b410bad092dd63aeb0 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct  9 00:31:33 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
+* Removed new mail notification from the room banner, and placed it into
+  the Mail button on the iconbar instead.  However, this is still broken
+  because the server's new mail notification is insufficient for this...
+
 Sun Oct  9 00:12:11 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
 * serv_crypto.c: don't attempt to continue reading/writing an SSL context
   that has already been closed.  Doing so crashes the webserver, which
@@ -3114,4 +3119,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/iconbar.c b/webcit/iconbar.c
index 0df8c349d3830371b6b964df6bc4cb58028049db..cf14021835adebe2205a8a07f3f821ee1e21f89e 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -114,6 +114,10 @@ void do_iconbar(void) {
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Mail"));
+                       if (WC->new_mail != WC->remember_new_mail) {
+                               wprintf(" <b>(%d)</b>", WC->new_mail);
+                               WC->remember_new_mail = WC->new_mail;
+                       }
                }
                wprintf("</A></li>\n");
        }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index ea106cc1c86ef7ca49e22279f5bd575050d777d4..dc0dd876a687612f2d3ed030582993451ea5b3f8 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -294,24 +294,6 @@ void embed_room_graphic(void) {
 }
 
 
-/* Let the user know if new mail has arrived 
- */
-void embed_newmail_button(void) {
-       if ( (WC->new_mail > WC->remember_new_mail) && (WC->new_mail>0) ) {
-               wprintf(
-                       "<A HREF=\"/dotgoto?room=_MAIL_\">"
-                       "<IMG SRC=\"/static/privatemess_32x.gif\" border=0 "
-                       "ALT=\"");
-               wprintf(_("You have new mail"));
-                       wprintf("\">"
-                       "<br /><SPAN CLASS=\"youhavemail\">");
-               wprintf(_("%d new mail"), WC->new_mail);
-               wprintf("</SPAN></A>");
-               WC->remember_new_mail = WC->new_mail;
-       }
-}
-
-
 
 /*
  * Display the current view and offer an option to change it
@@ -380,7 +362,6 @@ void embed_room_banner(char *got, int navbar_style) {
        svprintf("TOTALMSGS", WCS_STRING, "%d", extract_int(&got[4], 2));
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
-       svcallback("YOUHAVEMAIL", embed_newmail_button);
        svcallback("VIEWOMATIC", embed_view_o_matic);
        svcallback("START", offer_start_page);
 

diff --git a/webcit/static/roombanner.html b/webcit/static/roombanner.html
index 63a209bcb9a063c9ed6ccadb6424dda5f4a10eb8..2faab1ecb56d93ee06b44e557cfef109b2e1fadb 100644 (file)
--- a/webcit/static/roombanner.html
+++ b/webcit/static/roombanner.html
@@ -9,9 +9,6 @@
        <td align="left" bgcolor="#444455">
                <span class="room_banner_room_info"><?ROOMINFO></span>
        </td>
-       <td align="left" valign="top" bgcolor="#444455">
-               <?YOUHAVEMAIL>
-       </td>
        <td align="right" valign="top" bgcolor="#444455">
                <?VIEWOMATIC>
        </td>