projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60f5409)
* More icon updates and link cleanup type stuff
authorArt Cancro <ajc@citadel.org>
Tue, 15 May 2001 03:22:27 +0000 (03:22 +0000)
committerArt Cancro <ajc@citadel.org>
Tue, 15 May 2001 03:22:27 +0000 (03:22 +0000)
webcit/ChangeLog patch | blob | history
webcit/paging.c patch | blob | history
webcit/static/back.gif patch | blob | history
webcit/static/enter.gif patch | blob | history
webcit/static/forward.gif patch | blob | history
webcit/static/iconbar.html patch | blob | history
webcit/static/login.html patch | blob | history
webcit/static/mainframeset.html patch | blob | history
webcit/static/navbar.html patch | blob | history
webcit/static/readmsgs.gif [new file with mode: 0644] patch | blob
webcit/who.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9190e14e5a66a357b03b0e552fabdc3b8923db34..57c8caeea37f10af6e318a42f18829badf47a1e4 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 213.11  2001/05/15 03:22:25  ajc
+* More icon updates and link cleanup type stuff
+
 Revision 213.10  2001/05/06 05:11:48  ajc
 * Added paging icon and right-justified it
 * Send-page window is now a popup
@@ -538,3 +541,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/paging.c b/webcit/paging.c
index a27b184854a043171fcc95c5b46b780247c41f97..797ae02191d30706bd103cfaf857084fec81112b 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -27,8 +27,6 @@
  */
 void display_page(void)
 {
-       char buf[256];
-       char user[256];
        char recp[256];
 
        strcpy(recp, bstr("recp"));
@@ -40,8 +38,8 @@ void display_page(void)
        wprintf("<B>Page another user</B>\n");
        wprintf("</FONT></TD></TR></TABLE>\n");
 
-       wprintf("This command sends a near-real-time message to any currently\n");
-       wprintf("logged in user.<BR><BR>\n");
+       wprintf("<CENTER>This will send a page (instant message) "
+               "to %s.<BR><BR>\n", recp);
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
diff --git a/webcit/static/back.gif b/webcit/static/back.gif
index bcd00bc0c4382a10e98d7b4335bfbb9e2879b498..294632c1dd7d49f65e6280805439007a4b63a705 100644 (file)
Binary files a/webcit/static/back.gif and b/webcit/static/back.gif differ
diff --git a/webcit/static/enter.gif b/webcit/static/enter.gif
index c90cbe9cec35e60b42b6df766363a12b07bea3f2..891abd5f1fbccbf5e8a1781a2bb480b6f3c74728 100644 (file)
Binary files a/webcit/static/enter.gif and b/webcit/static/enter.gif differ
diff --git a/webcit/static/forward.gif b/webcit/static/forward.gif
index 1b6d64ed6d97845505570696e41c66b88f8858d4..0f1b16a081a6ed1eb16e77c5d0d0788e7fadd743 100644 (file)
Binary files a/webcit/static/forward.gif and b/webcit/static/forward.gif differ
diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index c553e743e80574ea5269d244079ccb308cfa9cb1..01bbbc31f9d0cac5ee98a49eaa8fce0f9aaaeb9a 100644 (file)
--- a/webcit/static/iconbar.html
+++ b/webcit/static/iconbar.html
@@ -1,7 +1,7 @@
 <HTML>
 <BODY BGCOLOR=AAAAAA>
 <CENTER>
-<IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/image&name=hello"><BR><BR>
+<IMG BORDER=0 WIDTH=64 HEIGHT=64 SRC="/image&name=hello"><BR><BR>
 
 <A HREF="/knrooms" TARGET="workspace">
 <IMG BORDER=0 WIDTH=32 HEIGHT=32 SRC="/static/rooms-icon.gif"><BR>
@@ -22,7 +22,7 @@ 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>
+<IMG BORDER=0 WIDTH=64 HEIGHT=64 SRC="/static/citadel-logo.jpg" ALT="CITADEL/UX"></A>
 
 </CENTER>
 </BODY>
diff --git a/webcit/static/login.html b/webcit/static/login.html
index 601566f652502bf203dfbeaf2624fadedc105da4..638dab07786f7c69e76e45613b13d7d55fadb4b2 100644 (file)
--- a/webcit/static/login.html
+++ b/webcit/static/login.html
@@ -11,7 +11,7 @@
                                <form action="/login" method="POST">
                                 <table border="1">
                                         <tr>
-                                                <td>UserName:</td>
+                                                <td>User name:</td>
                                                 <td> <input type="text" name="name" maxlength="25"></td>
                                         </tr>
                                         <tr>
diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
index c0073f346e5d5744a0ce11d4fb170897ea70c7a1..37b7e55e07cfff0fff24f356eb23375cc22e4d4f 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -3,9 +3,9 @@
        <TITLE>Citadel</TITLE>
        </HEAD>
 
-       <FRAMESET COLS="100, *" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
+       <FRAMESET COLS="75, *" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
                <FRAME NAME="left" SRC="/static/iconbar.html">
-               <FRAMESET ROWS="*, 50, 0" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER=0>
+               <FRAMESET ROWS="*, 55, 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">
diff --git a/webcit/static/navbar.html b/webcit/static/navbar.html
index 4f8d2a4c5b2d9aed8f190b25f6570bdd4b6b7310..77ba67c20ab7a3369240170187d6a93781d1341c 100644 (file)
--- a/webcit/static/navbar.html
+++ b/webcit/static/navbar.html
@@ -5,27 +5,27 @@
 <TR>
 
 <TD><A HREF="/ungoto" TARGET="workspace">
-<IMG SRC="/static/back.gif" BORDER=0>
+<IMG ALIGN=MIDDLE SRC="/static/back.gif" BORDER=0>
 <FONT SIZE=-1>Ungoto</FONT></A></TD>
 
 <TD><A HREF="/readnew" TARGET="workspace">
-<IMG SRC="/static/enter.gif" BORDER=0>
+<IMG ALIGN=MIDDLE SRC="/static/readmsgs.gif" BORDER=0>
 <FONT SIZE=-1>New messages</FONT></A></TD>
 
 <TD><A HREF="/readfwd" TARGET="workspace">
-<IMG SRC="/static/enter.gif" BORDER=0>
+<IMG ALIGN=MIDDLE SRC="/static/readmsgs.gif" BORDER=0>
 <FONT SIZE=-1>All messages</FONT></A></TD>
 
 <TD><A HREF="/display_enter" TARGET="workspace">
-<IMG SRC="/static/enter.gif" BORDER=0>
+<IMG ALIGN=MIDDLE SRC="/static/enter.gif" BORDER=0>
 <FONT SIZE=-1>Enter a message</FONT></A></TD>
 
 <TD><A HREF="/skip" TARGET="workspace">
 <FONT SIZE=-1>Skip this room</FONT>
-<IMG SRC="/static/forward.gif" BORDER=0></A></TD>
+<IMG ALIGN=MIDDLE SRC="/static/forward.gif" BORDER=0></A></TD>
 
 <TD><A HREF="/gotonext" TARGET="workspace">
 <FONT SIZE=-1>Goto next room</FONT>
-<IMG SRC="/static/forward.gif" BORDER=0></A></TD>
+<IMG ALIGN=MIDDLE SRC="/static/forward.gif" BORDER=0></A></TD>
 
 </TR></TABLE>
diff --git a/webcit/static/readmsgs.gif b/webcit/static/readmsgs.gif
new file mode 100644 (file)
index 0000000..87fa4f1
Binary files /dev/null and b/webcit/static/readmsgs.gif differ
diff --git a/webcit/who.c b/webcit/who.c
index 39e0a0639848a726a66c035933fcf74b4df3903b..4481459a0e3aef6c85d3b9924326196a246e4842 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -64,7 +64,8 @@ void whobbs(void)
 
        wprintf("<CENTER>\n"
                "Click on a name to read user info.  Click on "
-               "<IMG SRC=\"/static/page.gif\" ALT=\"(p)\" BORDER=0> to send "
+               "<IMG ALIGN=MIDDLE 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");
@@ -129,6 +130,14 @@ void whobbs(void)
                        }
                        wprintf("</TD>\n\t<TD>");
 
+                       /* (link to page this user) */
+                       wprintf("<A HREF=\"/display_page&recp=");
+                       urlescputs(wlist->username);
+                       wprintf("\">"
+                               "<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" "
+                               "ALT=\"(p)\""
+                               " BORDER=0></A>&nbsp;");
+
 
                        /* username (link to user bio/photo page) */
                        wprintf("<A HREF=\"/showuser&who=");
@@ -137,14 +146,6 @@ void whobbs(void)
                        escputs(wlist->username);
                        wprintf("</A>");
 
-                       /* (link to page this user) */
-                       wprintf("<DIV ALIGN=RIGHT>"
-                               "<A HREF=\"/whobbs\" "
-                               " onClick=\"return window.open('/display_page&recp=");
-                       urlescputs(wlist->username);
-                       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("</TD>\n\t<TD>");
Citadel server, clients, utilities