From 8fb740a4207224fe855da7bfd8c663b3e5bec484 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 15 May 2001 03:22:27 +0000
Subject: [PATCH] * More icon updates and link cleanup type stuff

---
 webcit/ChangeLog                |   4 ++++
 webcit/paging.c                 |   6 ++----
 webcit/static/back.gif          | Bin 109 -> 258 bytes
 webcit/static/enter.gif         | Bin 130 -> 1041 bytes
 webcit/static/forward.gif       | Bin 109 -> 264 bytes
 webcit/static/iconbar.html      |   4 ++--
 webcit/static/login.html        |   2 +-
 webcit/static/mainframeset.html |   4 ++--
 webcit/static/navbar.html       |  12 ++++++------
 webcit/static/readmsgs.gif      | Bin 0 -> 1222 bytes
 webcit/who.c                    |  19 ++++++++++---------
 11 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 webcit/static/readmsgs.gif

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9190e14e5..57c8caeea 100644
--- 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 a27b18485..797ae0219 100644
--- 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
GIT binary patch
literal 258
zcmZ?wbhEHblx2`(IKsg2|NnpIwEqk`9~k5oF(3g2_Vp4BOkxboYz!<+o;u9x4$Ss4
zOr9Fd>Lv;HZVU`9%=T_>?CbrTIa<KFm>Rb-@aQmowPIjj&%of2x?APDn8NpVJH?+Y
zj35O%AOd8k18cp4LSIVeJPkn}Cv6s%s#R;U?^kf2R{DEvPeT4y;l7%kOV&m>?P9yI
zLgbW)P{XkWT(fi6mE2i#SyW^8`LqWSE7vexdy_ijNlE$MZ`H-?<e$B_t9L7{35zcZ
u@9YX!D=18GZ|}Es?VCJdqUrRa-bu6TlMT8TN3}P_nk;WvRqLk6U=0A8?^b{S

literal 109
zcmZ?wbhEHb6l4%$Sj52a|NsA8d#+BKxnI|~o`E5a0R|L*vapH(IXWN#kXi<2BaU5n
z{(1K>%v5Q))@}S`?)8R+D<&-MSa$Q&w!^ct@>b5>SmXZl&)2zgn^kHGy6jU}ConKr
F0|190C~W`$

diff --git a/webcit/static/enter.gif b/webcit/static/enter.gif
index c90cbe9cec35e60b42b6df766363a12b07bea3f2..891abd5f1fbccbf5e8a1781a2bb480b6f3c74728 100644
GIT binary patch
literal 1041
zcmZ?wbh9u|RA5kG_|D1z1P2ZrU|?tfLI#HaAn^Oc{|{FJj2QkO-}rxZ-~azt?%ZK0
zE(Xeug3%BdZXuxflZBCifssK6<S|g5VCQ(pz|0}zv0=f%W)5Mkm=yvH3~d6eRwWq^
z5|6ZTOBgUDEO>OZg+YuV!{Op%_hu3AvMm)wO2_*Q5;yfo1U>eiX_#)rV;S_+ccyso
zy+1Q2r=6K<(f`V2#ipd7<qqOZ79WaUTwbBD{NI+Ul2m7=sEJ)~Ux}(jtg<|LDke(c
zz|B>bu~tiVeO?>H!1+lnz(8=(?G4)Md=fr8J|t{z&{msp`o_cX0~O-#VF#w`2Ji0r
z`tE7;flmkbXQ;n=8ndAI!uAkW3zfT)jp<YJL%ntGN;ST|%#d<^U9R-O<NI?Nzr4FE
Y^t9lSdawNVxiLRKJe%Lo&ca{~04!mQF#rGn

literal 130
zcmZ?wbhEHb6krfw_{_lY|Ns9#pIQH>Fx}-~`^3@W#;}xu;R@60SMu9M7*YhobXX@8
zS{*oWprN6`!NGxnfkE*n3nP$X&;b!3GaOj-1x|Rb7H#TXyXN?;r5Ze!D>JH6Zx{H@
gJhpIg*8QmlcM`h4ZJv6@RXa0oQ6N`(Hv@w;0KC92;s5{u

diff --git a/webcit/static/forward.gif b/webcit/static/forward.gif
index 1b6d64ed6d97845505570696e41c66b88f8858d4..0f1b16a081a6ed1eb16e77c5d0d0788e7fadd743 100644
GIT binary patch
literal 264
zcmZ?wbhEHblx2`(IKsg2|NnpIwEqmcpBUs8F(82!_Vp4BOkxboYz!<+%O)_ZJ22bJ
zFfHq0RyX-$@5aE;!ffy6#=hRanWF`)i>Yxd14{+d_aFxL^$ZLSsk>Faiz$3>w^RJd
z!U$5J10q0nI<U4XDD<Ud&RgNh;-t;P*tjk)_r9Laa@Dn;9WK6NU-GcebdiBUhShxE
z*+w2pZ&n<<DmvT9FSKz(h0eZOMz<xuM5EXBKUZ2UdVJljJMYZucfJ3qY**3HSe#QI
z8rIbv)>hIS+Lv!RA!E|yDdCwjf+}XuX`i^DzoTc_?9#~Ml_AbkTcTPvDJwEq0|2?b
BTqOVi

literal 109
zcmZ?wbhEHb6l4%$Sj52a|NsA8d#+BKxnI|~o`E5a0R|L*vapH(IXWN#kXi<2BaU5n
zq?~tfGAT|ps@`}d=6T>k3$vw_cB^KE=1MQ!=)U{@-Mwr6<XTMXFn=iE>E2s3iGjfy
E0Oo=uA^-pY

diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index c553e743e..01bbbc31f 100644
--- 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 601566f65..638dab077 100644
--- 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 c0073f346..37b7e55e0 100644
--- 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 4f8d2a4c5..77ba67c20 100644
--- 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
index 0000000000000000000000000000000000000000..87fa4f1dd5faae1c075f9e057644392c77c81753
GIT binary patch
literal 1222
zcmeH`>rc{g7{$LJzd~>h@0ew#R_4q!vsgI?me(zZrpq<kuyi%oW^TQ(wb~Ca=rmVu
zu6)r7@sgxNKm_F?U}m;Ch3ORU1LP(s;1x6_T>nMu^X@!v&Uwyu(lgTtH;TeQ7}#?G
zHx7r>>D=GnKR7t}?dI_C@aX8s<#M^NySuwvTU$1pZGC-xZEek9Fv?`Ip&_Zo;+AHU
zX-%&;=yZCmc2%R%s@0l>g{7Gpl~Or1K0Yxz`b#b!5sRfP7Dpl(awC;W#bSv_Bo+!q
zgM&heL?RZ8MIzB(@4dafot+&3;O*^gyWMWJS}hif!{IO(3>zC8tE;POwc2bpYqi>y
zm6gTC#ksjTqtU3->6Vt<rZZDhQ=6Nc%gf92^YgQ_vkHa6WHM<q?nnzNm1=r=TB%g(
z^?HF|KqwRr3=H!50v@lQ%kAs$=X1F{4yUiTm&0PQdwP1iyID+TPghrWXXm$$4rY7%
zR|ccAwY7szZ-*dgczF1@wg3DR4V-hL5CA*@F~{E=Z{j4{1t!s_GuU)_71}SlumA^t
zuf;{A6r;mn7=gmz2{4_Ags}K)&usuyqk%v2eH?YT3KJMh8KW0@)Ov>|!*Rigl)7g0
zc}ydkDnlZP`Sk@i!;zl8xa|6<A`Pk@gU-q=jAk(Jbw#GNlR1?zsx8wGNs%*Bv5g@<
zVR4FZYC{k<IxZum8G0*)J+L$-Y$X9tU*2VU)8lkeeDOG4En|~F;t~H$l8UCI#g<0B
z2?-)KoN6i~u&LSv62Ks(Ixj-4naaNXZYD}l(*PyBP^sivK2i0_M-iKC|AB>CQw2Mi
zLV`VXbQ08&4$5q@WUfbB0dXkFiI2xC9Eiwt+}V_oE5?bJbrs=P@#8J!ZHPvfMMtjo
zN%x{wS2*p4FW%mfO(<NJKL_P^mw=#Fcy0fr_+C#!+<E1j`&3<1iYZ}a=Demo%8TI}
zH8o^*7sK;HGdbmcc4}fJCMP2v3djez2vqLC2{<6HkeV9!;F%l>dRSqH@I`g;CxT1p
Y6k7Sk&tr;@6xt<yOYsLLnFwzE0a{z0&;S4c

literal 0
HcmV?d00001

diff --git a/webcit/who.c b/webcit/who.c
index 39e0a0639..4481459a0 100644
--- 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>");
-- 
2.39.2