]> code.citadel.org Git - citadel.git/commitdiff
projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aaf112b)
* more work on UI overhaul
authorArt Cancro <ajc@citadel.org>
Mon, 30 Apr 2001 01:49:37 +0000 (01:49 +0000)
committerArt Cancro <ajc@citadel.org>
Mon, 30 Apr 2001 01:49:37 +0000 (01:49 +0000)
webcit/ChangeLog patch | blob | history
webcit/auth.c patch | blob | history
webcit/static/iconbar.html patch | blob | history
webcit/static/mainframeset.html patch | blob | history
webcit/webcit.c patch | blob | history
webcit/who.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 4b7e4fe4fb64426680457733bae11269aa3b20b8..b02bfda99d0b7e550860286e7037cb8c35728184 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 213.7  2001/04/30 01:49:36  ajc
+* more work on UI overhaul
+
 Revision 213.6  2001/04/29 04:39:23  ajc
 * User interface overhaul now in progress.  WARNING: incomplete system.
 
@@ -525,3 +528,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/auth.c b/webcit/auth.c
index 6dd939aca27dedaa41443781a80b03384624e0ed..7dfee804f41f46db47bbdf134736ca71ae7f270e 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -144,7 +144,11 @@ void do_login(void)
 void do_welcome(void)
 {
        /* smart_goto("_BASEROOM_"); */
-       output_static("mainframeset.html");
+
+       output_headers(3);
+       wprintf("<A HREF=\"/static/mainframeset.html\">Click here</A>\n");
+       wDumpContent(2);
+       /* output_static("mainframeset.html"); */
 }
 
 
diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index 6d98957d141fb88dd420d097d37def553e01931f..11c3033fba7059462cdbef36c0680b7ad6d7a2b7 100644 (file)
--- a/webcit/static/iconbar.html
+++ b/webcit/static/iconbar.html
@@ -1,14 +1,4 @@
 <HTML>
-<HEAD>
-<SCRIPT language="JavaScript">
-<!--hide
-function OpenWholist()
-{
-window.open('/whobbs', 'whobbs', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,height=200,width=600');
-}
-//-->
-</SCRIPT>
-</HEAD>
 <BODY BGCOLOR=AAAAAA>
 <CENTER>
 <IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/image&name=hello"><BR><BR>
@@ -17,8 +7,9 @@ window.open('/whobbs', 'whobbs', 'toolbar=no,location=no,directories=no,copyhist
 <IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/rooms-icon.gif"><BR>
 Rooms</A><BR><BR>
 
+<A HREF="/whobbs" TARGET="workspace">
 <IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/users-icon.gif"><BR>
-Users<BR><BR>
+Users</A><BR><BR>
 
 <A HREF="/termquit" TARGET="_top" onClick="return confirm('Do you really want to log off?');">
 <IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/exit-icon.gif"><BR>
diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
index d99cf541200a133255b27f232c4a6e9f0eb05f9e..c0073f346e5d5744a0ce11d4fb170897ea70c7a1 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -5,9 +5,10 @@
 
        <FRAMESET COLS="100, *" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
                <FRAME NAME="left" SRC="/static/iconbar.html">
-               <FRAMESET ROWS="*, 50" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
+               <FRAMESET ROWS="*, 50, 0" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
                <FRAME NAME="workspace" SRC="/dotgoto&room=_BASEROOM_">
                <FRAME NAME="bottom" SRC="/static/navbar.html">
+               <FRAME NAME="ka" SRC="/blank">
                </FRAMESET>
        <NOFRAMES>
 Sorry, web-based access to Citadel requires a browser that supports frames,
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 1c32abfcedff04b55ab08e1d87fdb6ee879dfbe1..effce6c82d5ee2af5bc50b882a614fd8479fea43 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -276,9 +276,9 @@ void urlescputs(char *strbuf)
  * 
  * Bits 0 and 1:
  * 0 = Nothing.  Do not display any leading HTTP or HTML.
- * 1 = HTTP headers plus the "fake frames" found in most windows.
+ * 1 = HTTP headers plus the room banner
  * 2 = HTTP headers required to terminate the session (unset cookies)
- * 3 = HTTP and HTML headers, but no 'fake frames'
+ * 3 = HTTP and HTML headers, but no room banner
  *
  * Bit 2: Set to 1 to auto-refresh page every 30 seconds
  *
@@ -505,6 +505,16 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
        wDumpContent(1);
 }
 
+
+/*
+ * Display a blank page.
+ */
+void blank_page(void) {
+       output_headers(7);
+       wDumpContent(2);
+}
+
+
 void display_error(char *errormessage)
 {
        convenience_page("770000", "Error", errormessage);
@@ -743,6 +753,8 @@ void session_loop(struct httprequest *req)
 
        else if (!strcasecmp(action, "do_welcome")) {
                do_welcome();
+       } else if (!strcasecmp(action, "blank")) {
+               blank_page();
        } else if (!strcasecmp(action, "display_main_menu")) {
                display_main_menu();
        } else if (!strcasecmp(action, "advanced")) {
diff --git a/webcit/who.c b/webcit/who.c
index 1a2e9ad36ad99fac4666bd4d5095aef9466c1ac7..3c4e609fb37dfa1f1000d1cfeff4d485705a627e 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -129,9 +129,9 @@ void whobbs(void)
 
 
                        /* username (link to user bio/photo page) */
-                       wprintf("<A HREF=\"javascript:window.opener.location='/showuser&who=");
+                       wprintf("<A HREF=\"/showuser&who=");
                        urlescputs(wlist->username);
-                       wprintf("';window.location='/whobbs'\">");
+                       wprintf("\">");
                        escputs(wlist->username);
                        wprintf("</A>");
 
@@ -147,11 +147,7 @@ void whobbs(void)
                        wlist = wptr;
                }
        }
-       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("</TD></TR>\n</TABLE></FONT>\n</CENTER>");
-
+       wprintf("</TABLE></CENTER>\n");
        wDumpContent(1);
 }
 
Citadel server, clients, utilities