* More attractive display of vCards (hide unknown fields)

* Added "title" and "organization" to vCard display/edit
* Replaced semicolon with comma-space in vCard name display

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 92e2199046f1aebd9afba281a6fca26e4c36dece..90383bbf2fd36fe3a1a57f2072bfae2a01ff6408 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 603.10  2005/03/08 04:59:31  ajc
+* More attractive display of vCards (hide unknown fields)
+* Added "title" and "organization" to vCard display/edit
+* Replaced semicolon with comma-space in vCard name display
+
 Revision 603.9  2005/03/07 04:03:28  ajc
 * auth.c: shrink the margins on the login screen so the user sees something
   resembling a window.
@@ -2469,3 +2474,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/messages.c b/webcit/messages.c
index 1af10564cfe5cd37fdb107c74b31945aa7ea0943..6b82e1e30e6a82dd9ea8d4eeb278989566e21fbe 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -91,25 +91,57 @@ char buf[];
 }
 
 
+/*
+ * Turn a vCard "n" (name) field into something displayable.
+ */
+void vcard_n_prettyize(char *name)
+{
+       char *original_name;
+       int i;
+
+       original_name = strdup(name);
+       for (i=0; i<5; ++i) {
+               if (strlen(original_name) > 0) {
+                       if (original_name[strlen(original_name)-1] == ' ') {
+                               original_name[strlen(original_name)-1] = 0;
+                       }
+                       if (original_name[strlen(original_name)-1] == ';') {
+                               original_name[strlen(original_name)-1] = 0;
+                       }
+               }
+       }
+       strcpy(name, "");
+       for (i=0; i<strlen(original_name); ++i) {
+               if (original_name[i] == ';') {
+                       strcat(name, ", ");
+               }
+               else {
+                       name[strlen(name)+1] = 0;
+                       name[strlen(name)] = original_name[i];
+               }
+       }
+       free(original_name);
+}
+
+
+
+
 /* display_vcard() calls this after parsing the textual vCard into
  * our 'struct vCard' data object.
  * This gets called instead of display_parsed_vcard() if we are only looking
  * to extract the person's name instead of displaying the card.
  */
 void fetchname_parsed_vcard(struct vCard *v, char *storename) {
-       int i;
+       char *name;
 
        strcpy(storename, "");
-       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-               if (!strcasecmp(v->prop[i].name, "n")) {
-                       strcpy(storename, v->prop[i].value);
-                       if ((strlen(storename)>0) && (storename[0] != ';')) {
-                               while(storename[strlen(storename)-1] == ';') {
-                                       storename[strlen(storename)-1] = 0;
-                               }
-                       }
-               }
+
+       name = vcard_get_prop(v, "n", 1, 0, 0);
+       if (name != NULL) {
+               strcpy(storename, name);
+               /* vcard_n_prettyize(storename); */
        }
+
 }
 
 
@@ -137,12 +169,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
        int pass;
 
        char displayname[SIZ];
+       char title[SIZ];
+       char org[SIZ];
        char phone[SIZ];
        char mailto[SIZ];
 
        strcpy(displayname, "");
        strcpy(phone, "");
        strcpy(mailto, "");
+       strcpy(title, "");
+       strcpy(org, "");
 
        if (!full) {
                wprintf("<TD>");
@@ -151,7 +187,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        escputs(name);
                }
                else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       escputs(name);
+                       strcpy(displayname, name);
+                       vcard_n_prettyize(displayname);
+                       escputs(displayname);
                }
                else {
                        wprintf("&nbsp;");
@@ -160,7 +198,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                return;
        }
 
-       wprintf("<TABLE bgcolor=#888888>");
+       wprintf("<div align=center><table bgcolor=#aaaaaa width=50%%>");
        for (pass=1; pass<=2; ++pass) {
 
                if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -203,6 +241,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        if (!strcasecmp(firsttoken, "n")) {
                                if (strlen(displayname) == 0) {
                                        strcpy(displayname, thisvalue);
+                                       vcard_n_prettyize(displayname);
                                }
                        }
        
@@ -210,6 +249,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        else if (!strcasecmp(firsttoken, "fn")) {
                                strcpy(displayname, thisvalue);
                        }
+
+                       /* title */
+                       else if (!strcasecmp(firsttoken, "title")) {
+                               strcpy(title, thisvalue);
+                       }
+       
+                       /* organization */
+                       else if (!strcasecmp(firsttoken, "org")) {
+                               strcpy(org, thisvalue);
+                       }
        
                        else if (!strcasecmp(firsttoken, "email")) {
                                if (strlen(mailto) > 0) strcat(mailto, "<br />");
@@ -248,7 +297,8 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                                extract_token(buf, thisvalue, j, ';');
                                                if (strlen(buf) > 0) {
                                                        escputs(buf);
-                                                       wprintf("<br />");
+                                                       if (j<3) wprintf("<br />");
+                                                       else wprintf(" ");
                                                }
                                        }
                                        wprintf("</TD></TR>\n");
@@ -264,6 +314,8 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                /* ignore */
                        }
                        else {
+
+                               /*** Don't show extra fields.  They're ugly.
                                if (pass == 2) {
                                        wprintf("<TR><TD>");
                                        escputs(thisname);
@@ -271,6 +323,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                        escputs(thisvalue);
                                        wprintf("</TD></TR>\n");
                                }
+                               ***/
                        }
        
                        free(thisname);
