ec4568d14f455627aa84b614bafb82b03a2edc8a tdreszer Fri May 6 14:35:35 2011 -0700 Fixes to spacing issues on hgTrackUi and hgFileUi where navlinks and description page resulted in extra lines. Created subheadingBar div to replace one of the many nested tables and use CSS. diff --git src/hg/hgFileUi/hgFileUi.c src/hg/hgFileUi/hgFileUi.c index d02fe86..7a4f1fb 100644 --- src/hg/hgFileUi/hgFileUi.c +++ src/hg/hgFileUi/hgFileUi.c @@ -58,49 +58,53 @@ // Now link to description char *downArrow = "⇓"; enum browserType browser = cgiBrowser(); if (browser == btIE || browser == btFF) downArrow = "↓"; printf("<A HREF='#TRACK_HTML' TITLE='Jump to description section of page'>Description%s</A>",downArrow); printf("</span>"); } puts("<BR>"); filesDownloadUi(db,cart,tdb); // Print data version trackDB setting, if any */ char *version = trackDbSetting(tdb, "dataVersion"); if (version) - printf("<P><B>Data version:</B> %s<BR>\n", version); + printf("<div style='height:.6em;'></div><B>Data version:</B> %s<BR>\n", version); // Print lift information from trackDb, if any (void) trackDbPrintOrigAssembly(tdb, db); if (tdb->html != NULL && tdb->html[0] != 0) { - htmlHorizontalLine(); - // include anchor for Description link - puts("<A NAME=TRACK_HTML></A>"); char *browserVersion; if (btIE == cgiClientBrowser(&browserVersion, NULL, NULL) && *browserVersion < '8') - printf("<table class='windowSize'><tr valign='top'><td>"); - else - printf("<table class='windowSize' style='position:relative; top:-1em;'><tr valign='top'><td>"); + htmlHorizontalLine(); + else // Move line down, since <H2>Description (in ->html) is proceded by too much space + printf("<span style='position:relative; top:1em;'><HR ALIGN='bottom'></span>"); + + printf("<table class='windowSize'><tr valign='top'><td rowspan=2>"); + puts("<A NAME='TRACK_HTML'></A>"); // include anchor for Description link + + // Add pennantIcon + printPennantIconNote(tdb); + puts(tdb->html); - printf("</td><td><div style='height:.7em;'></div>"); + printf("</td><td nowrap><div style='height:.8em;'></div>"); // positions top link below line makeTopLink(tdb); - printf(" </td></tr><tr valign='bottom'><td colspan=2>"); + printf(" </td></tr><tr valign='bottom'><td nowrap>"); makeTopLink(tdb); printf(" </td></tr></table>"); } } void doMiddle(struct cart *cart) /* Write body of web page. */ { struct trackDb *tdbList = NULL; struct trackDb *tdb = NULL; char *track; char *ignored; char *db = NULL; track = cartString(cart, "g"); // QUESTION: Should this be 'f' ?? getDbAndGenome(cart, &db, &ignored, NULL);