* Replaced all the "centered 99% tables" with 100% width tables wrapped

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 90845b5ee0d73e06831d4fb2cc561434b3269d11..fdcf30ce8d533f431a5074afa7c2544c7f07180b 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,3 +1,8 @@
+/*
+ * $Id$
+ *
+ * Handles HTTP upload of graphics files into the system.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -27,38 +32,47 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        serv_puts(check_cmd);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Set/change %s</SPAN>\n", description);
-       wprintf("</TD></TR></TABLE>\n");
+       output_headers(1, 1, 0, 0, 0, 0, 0);
+
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Set/change your photo</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<div style=\"margin-right:1px\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
 
        wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s\" "
                "METHOD=\"POST\" NAME=\"graphicsupload\">\n", uplurl);
 
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"foo\" VALUE=\"bar\">\n");
-
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"which_room\" VALUE=\"");
        urlescputs(bstr("which_room"));
        wprintf("\">\n");
 
        wprintf("You can upload any image directly from your computer,\n");
        wprintf("as long as it is in GIF format (JPEG, PNG, etc. won't\n");
-       wprintf("work).<BR><BR>\n");
+       wprintf("work).<br /><br />\n");
 
-       wprintf("Please select a file to upload:<BR>\n");
+       wprintf("Please select a file to upload:<br /><br />\n");
        wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-       wprintf("<BR>");
-       wprintf("<INPUT TYPE=\"SUBMIT\" VALUE=\"Upload\">\n");
+       wprintf("<br /><br />");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Upload\">\n");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"baz\" VALUE=\"eek\">\n");
+       wprintf("&nbsp;");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Cancel\">\n");
        wprintf("</FORM>\n");
-       wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
        wprintf("</CENTER>\n");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -69,14 +83,24 @@ void do_graphics_upload(char *upl_cmd)
        int pos = 0;
        int thisblock;
 
+       if (!strcasecmp(bstr("sc"), "Cancel")) {
+               strcpy(WC->ImportantMessage,
+                       "Graphics upload cancelled.");
+               display_main_menu();
+               return;
+       }
+
        if (WC->upload_length == 0) {
-               display_error("You didn't upload a file.\n");
+               strcpy(WC->ImportantMessage,
+                       "You didn't upload a file.");
+               display_main_menu();
                return;
        }
        serv_puts(upl_cmd);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        bytes_remaining = WC->upload_length;
@@ -85,9 +109,10 @@ void do_graphics_upload(char *upl_cmd)
                serv_printf("WRIT %d", thisblock);
                serv_gets(buf);
                if (buf[0] != '7') {
-                       display_error(&buf[4]);
+                       strcpy(WC->ImportantMessage, &buf[4]);
                        serv_puts("UCLS 0");
                        serv_gets(buf);
+                       display_main_menu();
                        return;
                }
                thisblock = extract_int(&buf[4], 0);