8fdc86ea29f656cf7efee9954fdae6b573190fb3 tdreszer Fri May 6 17:23:22 2011 -0700 Standardized replacement for <P> with cgiDown and worked out more spacing issues in hgFileUi and hgTrackUi. diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index fb6c635..bc70b0e 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2808,31 +2808,32 @@ printf("\n <span id='navDown' style='float:right; display:none;'>"); if (trackDbSetting(tdb, "wgEncode")) { printf(" "); makeDownloadsLink(database, tdb, trackHash); } char *downArrow = "⇓"; enum browserType browser = cgiBrowser(); if (browser == btIE || browser == btFF) downArrow = "↓"; printf(" <A HREF='#DISPLAY_SUBTRACKS' TITLE='Jump to subtracks section of page'>Subtracks%s</A>",downArrow); printf(" <A HREF='#TRACK_HTML' TITLE='Jump to description section of page'>Description%s</A>",downArrow); printf(" </span>"); } } -printf("<BR>\n"); +if (!tdbIsSuperTrack(tdb) && !tdbIsComposite(tdb)) + puts("<BR>"); if (tdbIsDownloadsOnly(tdb)) filesDownloadUi(database,cart,tdb); // Composites without tracks but with files to download are tdb->type: downloadsOnly else specificUi(tdb, tdbList, ct, ajax); puts("</FORM>"); if (ajax) return; if (ct) { /* hidden form for custom tracks CGI */ printf("<FORM ACTION='%s' NAME='customTrackForm'>", hgCustomName()); cartSaveSession(cart); @@ -2840,54 +2841,58 @@ puts("</FORM>\n"); if (ct->bbiFile) { time_t timep = bbiUpdateTime(ct->bbiFile); printBbiUpdateTime(&timep); } else printUpdateTime(CUSTOM_TRASH, ct->tdb, ct); } if (!ct) { /* Print data version trackDB setting, if any */ char *version = trackDbSetting(tdb, "dataVersion"); if (version) - printf("<div style='height:.6em;'></div><B>Data version:</B> %s\n", version); + { + cgiDown(0.7); + printf("<B>Data version:</B> %s\n", version); + } /* Print lift information from trackDb, if any */ trackDbPrintOrigAssembly(tdb, database); printUpdateTime(database, tdb, NULL); } if (tdb->html != NULL && tdb->html[0] != 0) { char *browserVersion; if (btIE == cgiClientBrowser(&browserVersion, NULL, NULL) && *browserVersion < '8') 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 nowrap><div style='height:.8em;'></div>"); // positions top link below line + printf("</td><td nowrap>"); + cgiDown(0.7); // positions top link below line makeTopLink(tdb); printf(" </td></tr><tr valign='bottom'><td nowrap>"); makeTopLink(tdb); printf(" </td></tr></table>"); } } /* void trackUi(struct trackDb *tdb) */ struct trackDb *trackDbForPseudoTrack(char *tableName, char *shortLabel, char *longLabel, int defaultVis, boolean canPack) /* Create trackDb for a track without a corresponding table. */ { struct trackDb *tdb; AllocVar(tdb); tdb->track = tableName;