]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* Started changing some of the top-level tables from 100% width to 99%
[citadel.git] / webcit / messages.c
index d847609f981d76afd280ab2338eaf749d9b82a5d..4e6d28f991e0ccf99841ef287c61916bd61537fb 100644 (file)
@@ -369,7 +369,7 @@ void read_message(long msgnum) {
        }
 
        /* begin everythingamundo table */
-       wprintf("<table width=100% border=1 cellspacing=0 "
+       wprintf("<center><table width=99%% border=1 cellspacing=0 "
                "cellpadding=0><TR><TD>\n");
 
        /* begin message header table */
@@ -642,7 +642,7 @@ ENDBODY:
        wprintf("</TD></TR></TABLE>\n");
 
        /* end everythingamundo table */
-       wprintf("</TD></TR></TABLE><br />\n");
+       wprintf("</TD></TR></TABLE></center><br />\n");
 }
 
 
@@ -880,8 +880,8 @@ void fetch_ab_name(long msgnum, char *namebuf) {
  */
 int abcmp(const void *ab1, const void *ab2) {
        return(strcasecmp(
-               (((const struct addrbookent *)ab1)->ab_name),
-               (((const struct addrbookent *)ab2)->ab_name)
+               (((const struct addrbookent *)ab1)->ab_name),
+               (((const struct addrbookent *)ab2)->ab_name)
        ));
 }
 
@@ -1135,8 +1135,10 @@ void readloop(char *oper)
                }
        }
 
+       wprintf("<FORM NAME=\"msgomatic\" "
+               "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
        if (is_summary) {
-               wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n"
+               wprintf(
                        "<TABLE border=0 cellspacing=0 "
                        "cellpadding=0 width=100%%>\n"
                        "<TR>"
@@ -1266,7 +1268,6 @@ void readloop(char *oper)
                        oper,
                        WC->msgarr[0]);
 
-               wprintf("</TD></TR></TABLE></CENTER>\n");
            }
        }
 
@@ -1275,55 +1276,53 @@ void readloop(char *oper)
         * messages, then display the selector bar
         */
        if (num_displayed > 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
-               wprintf("<CENTER>"
-                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
-                       "Reading #%d-%d of %d messages.</TD>\n"
-                       "<TD ALIGN=RIGHT><FONT SIZE=+1>",
-                       lowest_displayed, highest_displayed, nummsgs);
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+             && (!is_notes) && (!is_singlecard)) {
 
-               if (is_summary) {
-                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Delete selected\">\n");
-               }
+               wprintf("Reading #", lowest_displayed, highest_displayed);
 
+               wprintf("<SELECT NAME=\"whichones\" SIZE=\"1\" "
+                       "OnChange=\"location.href=msgomatic.whichones.options"
+                       "[selectedIndex].value\">\n");
 
                for (b=0; b<nummsgs; b = b + maxmsgs) {
                lo = b+1;
                hi = b+maxmsgs;
                if (hi > nummsgs) hi = nummsgs;
-                       if (WC->msgarr[b] != startmsg) {
-                               wprintf("<A HREF=\"/%s"
-                                       "?startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&summary=%d\">"
-                                       "%d-%d</A> \n",
-                                               oper,
-                                               WC->msgarr[b],
-                                               maxmsgs,
-                                               is_summary,
-                                               lo, hi);
-                       }
-                       else {
-                               wprintf("%d-%d \n", lo, hi);
-                       }
-
+                       wprintf("<OPTION %s VALUE="
+                               "\"/%s"
+                               "?startmsg=%ld"
+                               "&maxmsgs=%d"
+                               "&summary=%d\">"
+                               "%d-%d</OPTION> \n",
+                               ((WC->msgarr[b] == startmsg) ? "SELECTED" : ""),
+                               oper,
+                               WC->msgarr[b],
+                               maxmsgs,
+                               is_summary,
+                               lo, hi);
                }
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
+               wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=%d\">"
                        "ALL"
-                       "</A> ",
+                       "</OPTION> ",
                        oper,
                        WC->msgarr[0], is_summary);
 
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
+               wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=1\">"
                        "Summary"
