projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94ab266)
Set up login banner graphic and background image graphic
authorArt Cancro <ajc@citadel.org>
Thu, 10 Dec 1998 04:04:10 +0000 (04:04 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 10 Dec 1998 04:04:10 +0000 (04:04 +0000)
webcit/ChangeLog patch | blob | history
webcit/auth.c patch | blob | history
webcit/context_loop.c patch | blob | history
webcit/mainmenu.c patch | blob | history
webcit/roomops.c patch | blob | history
webcit/static/menubar.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 2f3ca57a01b5bc29259495a646b0134261eb60c8..5901414b79d94392839cbb4070348b303f5de7b5 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -3,6 +3,7 @@ Wed Dec  9 18:50:46 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
          so when the parent process closes it, it actually _does_ close.
          Otherwise, aIEeeee and possibly other browsers will hang.
        * Added support for graphics images retrieved from the Citadel server.
+       * Set up login banner graphic and background image graphic
 
 1998-12-09 Nathan Bryant <bryant@cs.usm.maine.edu>
        * context_loop.c, webserver.c, webserver.h: SO_LINGER and locking fix
diff --git a/webcit/auth.c b/webcit/auth.c
index 436965bba17681bdf9fe4be7c704290822a07fe3..9b878913412c8b6ded0095f3006b7f2edbcb554e 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -28,10 +28,10 @@ void display_login(char *mesg) {
        printf("HTTP/1.0 200 OK\n");
        output_headers();
 
-       wprintf("<HTML><BODY>\n");
-       wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
+       wprintf("<HTML><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
 
-       /* FIX replace with the correct image */
+       /* Da banner */
+       wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
        wprintf("<IMG SRC=\"/image&name=hello\">");
        wprintf("</TD><TD><CENTER>\n");
 
@@ -45,9 +45,9 @@ void display_login(char *mesg) {
                }
 
        wprintf("</CENTER></TD></TR></TABLE></CENTER>\n");
-
        wprintf("<HR>\n");
-       /* FIX add instructions here */
+
+       /* Da login box */
        wprintf("<CENTER><FORM ACTION=\"/login\" METHOD=\"POST\">\n");
        wprintf("<TABLE border><TR>\n");
        wprintf("<TD>User Name:</TD>\n");
@@ -60,6 +60,20 @@ void display_login(char *mesg) {
         wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"New User\">\n");
         wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Exit\">\n");
         wprintf("</FORM></CENTER>\n");
+
+       /* Da instructions */
+       wprintf("<LI><EM>If you already have an account on %s,",
+               serv_info.serv_humannode);
+       wprintf("</EM> enter your user name\n");
+       wprintf("and password and click \"<TT>Login</TT>.\"<BR>\n");
+       wprintf("<LI><EM>If you are a new user,</EM>\n");
+       wprintf("enter the name and password you wish to use, and click\n");
+       wprintf("\"New User.\"<BR><LI>");
+       wprintf("<EM>Please log off properly when finished.</EM>");
+       wprintf("<LI>You must use a browser that supports <i>frames</i> ");
+       wprintf("and <i>cookies</i>.\n");
+       wprintf("</EM></UL>\n");
+
        wprintf("</BODY></HTML>\n");
        wDumpContent();
        }
@@ -134,7 +148,7 @@ void do_login(void) {
 void do_welcome(void) {
        printf("HTTP/1.0 200 OK\n");
        output_headers();
-       wprintf("<HTML><BODY>\n");
+       wprintf("<HTML><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
        wprintf("<CENTER><H1>");
        escputs(wc_username);
        wprintf("</H1>\n");
@@ -164,7 +178,7 @@ void do_logout(void) {
        output_headers();
        printf("X-WebCit-Session: close\n");
        
-       wprintf("<HTML><HEAD><TITLE>Goodbye</TITLE></HEAD><BODY><CENTER>\n");
+       wprintf("<HTML><HEAD><TITLE>Goodbye</TITLE></HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\"><CENTER>\n");
 
        serv_puts("MESG goodbye");
        serv_gets(buf);
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 46b249cdfebd6bc820108fd70cc2135dd2343d89..9bfd6a1769b6a0aae1912a9c52cbc6201d03a199 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -209,7 +209,7 @@ void *context_loop(int sock) {
                        printf("Content-length: 76\n");
                        printf("\n");
                        printf("<HTML><HEAD><TITLE>Error</TITLE></HEAD>\n");
-                       printf("<BODY>execlp() failed</BODY></HTML>\n");
+                       printf("<BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">execlp() failed</BODY></HTML>\n");
                        exit(0);
                        }
                /* Close the ends of the pipes that we're not using */
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index e612d42e6ea78b5151e3c31dbf859964743298d2..98bc44527b5f4652c732ebe7231cc0bba8e67d0e 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -196,7 +196,7 @@ wprintf("</FONT></TD></TR></TABLE>\n");
 void display_main_menu(void) {
        printf("HTTP/1.0 200 OK\n");
        output_headers();
-       wprintf("<HTML><HEAD><TITLE>WebCit main menu</TITLE></HEAD><BODY>\n");
+       wprintf("<HTML><HEAD><TITLE>WebCit main menu</TITLE></HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
        embed_main_menu();
        wprintf("</BODY></HTML>\n");
        wDumpContent();
@@ -206,7 +206,7 @@ void display_main_menu(void) {
 void display_advanced_menu(void) {
        printf("HTTP/1.0 200 OK\n");
        output_headers();
-       wprintf("<HTML><HEAD><TITLE>WebCit main menu</TITLE></HEAD><BODY>\n");
+       wprintf("<HTML><HEAD><TITLE>WebCit main menu</TITLE></HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
        embed_advanced_menu();
        embed_main_menu();
        wprintf("</BODY></HTML>\n");
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 81ca79025c18a6e4ef28378f0ecf6bf70aedd5ab..bd26fe7a1d069e82b4de17f0c1b62a650b1aebcc 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -117,7 +117,7 @@ void list_all_rooms_by_floor(void) {
 
         printf("HTTP/1.0 200 OK\n");
         output_headers();
-        wprintf("<HTML><HEAD><TITLE>List known rooms</TITLE></HEAD><BODY>\n");
+        wprintf("<HTML><HEAD><TITLE>List known rooms</TITLE></HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
 
        wprintf("<TABLE width=100% border><TR><TH>Floor</TH>");
        wprintf("<TH>Rooms with new messages</TH>");
@@ -194,7 +194,7 @@ void gotoroom(char *gname, int display_name)
 
        printf("HTTP/1.0 200 OK\n");
        output_headers();
-        wprintf("<HTML><BODY>\n");
+        wprintf("<HTML><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
 
        if (display_name != 2) {
                /* store ungoto information */
diff --git a/webcit/static/menubar.html b/webcit/static/menubar.html
index 080f3bbe6ef317cbd61a08a84bd4368b0cf97fd7..9fb61388039f27389920135a5f7636f413b1d598 100644 (file)
--- a/webcit/static/menubar.html
+++ b/webcit/static/menubar.html
@@ -2,7 +2,7 @@
 <HEAD>
        <TITLE>MenuBar</TITLE>
 </HEAD>
-<BODY>
+<BODY BACKGROUND="/image&name=background" TEXT="#000000" LINK="#004400">
        <H2>Citadel/UX</H2>
        <UL>
                <LI><A HREF="/knrooms" TARGET="bottom">List known rooms
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 4065c07443f07c4887c503b8524e81b9de85da18..273fb2a1e60a2d6df380a209e2aa496f654020f1 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -607,7 +607,7 @@ void session_loop(void) {
                printf("HTTP/1.0 200 OK\n");
                output_headers();
        
-               wprintf("<HTML><HEAD><TITLE>WebCit</TITLE></HEAD><BODY>\n");
+               wprintf("<HTML><HEAD><TITLE>WebCit</TITLE></HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
                wprintf("TransactionCount is %d<BR>\n", TransactionCount);
                wprintf("You're in session %d<HR>\n", wc_session);
                wprintf("Command: <BR><PRE>\n");
diff --git a/webcit/who.c b/webcit/who.c
index c3207f3bdb65edbc2397b744d2f42a0c307a2d88..3ad6008c93f11fc4d113a3038c96120ea6cbe624 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -37,7 +37,7 @@ void whobbs(void) {
        /* Uncomment this line to cause the wholist to auto-refresh */
        /* wprintf("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"60\">\n"); */
 
-       wprintf("</HEAD><BODY>\n");
+       wprintf("</HEAD><BODY BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Users currently on ");
Citadel server, clients, utilities