From: Art Cancro <ajc@citadel.org>
Date: Sun, 6 May 2001 05:11:50 +0000 (+0000)
Subject: * Added paging icon and right-justified it
X-Git-Tag: v7.86~6884
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=2df4db4ee77270e0385a724b0a9bde870e20c311;p=citadel.git

* Added paging icon and right-justified it
* Send-page window is now a popup
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9303c97b2..9190e14e5 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 213.10  2001/05/06 05:11:48  ajc
+* Added paging icon and right-justified it
+* Send-page window is now a popup
+
 Revision 213.9  2001/05/04 04:28:10  ajc
 * Added "page user" button in wholist
 
@@ -534,4 +538,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/paging.c b/webcit/paging.c
index 933ea6c12..a27b18485 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -33,7 +33,7 @@ void display_page(void)
 
 	strcpy(recp, bstr("recp"));
 
-	output_headers(1);
+	output_headers(3);
 
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
 	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -48,28 +48,9 @@ void display_page(void)
 
 	wprintf("<TABLE border=0 width=100%%><TR><TD>\n");
 
-	wprintf("Select a user to send a message to: <BR>");
-
-	wprintf("<SELECT NAME=\"recp\" SIZE=10>\n");
-	serv_puts("RWHO");
-	serv_gets(buf);
-	if (buf[0] == '1') {
-		while (serv_gets(buf), strcmp(buf, "000")) {
-			extract(user, buf, 1);
-			wprintf("<OPTION");
-			if (strlen(recp)>0) {
-				if (!strcmp(user, recp)) {
-					wprintf(" SELECTED");
-				}
-			}
-			wprintf(">");
-			escputs(user);
-			wprintf("\n");
-		}
-	}
-	wprintf("</SELECT>\n");
-
-	wprintf("</TD><TD>");
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
+	escputs(recp);
+	wprintf("\">\n");
 
 	wprintf("Enter message text:<BR>");
 
@@ -79,7 +60,7 @@ void display_page(void)
 	wprintf("</TD></TR></TABLE><BR>\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send message\">");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+	wprintf("<BR><A HREF=\"javascript:window.close();\"Cancel</A>\n");
 
 	wprintf("</FORM></CENTER>\n");
 	wDumpContent(1);
diff --git a/webcit/static/page.gif b/webcit/static/page.gif
new file mode 100644
index 000000000..27f96989a
Binary files /dev/null and b/webcit/static/page.gif differ
diff --git a/webcit/who.c b/webcit/who.c
index 06e8a81be..39e0a0639 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,8 +1,6 @@
 /* $Id$ */
 
 
-
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -64,7 +62,11 @@ void whobbs(void)
 	escputs(serv_info.serv_humannode);
 	wprintf("</B></FONT></TD></TR></TABLE>\n");
 
-	wprintf("<CENTER>\n<TABLE BORDER=1 WIDTH=100%%>\n<TR>\n");
+	wprintf("<CENTER>\n"
+		"Click on a name to read user info.  Click on "
+		"<IMG SRC=\"/static/page.gif\" ALT=\"(p)\" BORDER=0> to send "
+		"a page (instant message) to that user.<BR>"
+		"<TABLE BORDER=1 WIDTH=100%%>\n<TR>\n");
 	wprintf("<TH>Session ID</TH>\n");
 	wprintf("<TH>User Name</TH>\n");
 	wprintf("<TH>Room</TH>");
@@ -113,7 +115,7 @@ void whobbs(void)
 		}
 
 		while (wlist != NULL) {
-			wprintf("<TR>\n\t<TD ALIGN=center><FONT SIZE=-1>%d", wlist->sessionnum);
+			wprintf("<TR>\n\t<TD ALIGN=center>%d", wlist->sessionnum);
 			if ((WC->is_aide) &&
 			    (wlist->sessionnum != serv_info.serv_pid)) {
 				wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", wlist->sessionnum);
@@ -125,7 +127,7 @@ void whobbs(void)
 				wprintf(" <A HREF=\"/edit_me\" "
 					">(edit)</A>");
 			}
-			wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
+			wprintf("</TD>\n\t<TD>");
 
 
 			/* username (link to user bio/photo page) */
@@ -136,17 +138,21 @@ void whobbs(void)
 			wprintf("</A>");
 
 			/* (link to page this user) */
-			wprintf("<A HREF=\"/display_page&recp=");
+			wprintf("<DIV ALIGN=RIGHT>"
+				"<A HREF=\"/whobbs\" "
+				" onClick=\"return window.open('/display_page&recp=");
 			urlescputs(wlist->username);
-			wprintf("\">(p)</A>");
+			wprintf("', 'CitaPageWin', 'toolbar=no,location=no,copyhistory=no,status=no,scrollbars=yes,resizable=no,height=400,width=400');\">"
+				"<IMG SRC=\"/static/page.gif\" ALT=\"(p)\""
+				" BORDER=0></A></DIV>");
 
 			/* room */
-			wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
+			wprintf("</TD>\n\t<TD>");
 			escputs(wlist->roomname);
-			wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
+			wprintf("</TD>\n\t<TD>");
 			/* hostname */
 			escputs(wlist->hostname);
-			wprintf("</FONT></TD>\n</TR>");
+			wprintf("</TD>\n</TR>");
 			wptr = wlist->next;
 			free(wlist);
 			wlist = wptr;