-                       "</A>",
+                       "</OPTION>",
                        oper,
                        WC->msgarr[0]);
 
-               wprintf("</TD></TR></TABLE></CENTER>\n");
+               wprintf("</SELECT> of %d messages.", nummsgs);
+
+               if (is_summary) {
+                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Delete selected\">\n");
+               }
+
            }
        }
        if (is_summary) wprintf("</FORM>\n");
@@ -1543,8 +1542,13 @@ void display_enter(void)
        }
 #endif
 
-       /* Otherwise proceed normally */
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       /* Otherwise proceed normally.  Do a custom room banner with no navbar... */
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_none);
+       wprintf("</div>\n");
+       wprintf("<div id=\"content\">\n");
+
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
        serv_gets(buf);
@@ -1576,38 +1580,34 @@ void display_enter(void)
        stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
        /* begin message entry screen */
-       wprintf("<div style=\"position:absolute; left:1%%; width:98%%; height:100%%\">\n");
-
-       wprintf("<CENTER>\n");
-       wprintf("%s<BR>\n", buf);       /* header bar */
+       wprintf("<div style=\"position:absolute; left:1%%; width:96%%; height:100%%\">\n");
 
-       wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
-               "METHOD=\"POST\" ACTION=\"/post\" "
-               "NAME=\"enterform\""
+       wprintf("<form enctype=\"multipart/form-data\" "
+               "method=\"POST\" action=\"/post\" "
+               "name=\"enterform\""
                "onSubmit=\"return submitForm();\""
                ">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
+       wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
                bstr("recp"));
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
+       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
                now);
 
-       wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
-       wprintf("<TR><TD ALIGN=LEFT>");
-       wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \">");
+       wprintf("%s<br>\n", buf);       /* header bar */
+       wprintf("<img src=\"static/enter.gif\" align=middle alt=\" \">");
                /* "onLoad=\"document.enterform.msgtext.focus();\" " */
-       wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
-               "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
+       wprintf("<font size=-1>Subject (optional):</font>"
+               "<input type=\"text\" name=\"subject\" value=\"");
        escputs(bstr("subject"));
-       wprintf("\" SIZE=40 MAXLENGTH=70>"
+       wprintf("\" size=40 maxlength=70>"
                "&nbsp;"
        );
-       wprintf("</TD>");
 
-       wprintf("<TD ALIGN=RIGHT>");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+       wprintf("<input type=\"submit\" name=\"sc\" value=\"Save message\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
-       wprintf("</TD></TR></TABLE>\n");
+               "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
+
+       /* begin richedit box */
+       wprintf("<div style=\"position:absolute; left:0%%; width:100%%; top:15%; height:80%%\">\n");
 
        wprintf("<script type=\"text/javascript\" "
                "src=\"static/richtext.js\"></script>\n"
@@ -1623,20 +1623,12 @@ void display_enter(void)
                "<script type=\"text/javascript\"> \n"
                "writeRichText('msgtext', '");
        msgescputs(bstr("msgtext"));
-       wprintf("', '100%%', 200, true, false); \n"
+       wprintf("', '100%%', '80%%', true, false); \n"
                "</script> \n");
-
-/*
- * Before we had the richedit widget, we did it this way...
- *
-       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
-               "WIDTH=80>");
-       escputs(bstr("msgtext"));
-       wprintf("</TEXTAREA><br />\n");
- */
+       wprintf("</div>\n");    /* end richedit box */
 
        /* Here comes the "do attachments" section on the bottom */
-       wprintf("<div style=\"position:absolute; bottom:0px; left:0px\">\n");
+       wprintf("<div style=\"position:absolute; bottom:0px; left:0px; width:100%%\">\n");
 
        /* Enumerate any attachments which are already in place... */
        for (att = WC->first_attachment; att != NULL; att = att->next) {
@@ -1655,7 +1647,8 @@ void display_enter(void)
 
        wprintf("</div>\n");    /* end attachments section */
 
-       wprintf("</FORM></CENTER>\n");
+       wprintf("</FORM>\n");
+
        wprintf("</div>\n");
 DONE:  wDumpContent(1);
 }