@@ -283,7 +336,18 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
                        "<FONT SIZE=+1><B>");
                        escputs(displayname);
-                       wprintf("</B></FONT></TD></TR>\n");
+                       wprintf("</B></FONT>");
+                       if (strlen(title) > 0) {
+                               wprintf("<div align=right>");
+                               escputs(title);
+                               wprintf("</div>");
+                       }
+                       if (strlen(org) > 0) {
+                               wprintf("<div align=right>");
+                               escputs(org);
+                               wprintf("</div>");
+                       }
+                       wprintf("</TD></TR>\n");
                
                        if (strlen(phone) > 0)
                                wprintf("<TR><TD>Telephone:</TD><TD>%s</TD></TR>\n", phone);
@@ -293,7 +357,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
 
        }
 
-       wprintf("</TABLE>\n");
+       wprintf("</table></div>\n");
 }
 
 
@@ -525,18 +589,18 @@ void read_message(long msgnum) {
        wprintf("&subject=");
        if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
        urlescputs(m_subject);
-       wprintf("\">Reply</a> ");
+       wprintf("\">[Reply]</a> ");
 
        if (WC->is_room_aide)  {
        
                /* Move */
-               wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">Move </a>",
+               wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[Move]</a> ",
                        msgnum);
 
                /* Delete */
                wprintf("<a href=\"/delete_msg?msgid=%ld\" "
                        "onClick=\"return confirm('Delete this message?');\">"
-                       "Delete</a>", msgnum);
+                       "[Delete]</a>", msgnum);
                        
        }
 

diff --git a/webcit/static/body-background.gif b/webcit/static/body-background.gif
new file mode 100644 (file)
index 0000000..e69942e
Binary files /dev/null and b/webcit/static/body-background.gif differ

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 82f7aeed274a01d25ccf2fba66635ab146d3416a..d544708fdea76676bb0603960adebc74fec244b6 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -18,7 +18,7 @@ body {
        padding: 0 0 0 0;
        height: 100%;
        overflow: auto;
-       background: #aaaaaa;
+       background-image:url(static/body-background.gif);
        color: #000000;
        font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
        font-weight: normal;
@@ -140,7 +140,8 @@ html>body #button li a {
 }
 
 #button li a:hover {
-       background-color: #ddddff;
+       //background-color: #ddddff;
+       background-image:url(static/body-background.gif);
        color: #000000;
 }
 

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index fb18a33e417f86b8db157ed4e2a1a03f70f931c3..23c8df4a817dd173edcc03ac4b5d7ca6e04bbfc2 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -58,6 +58,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        char primary_inetemail[SIZ];
        char other_inetemail[SIZ];
        char extrafields[SIZ];
+       char title[SIZ];
+       char org[SIZ];
 
        lastname[0] = 0;
        firstname[0] = 0;
@@ -75,6 +77,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        worktel[0] = 0;
        primary_inetemail[0] = 0;
        other_inetemail[0] = 0;
+       title[0] = 0;
+       org[0] = 0;
        extrafields[0] = 0;
 
        strcpy(whatuser, "");
@@ -129,6 +133,14 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                                extract_token(prefix, value, 3, ';');
                                extract_token(suffix, value, 4, ';');
                        }
+
+                       else if (!strcasecmp(key, "title")) {
+                               strcpy(title, value);
+                       }
+       
+                       else if (!strcasecmp(key, "org")) {
+                               strcpy(org, value);
+                       }
        
                        else if (!strcasecmp(key, "adr")) {
                                extract_token(pobox, value, 0, ';');
@@ -178,10 +190,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
                "<img src=\"/static/vcard.gif\">"
-               "Contact information for "
-       );
-       escputs(whatuser);
-       wprintf("</SPAN>"
+               "Edit contact information"
+               "</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
@@ -197,7 +207,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "<TD>Last</TD>"
                "<TD>Suffix</TD></TR>\n");
        wprintf("<TR><TD><INPUT TYPE=\"text\" NAME=\"prefix\" "
-               "VALUE=\"%s\" MAXLENGTH=\"5\"></TD>",
+               "VALUE=\"%s\" MAXLENGTH=\"5\" SIZE=\"5\"></TD>",
                prefix);
        wprintf("<TD><INPUT TYPE=\"text\" NAME=\"firstname\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
@@ -209,48 +219,72 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
                lastname);
        wprintf("<TD><INPUT TYPE=\"text\" NAME=\"suffix\" "
-               "VALUE=\"%s\" MAXLENGTH=\"10\"></TD></TR></TABLE>\n",
+               "VALUE=\"%s\" MAXLENGTH=\"10\" SIZE=\"10\"></TD></TR></TABLE>\n",
                suffix);
 
