projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83875cf)
* Changed the format of the wholis (again). Now it shows up in a frame
authorArt Cancro <ajc@citadel.org>
Thu, 29 Jun 2000 04:22:37 +0000 (04:22 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 29 Jun 2000 04:22:37 +0000 (04:22 +0000)
  instead of a separate window.

webcit/ChangeLog patch | blob | history
webcit/mainmenu.c patch | blob | history
webcit/roomops.c patch | blob | history
webcit/static/menubar.html patch | blob | history
webcit/static/whoframeset.html [new file with mode: 0644] patch | blob
webcit/who.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 0d28a5f943fb77b3749bc21613ab11e1468c1783..d968007ea59b1ac9537c54365f1236ed6a94340f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 212.4  2000/06/29 04:22:35  ajc
+* Changed the format of the wholis (again).  Now it shows up in a frame
+  instead of a separate window.
+
 Revision 212.3  2000/06/12 03:28:44  ajc
 * added support for multi-line paging
 
@@ -457,3 +461,4 @@ 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/mainmenu.c b/webcit/mainmenu.c
index edf2c1e830a55758aa031e3cb62a87122296124e..53af244cb6ac2c4226a9d8091fbd3dfa20b1c310 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -74,7 +74,7 @@ void embed_main_menu(void)
        wprintf("</TD><TD>");   /* start of third column */
 
        wprintf("<UL>");
-       wprintf("<LI><B><A HREF=\"/whobbs\">\n");
+       wprintf("<LI><B><A HREF=\"/static/whoframeset.html\" TARGET=\"_top\">\n");
        wprintf("Who is online?</B></A><BR>(users <EM>currently</EM> logged on)</LI>\n");
 
        wprintf("<LI><B><A HREF=\"/userlist\">\n");
@@ -83,7 +83,7 @@ void embed_main_menu(void)
        wprintf("<LI><B><A HREF=\"/advanced\">\n");
        wprintf("Advanced options</B></A><BR>...and maintenance</LI>\n");
 
-       wprintf("<LI><B><A HREF=\"/termquit\">\n");
+       wprintf("<LI><B><A HREF=\"/termquit\" TARGET=\"top\">\n");
        wprintf("Log off</B></A><BR>Bye!</LI>\n");
        wprintf("</UL>\n");
 
diff --git a/webcit/roomops.c b/webcit/roomops.c
index ce50b78f6af79b190577332f2fa135339a931202..cf3bc44d8859772c3edba06ca7f2f70db21879d5 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -292,7 +292,7 @@ void readinfo(int v)
        serv_puts("RINF");
        serv_gets(buf);
        if (buf[0] == '1') {
-               wprintf("<FONT SIZE=-2>");
+               wprintf("<FONT SIZE=-1>");
                fmout(NULL);
                wprintf("</FONT>");
        }
diff --git a/webcit/static/menubar.html b/webcit/static/menubar.html
index 89bf5fdc3f53c8e0da5fbeca444702fdcda97964..0f1c9bef4f42f5b2dcd0cde33b58e76e361fc34d 100644 (file)
--- a/webcit/static/menubar.html
+++ b/webcit/static/menubar.html
@@ -1,11 +1,3 @@
-<SCRIPT LANGUAGE="JavaScript">
-
-function LaunchWho() {
-       pwin = window.open('/whobbs', 'TheWholist', 'toolbar=no,location=no,copyhistory=no,status=yes,scrollbars=yes');
-
-}
-</SCRIPT>
-
 <CENTER>
 <IMG SRC="/image&name=hello"><BR><BR>
 
@@ -54,7 +46,7 @@ function LaunchWho() {
 </TR><TR>
        <TD BGCOLOR="#663399">
                <FONT SIZE=-1>
-               <A HREF="javascript:LaunchWho()">
+               <A HREF="static/whoframeset.html" TARGET="_top">
                <FONT COLOR="#FFFFFF">Who&nbsp;is&nbsp;online?</FONT>
                </A>
                </FONT>
@@ -74,7 +66,7 @@ function LaunchWho() {
 </TR><TR>
        <TD BGCOLOR="#CC0000">
                <FONT SIZE=-1>
-               <A HREF="/termquit" onClick="return confirm('Do you really want to log off?');"><FONT COLOR="#FFFFFF">Log&nbsp;off</FONT></A><BR>
+               <A HREF="/termquit" TARGET="_top" onClick="return confirm('Do you really want to log off?');"><FONT COLOR="#FFFFFF">Log&nbsp;off</FONT></A><BR>
        </TD>
 </TR>
 </TABLE>
diff --git a/webcit/static/whoframeset.html b/webcit/static/whoframeset.html
new file mode 100644 (file)
index 0000000..53c8b76
--- /dev/null
+++ b/webcit/static/whoframeset.html
@@ -0,0 +1,12 @@
+<HTML>
+       <HEAD>
+       <TITLE>WebCit</TITLE>
+       </HEAD>
+       <FRAMESET ROWS="*, 15%" FRAMESPACING=0>
+               <FRAME NAME="top" SRC="/mainmenu">
+               <FRAME NAME="bottom" SRC="/whobbs">
+       <NOFRAMES>
+You can't do this because you're using a browser that doesn't support frames.
+       </NOFRAMES>
+       </FRAMESET>
+</HTML>
diff --git a/webcit/who.c b/webcit/who.c
index 39897d7d083bf9f30241433ca43c2e4255dea04f..ae659924ae0f76b755e6083f34fb14dfea280dbd 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -64,7 +64,6 @@ void whobbs(void)
        escputs(serv_info.serv_humannode);
        wprintf("</B></FONT></TD></TR></TABLE>\n");
 
-       wprintf("<FONT SIZE=-2>\n");
        wprintf("<CENTER>\n<TABLE BORDER=1 WIDTH=100%>\n<TR>\n");
        wprintf("<TH>Session ID</TH>\n");
        wprintf("<TH>User Name</TH>\n");
@@ -114,7 +113,7 @@ void whobbs(void)
                }
 
                while (wlist != NULL) {
-                       wprintf("<TR>\n\t<TD ALIGN=center>%d", wlist->sessionnum);
+                       wprintf("<TR>\n\t<TD ALIGN=center><FONT SIZE=-1>%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);
@@ -126,16 +125,16 @@ void whobbs(void)
                                wprintf(" <A HREF=\"/edit_me\" "
                                        ">(edit)</A>");
                        }
+                       wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
                        /* username */
-                       wprintf("</TD>\n\t<TD>");
                        escputs(wlist->username);
                        /* room */
-                       wprintf("</TD>\n\t<TD>");
+                       wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
                        escputs(wlist->roomname);
-                       wprintf("</TD>\n\t<TD>");
+                       wprintf("</FONT></TD>\n\t<TD><FONT SIZE=-1>");
                        /* hostname */
                        escputs(wlist->hostname);
-                       wprintf("</TD>\n</TR>");
+                       wprintf("</FONT></TD>\n</TR>");
                        wptr = wlist->next;
                        free(wlist);
                        wlist = wptr;
@@ -143,7 +142,7 @@ void whobbs(void)
        }
        wprintf("</TABLE>\n<BR><BR>\n");
        wprintf("<TABLE BORDER=0 BGCOLOR=\"#003399\">\n<TR><TD ALIGN=center VALIGN=center CELLPADING=20>\n");
-       wprintf("<B><A HREF=\"javascript:window.close();\">Close window</A></B>\n");
+       wprintf("<B><A HREF=\"/mainmenu\" TARGET=\"_top\">Close window</A></B>\n");
        wprintf("</TD></TR>\n</TABLE></FONT>\n</CENTER>");
 
        wDumpContent(1);
Citadel server, clients, utilities