aab4f66a2aca5293f3536cc1d1438b17d2b09dfd tdreszer Thu May 5 16:14:15 2011 -0700 A large set of tiny changes. These fix a lot of discrepencies with bgcolor and font color declarations which were tripping up docttype 4.01. diff --git src/hg/hgCustom/hgCustom.c src/hg/hgCustom/hgCustom.c index aa72677..cddd6d4 100644 --- src/hg/hgCustom/hgCustom.c +++ src/hg/hgCustom/hgCustom.c @@ -166,31 +166,31 @@ printf("<FORM ACTION=\"%s\" METHOD=\"%s\" " " ENCTYPE=\"multipart/form-data\" NAME=\"mainForm\">\n", hgCustomName(), cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); if (!isUpdateForm) { /* Print clade, genome and assembly */ /* NOTE: this uses an additional, hidden form (orgForm), below */ char *onChangeDb = "onchange=\"document.orgForm.db.value = document.mainForm.db.options[document.mainForm.db.selectedIndex].value; document.orgForm.submit();\""; char *onChangeOrg = "onchange=\"document.orgForm.org.value = document.mainForm.org.options[document.mainForm.org.selectedIndex].value; document.orgForm.db.value = 0; document.orgForm.submit();\""; char *onChangeClade = "onchange=\"document.orgForm.clade.value = document.mainForm.clade.options[document.mainForm.clade.selectedIndex].value; document.orgForm.org.value = 0; document.orgForm.db.value = 0; document.orgForm.submit();\""; if (hIsGsidServer()) { - printf("<font color=red>The Custom Track function and its documentation is currently under development ...<BR><BR></font>\n"); + printf("<span style='color:red;'>The Custom Track function and its documentation is currently under development ...</span><BR><BR>\n"); } puts("<TABLE BORDER=0>\n"); if (gotClade) { puts("<TR><TD>clade\n"); printCladeListHtml(hOrganism(database), onChangeClade); puts(" "); puts("genome\n"); printGenomeListForCladeHtml(database, onChangeOrg); } else { puts("<TR><TD>genome\n"); printGenomeListHtml(database, onChangeOrg); @@ -205,31 +205,31 @@ } puts("</TD></TR></TABLE>\n"); } /* intro text */ puts("<P>"); if (isUpdateForm) puts("Update your custom track configuration, data, and/or documentation."); else puts("Display your own data as custom annotation tracks in the browser."); addIntro(); puts("<P>"); /* row for error message */ if (err) - printf("<P><B> <I><FONT COLOR='RED'>Error</I></FONT> %s</B><P>", err); + printf("<P><B> <span style='color:RED; font-style:italic;'>Error</span> %s</B><P>", err); cgiSimpleTableStart(); /* first rows for update form are for track and browser line entry */ if (isUpdateForm) { /* row for instructions */ cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); if (dataUrl) puts("Configuration:"); else { puts("Edit configuration:"); } @@ -414,37 +414,37 @@ printf("<FORM STYLE=\"margin-bottom:0;\" ACTION=\"%s\" METHOD=\"GET\" NAME=\"orgForm\">", hgCustomName()); cartSaveSession(cart); if (gotClade) printf("<INPUT TYPE=\"HIDDEN\" NAME=\"clade\" VALUE=\"\">\n"); printf("<INPUT TYPE=\"HIDDEN\" NAME=\"org\" VALUE=\"%s\">\n", organism); printf("<INPUT TYPE=\"HIDDEN\" NAME=\"db\" VALUE=\"%s\">\n", database); printf("<INPUT TYPE=\"HIDDEN\" NAME=\"hgct_do_add\" VALUE=\"1\">\n"); } puts("</FORM>"); puts("<div style='height:.9em;'></div>"); } void tableHeaderFieldStart(int columns) { /* print table column header with white text on black background */ -printf("<TD COLSPAN=%d ALIGN='CENTER' BGCOLOR=#536ED3>", columns); +printf("<TD COLSPAN=%d ALIGN='CENTER' BGCOLOR='#536ED3'>", columns); } void tableHeaderField(char *label, char *description) { /* print table column header with white text on black background */ -puts("<TD ALIGN='CENTER' BGCOLOR=#536ED3 "); +puts("<TD ALIGN='CENTER' BGCOLOR='#536ED3' "); if (description) printf("TITLE='%s'", description); printf("><B>%s</B></TD> ", wrapWhiteFont(label)); } void showCustomTrackList(struct customTrack *ctList, int numCts) /* print table of custom tracks with controls */ { struct customTrack *ct; char buf[256]; char *pos = NULL; char *dataUrl; /* handle 'set all' and 'clr all' */ boolean setAllDelete = FALSE;