-       wprintf("<TABLE border=0><TR><TD>PO box (optional):</TD>"
-               "<TD><INPUT TYPE=\"text\" NAME=\"pobox\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+       wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+       wprintf("<tr><td>");
+
+       wprintf("Title:<br>"
+               "<INPUT TYPE=\"text\" NAME=\"title\" "
+               "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+               title
+       );
+
+       wprintf("Organization:<br>"
+               "<INPUT TYPE=\"text\" NAME=\"org\" "
+               "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+               org
+       );
+
+       wprintf("</td><td>");
+
+       wprintf("<table border=0>");
+       wprintf("<tr><td>PO box:</td><td>"
+               "<INPUT TYPE=\"text\" NAME=\"pobox\" "
+               "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                pobox);
-       wprintf("<TR><TD>Address line 1:</TD>"
-               "<TD><INPUT TYPE=\"text\" NAME=\"extadr\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+       wprintf("<tr><td>Address:</td><td>"
+               "<INPUT TYPE=\"text\" NAME=\"extadr\" "
+               "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                extadr);
-       wprintf("<TR><TD>Address line 2:</TD>"
-               "<TD><INPUT TYPE=\"text\" NAME=\"street\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+       wprintf("<tr><td> </td><td>"
+               "<INPUT TYPE=\"text\" NAME=\"street\" "
+               "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                street);
-       wprintf("<TR><TD>City:</TD>"
-               "<TD><INPUT TYPE=\"text\" NAME=\"city\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\">\n",
+       wprintf("<tr><td>City:</td><td>"
+               "<INPUT TYPE=\"text\" NAME=\"city\" "
+               "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                city);
-       wprintf(" State: "
+       wprintf("<tr><td>State:</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"state\" "
-               "VALUE=\"%s\" MAXLENGTH=\"2\">\n",
+               "VALUE=\"%s\" MAXLENGTH=\"2\"></td></tr>\n",
                state);
-       wprintf(" ZIP code: "
+       wprintf("<tr><td>ZIP code:</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"zipcode\" "
-               "VALUE=\"%s\" MAXLENGTH=\"10\"></TD></TR>\n",
+               "VALUE=\"%s\" MAXLENGTH=\"10\"></td></tr>\n",
                zipcode);
-       wprintf("<TR><TD>Country:</TD>"
-               "<TD><INPUT TYPE=\"text\" NAME=\"country\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
+       wprintf("<tr><td>Country:</td><td>"
+               "<INPUT TYPE=\"text\" NAME=\"country\" "
+               "VALUE=\"%s\" MAXLENGTH=\"29\" WIDTH=\"5\"></td></tr>\n",
                country);
+       wprintf("</table>\n");
+
+       wprintf("</table>\n");
 
        wprintf("<TABLE BORDER=0><TR><TD>Home telephone:</TD>"
                "<TD><INPUT TYPE=\"text\" NAME=\"hometel\" "
-               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+               "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>\n",
                hometel);
-       wprintf("<TR><TD>Work telephone:</TD>"
+       wprintf("<TD>Work telephone:</TD>"
                "<TD><INPUT TYPE=\"text\" NAME=\"worktel\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
                worktel);
 
-       wprintf("<br /><TABLE border=0><TR>"
+       wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+       wprintf("<tr><td>");
+
+       wprintf("<TABLE border=0><TR>"
                "<TD VALIGN=TOP>Primary Internet e-mail address<br />"
                "<INPUT TYPE=\"text\" NAME=\"primary_inetemail\" "
                "SIZE=40 MAXLENGTH=40 VALUE=\"");
@@ -260,7 +294,9 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "Internet e-mail aliases<br />"
                "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
        escputs(other_inetemail);
-       wprintf("</TEXTAREA></TD></TR></TABLE><br />\n");
+       wprintf("</TEXTAREA></TD></TR></TABLE>\n");
+
+       wprintf("</td></tr></table>\n");
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
        escputs(extrafields);
@@ -321,6 +357,8 @@ void submit_vcard(void) {
                bstr("middlename"),
                bstr("prefix"),
                bstr("suffix") );
+       serv_printf("title:%s", bstr("title") );
+       serv_printf("org:%s", bstr("org") );
        serv_printf("adr:%s;%s;%s;%s;%s;%s;%s",
                bstr("pobox"),
                bstr("extadr"),