From: Art Cancro <ajc@citadel.org>
Date: Mon, 15 Mar 2004 03:45:01 +0000 (+0000)
Subject: * Open chat in a separate window.
X-Git-Tag: v7.86~5536
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=6e41148be6aa5a82c7a0d44558ef2ca3b806d69a;p=citadel.git

* Open chat in a separate window.
* Use regular frames instead of IFRAMEs.
---

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 717fd5c2f..c3adb4ed2 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -199,8 +199,11 @@ void do_iconbar(void) {
 
 	if (ib_chat) {
 		wprintf("<SPAN CLASS=\"iconbar_link\">"
-			"<A HREF=\"/chat\" TITLE=\"Chat with other users in this room\" "
-			"TARGET=\"workspace\">"
+			"<A HREF=\"#\" onClick=\"window.open('/chat', "
+			"'ctdl_chat_window', "
+			"'toolbar=no,location=no,directories=no,copyhistory=no,"
+			"status=yes,scrollbars=yes,resizable=yes');\""
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 48cbe03df..e8e07fbf5 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -141,7 +141,11 @@ void display_main_menu(void)
 		"</span><BR>\n"
 	);
 
-	wprintf("<A HREF=\"/chat\">"
+	wprintf("<A HREF=\"#\" onClick=\"window.open('/chat', "
+		"'ctdl_chat_window', "
+		"'toolbar=no,location=no,directories=no,copyhistory=no,"
+		"status=yes,scrollbars=yes,resizable=yes');\""
+		">"
 		"<span class=\"mainmenu\">"
 		"Chat with other users in <i>"
 	);
diff --git a/webcit/paging.c b/webcit/paging.c
index 87b877076..cbfdd7acc 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -135,37 +135,11 @@ void do_chat(void)
 		WC->chat_sock = (-1);
 	}
 
-	/* Ok, we're good.  Here we go. */
-	output_headers(3);
-
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">"
-		"<IMG SRC=\"/static/chat-icon.gif\" WIDTH=16 HEIGHT=16 ALIGN=MIDDLE>"
-	);
-	escputs(WC->wc_roomname);
-	wprintf(": real-time chat</SPAN>\n"
-		"</TD></TR></TABLE>\n"
-
-		"<IFRAME WIDTH=100%% HEIGHT=200 SRC=\"about:blank\" "
-		"NAME=\"chat_transcript\">\n"
-		"<!-- Alternate content for non-supporting browsers -->\n"
-		"If you are seeing this message, your browser does not contain\n"
-		"the IFRAME support required for the chat window.  Please upgrade\n"
-		"to a supported browser, such as\n"
-		"<A HREF=\"http://www.mozilla.org\">Mozilla</A>.\n"
-		"</IFRAME>\n"
-
-		"<IFRAME WIDTH=100%% HEIGHT=1 SRC=\"/chat_recv\" "
-		"NAME=\"chat_recv\">\n"
-		"</IFRAME>"
-
-		"<BR>\n"
-
-		"<IFRAME WIDTH=100%% HEIGHT=60 SRC=\"/chat_send\" "
-		"NAME=\"chat_send\">\n"
-		"</IFRAME>\n"
-	);
-	wDumpContent(1);
+	/* WebCit Chat works by having transmit, receive, and refresh
+	 * frames.  Load the frameset.
+	 */
+	do_template("chatframeset");
+	return;
 }
 
 
@@ -344,7 +318,7 @@ void chat_recv(void) {
 	if (end_chat_now) {
 		close(WC->chat_sock);
 		WC->chat_sock = (-1);
-		wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"parent.location.replace('/display_main_menu');\">\n");
+		wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"parent.window.close();\">\n");
 	}
 
 	if (strlen(output_data) > 0) {