]> 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: a44fb09)
* User interface overhaul now in progress. WARNING: incomplete system.
authorArt Cancro <ajc@citadel.org>
Sun, 29 Apr 2001 04:39:25 +0000 (04:39 +0000)
committerArt Cancro <ajc@citadel.org>
Sun, 29 Apr 2001 04:39:25 +0000 (04:39 +0000)
webcit/ChangeLog patch | blob | history
webcit/auth.c patch | blob | history
webcit/roomops.c patch | blob | history
webcit/static/exit-icon.gif [new file with mode: 0644] patch | blob
webcit/static/iconbar.html [new file with mode: 0644] patch | blob
webcit/static/mainframeset.html [new file with mode: 0644] patch | blob
webcit/static/roombanner.html patch | blob | history
webcit/static/rooms-icon.gif [new file with mode: 0644] patch | blob
webcit/static/users-icon.gif [new file with mode: 0644] patch | blob
webcit/webcit.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e1bc9f947530f5bac384b3bf5251b93eb457e3dd..4b7e4fe4fb64426680457733bae11269aa3b20b8 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 213.6  2001/04/29 04:39:23  ajc
+* User interface overhaul now in progress.  WARNING: incomplete system.
+
 Revision 213.5  2001/04/01 22:13:37  cough
 * Modified roomops.c to give users the ability to pick a floor at room
   creation time.
@@ -522,4 +525,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/auth.c b/webcit/auth.c
index e88a760164378fe3aa4f6fe5106bdc44e0b2bf4c..6dd939aca27dedaa41443781a80b03384624e0ed 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -143,7 +143,8 @@ void do_login(void)
 
 void do_welcome(void)
 {
-       smart_goto("_BASEROOM_");
+       /* smart_goto("_BASEROOM_"); */
+       output_static("mainframeset.html");
 }
 
 
diff --git a/webcit/roomops.c b/webcit/roomops.c
index f3d5d4eddb365bdde3295112e1ede2c81dbf45c1..7e93e37daa8a77f88bc8c9b48301284ba760fe31 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -360,7 +360,6 @@ void embed_room_banner(char *got) {
        svcallback("ROOMINFO", readinfo);
        svcallback("YOUHAVEMAIL", embed_newmail_button);
 
-
        do_template("roombanner.html");
        clear_local_substs();
 }
diff --git a/webcit/static/exit-icon.gif b/webcit/static/exit-icon.gif
new file mode 100644 (file)
index 0000000..60a35dd
Binary files /dev/null and b/webcit/static/exit-icon.gif differ
diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
new file mode 100644 (file)
index 0000000..6d98957
--- /dev/null
+++ b/webcit/static/iconbar.html
@@ -0,0 +1,34 @@
+<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>
+
+<A HREF="/knrooms" TARGET="workspace">
+<IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/rooms-icon.gif"><BR>
+Rooms</A><BR><BR>
+
+<IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/users-icon.gif"><BR>
+Users<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>
+Log off</A><BR><BR>
+
+<A HREF="http://uncensored.citadel.org/citadel" TARGET="aboutcit"
+       onMouseOver="window.status='Find out more about Citadel'; return true;">
+powered by<BR>
+<IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/citadel-logo.jpg" ALT="CITADEL/UX"></A>
+
+</CENTER>
+</BODY>
+</HTML>
diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
new file mode 100644 (file)
index 0000000..d99cf54
--- /dev/null
+++ b/webcit/static/mainframeset.html
@@ -0,0 +1,19 @@
+<HTML>
+       <HEAD>
+       <TITLE>Citadel</TITLE>
+       </HEAD>
+
+       <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>
+               <FRAME NAME="workspace" SRC="/dotgoto&room=_BASEROOM_">
+               <FRAME NAME="bottom" SRC="/static/navbar.html">
+               </FRAMESET>
+       <NOFRAMES>
+Sorry, web-based access to Citadel requires a browser that supports frames,
+such as <A HREF="http://www.netscape.com/communicator">Netscape</A> or
+<A HREF="http://www.mozilla.org">Mozilla</A>.  If you are using an older
+browser, please upgrade now.
+       </NOFRAMES>
+       </FRAMESET>
+</HTML>
diff --git a/webcit/static/roombanner.html b/webcit/static/roombanner.html
index 4a7c1fe236ce3d66d234daab3a16dbf3692533c4..f337094da7009030046565ef6dd552f694c38b23 100644 (file)
--- a/webcit/static/roombanner.html
+++ b/webcit/static/roombanner.html
@@ -2,11 +2,6 @@
 <TABLE width=100% border=0 cellpadding=5>
 <TR>
 
