From: Art Cancro Date: Thu, 20 Jan 2005 16:13:56 +0000 (+0000) Subject: * Added in a bunch of stupid JavaScript to allow the instant message X-Git-Tag: v7.86~5130 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=9a2e7cc2501530b397b4266a7c27f392478f2112;p=citadel.git * Added in a bunch of stupid JavaScript to allow the instant message window to be dismissed. --- diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 137cc07f1..8a37d4670 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,8 @@ $Log$ +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. + Revision 528.13 2005/01/20 04:10:41 ajc * Cleaned up a bunch of unused cruft from the old layout * Instant messages are now displayed in a div that layers itself @@ -2199,4 +2203,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/paging.c b/webcit/paging.c index 71a48ab8c..5357250da 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -160,10 +160,15 @@ void page_popup(void) escputs(pagefrom); wprintf(""); fmout(NULL, "LEFT"); - wprintf("\n"); + wprintf("" + "

" + "[ close window ]" + "

" + "" + "\n"); } - WC->HaveExpressMessages = 0; + WC->HaveInstantMessages = 0; } diff --git a/webcit/roomops.c b/webcit/roomops.c index 6fd49a9c9..b20dafd3f 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1892,14 +1892,10 @@ void zap(void) if (!strcasecmp(bstr("sc"), "OK")) { serv_printf("GOTO %s", WC->wc_roomname); serv_gets(buf); - if (buf[0] != '2') { - /* ExpressMessageCat(&buf[4]); */ - } else { + if (buf[0] == '2') { serv_puts("FORG"); serv_gets(buf); - if (buf[0] != '2') { - /* ExpressMessageCat(&buf[4]); */ - } else { + if (buf[0] == '2') { strcpy(final_destination, "_BASEROOM_"); } } diff --git a/webcit/static/head.html b/webcit/static/head.html index 2e3b8f600..bad4cadc9 100644 --- a/webcit/static/head.html +++ b/webcit/static/head.html @@ -67,6 +67,14 @@ body { background: #444455; } +#page_popup { + position:absolute; + width=600px; + height=400px; + background-color: #880000; + z-index: 2; +} + #content { position:fixed; display:block; @@ -388,6 +396,26 @@ span.key { - + + + diff --git a/webcit/webcit.c b/webcit/webcit.c index d1f0df8e9..3206e503e 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -398,9 +398,8 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers /* ICONBAR */ if (do_htmlhead) { - if (WC->HaveExpressMessages) { - wprintf("

\n"); + if (WC->HaveInstantMessages) { + wprintf("

\n"); page_popup(); wprintf("

\n"); } @@ -448,13 +447,13 @@ void http_redirect(char *whichpage) { -void check_for_express_messages() +void check_for_instant_messages() { char buf[SIZ]; serv_puts("NOOP"); serv_gets(buf); - if (buf[3] == '*') WC->HaveExpressMessages = 1; + if (buf[3] == '*') WC->HaveInstantMessages = 1; } @@ -995,7 +994,7 @@ void session_loop(struct httprequest *req) } #endif - check_for_express_messages(); + check_for_instant_messages(); /* * If we're not logged in, but we have username and password cookies diff --git a/webcit/webcit.h b/webcit/webcit.h index 254f305d4..82301a26d 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -212,7 +212,7 @@ struct wcsession { long msgarr[4096]; /* for read operations */ int is_wap; /* Client is a WAP gateway */ struct urlcontent *urlstrings; - int HaveExpressMessages; /* Nonzero if incoming msgs exist */ + int HaveInstantMessages; /* Nonzero if incoming msgs exist */ struct wcsubst *vars; char this_page[SIZ]; /* address of current page */ char http_host[SIZ]; /* HTTP Host: header */