From: Art Cancro <ajc@citadel.org>
Date: Sun, 9 Oct 2005 04:32:23 +0000 (+0000)
Subject: new mail notification
X-Git-Tag: v7.86~4568
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=430f92bb28a5a9b501525ebdbf5d2b3ea3e909cc

new mail notification
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 4c1718064..04405c3fb 100644
--- 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 0df8c349d..cf1402183 100644
--- 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 ea106cc1c..dc0dd876a 100644
--- 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 63a209bcb..2faab1ecb 100644
--- 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>