-<TD VALIGN=TOP><A HREF="/ungoto">
-<IMG SRC="/static/back.gif" BORDER=0>
-<BR><FONT SIZE=-2>Previous room</FONT></A>
-</TD>
-
 <TD VALIGN=TOP BGCOLOR=444455>
 <FONT SIZE=+2 COLOR=FFFFEE><?ROOMNAME></FONT><BR>
 <FONT COLOR=DDDDCC><?NEWMSGS> new of <?TOTALMSGS> messages</FONT>
@@ -24,9 +19,4 @@
 <?YOUHAVEMAIL>
 </TD>
 
-<TD VALIGN=TOP><A HREF="/gotonext">
-<IMG SRC="/static/forward.gif" border=0>
-<BR><FONT SIZE=-2>Next room</FONT></A>
-</TD>
-
 </TR></TABLE></CENTER>
diff --git a/webcit/static/rooms-icon.gif b/webcit/static/rooms-icon.gif
new file mode 100644 (file)
index 0000000..07be8e3
Binary files /dev/null and b/webcit/static/rooms-icon.gif differ
diff --git a/webcit/static/users-icon.gif b/webcit/static/users-icon.gif
new file mode 100644 (file)
index 0000000..4ed8939
Binary files /dev/null and b/webcit/static/users-icon.gif differ
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 6a0af7eede4f7eee236a9355b4bdcbfae2e89adb..1c32abfcedff04b55ab08e1d87fdb6ee879dfbe1 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -173,23 +173,7 @@ void wprintf(const char *format,...)
 void wDumpContent(int print_standard_html_footer)
 {
        if (WC->fake_frames) {
-               wprintf("<CENTER><FONT SIZE=-1>"
-                       "<TABLE border=0 width=100%%><TR>"
-                       "<TD><A HREF=\"/ungoto\">"
-                       "<IMG SRC=\"/static/back.gif\" BORDER=0>"
-                       "Ungoto</A></TD>");
-               wprintf("<TD><A HREF=\"#TheTop\">"
-                       "<IMG SRC=\"/static/up.gif\" BORDER=0>"
-                       "Top of page</A></TD>");
-               wprintf("<TD><A HREF=\"/display_enter\">"
-                       "<IMG SRC=\"/static/enter.gif\" BORDER=0>"
-                       "Enter a message</A></TD>");
-               wprintf("<TD><A HREF=\"/gotonext\">"
-                       "Goto next room"
-                       "<IMG SRC=\"/static/forward.gif\" BORDER=0></A></TD>"
-                       "</TR></TABLE>"
-                       "</FONT>\n"
-                       "</TD></TR></TABLE></TABLE>\n");
+               wprintf("</TABLE>\n");
                WC->fake_frames = 0;
        }
 
@@ -364,14 +348,9 @@ void output_headers(int controlcode)
                clear_local_substs();
 
        if (print_standard_html_head == 1) {
-               wprintf("<A NAME=\"TheTop\"></A>"
-                       "<TABLE border=0 width=100%%>"
-                       "<TR VALIGN=TOP><TD VALIGN=LEFT CELLPADDING=0>");
+               wprintf("<A NAME=\"TheTop\"></A>");
 
-               display_menubar(0);
-
-               wprintf("</TD><TD VALIGN=TOP>"
-                       "<TABLE border=0 width=100%%><TR VALIGN=TOP>"
+               wprintf("<TABLE border=0 width=100%%><TR VALIGN=TOP>"
                        "<TD>\n");
 
                embed_room_banner(NULL);
Citadel server, clients, utilities