e7d846388da09e584478b48279fd96a6e2e58aac kuhn Thu Sep 1 08:52:44 2011 -0700 moving Session and PDF/PS links closer to center in the topbar so they are not offscreen. Ensembl and NCBI move to the right diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 7bd6c42..5c5916b 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3585,30 +3585,47 @@ winStart, chromName, winStart, winEnd, database, uiVars->string, "DNA"); } if (!psOutput) { /* disable Convert function for CGB servers for the time being */ if (!hIsCgbServer()) if (liftOverChainForDb(database) != NULL) { hPrintf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgConvert?%s&db=%s", uiVars->string, database); hPrintf("\" class=\"topbar\">Convert</A> </TD>"); } } +if (!psOutput) + { + if (wikiLinkEnabled()) + { + printf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgSession?%s=%u" + "&hgS_doMainPage=1\" class=\"topbar\">Session</A> </TD>", + cartSessionVarName(), cartSessionId(cart)); + } + } + +if (!psOutput) + { + hPrintf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgTracks?%s=%u&hgt.psOutput=on\" id='pdfLink' class=\"topbar\">%s</A> </TD>",cartSessionVarName(), + cartSessionId(cart), "PDF/PS"); + } + + char ensVersionString[256]; char ensDateReference[256]; ensGeneTrackVersion(database, ensVersionString, ensDateReference, sizeof(ensVersionString)); if (!psOutput) { if (differentWord(database,"susScr2")) { /* Print Ensembl anchor for latest assembly of organisms we have * supported by Ensembl == if versionString from trackVersion exists */ if (sameWord(database,"hg19")) { hPrintf("<TD ALIGN=CENTER> "); printEnsemblAnchor(database, NULL, chromName, winStart, winEnd); @@ -3780,59 +3797,45 @@ hPrintf("<TD ALIGN=CENTER> <A HREF=\"http://www.wormbase.org/db/gb2/gbrowse/c_elegans?name=%s:%d-%d\" TARGET=_blank class=\"topbar\" id='wormbaseLink'>%s</A> </TD>", skipChr(chromName), winStart+1, winEnd, "WormBase"); } if (sameString(database, "ce4")) { hPrintf("<TD ALIGN=CENTER> <A HREF=\"http://ws170.wormbase.org/db/seq/gbrowse/wormbase?name=%s:%d-%d\" TARGET=_blank class=\"topbar\" id='wormbaseLink'>%s</A> </TD>", skipChr(chromName), winStart+1, winEnd, "WormBase"); } if (sameString(database, "ce2")) { hPrintf("<TD ALIGN=CENTER> <A HREF=\"http://ws120.wormbase.org/db/seq/gbrowse/wormbase?name=%s:%d-%d\" TARGET=_blank class=\"topbar\" id='wormbaseLink'>%s</A> </TD>", skipChr(chromName), winStart+1, winEnd, "WormBase"); } } -if (!psOutput) - { - hPrintf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgTracks?%s=%u&hgt.psOutput=on\" id='pdfLink' class=\"topbar\">%s</A> </TD>",cartSessionVarName(), - cartSessionId(cart), "PDF/PS"); - } - -if (!psOutput) - { - if (wikiLinkEnabled()) - { - printf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgSession?%s=%u" - "&hgS_doMainPage=1\" class=\"topbar\">Session</A> </TD>", - cartSessionVarName(), cartSessionId(cart)); - } - } if (hIsGisaidServer()) { //hPrintf("<TD ALIGN=CENTER> <A HREF=\"/goldenPath/help/gisaidTutorial.html#SequenceView\" TARGET=_blank class=\"topbar\">%s</A> </TD>\n", "Help"); hPrintf("<TD ALIGN=CENTER> <A HREF=\"../cgi-bin/hgNotYet\" TARGET=_blank class=\"topbar\">%s</A> </TD>\n", "Help"); } else if (hIsGsidServer()) { hPrintf("<TD ALIGN=CENTER> <A HREF=\"/goldenPath/help/gsidTutorial.html#SequenceView\" TARGET=_blank class=\"topbar\">%s</A> </TD>\n", "Help"); } else { hPrintf("<TD ALIGN=CENTER> <A HREF=\"../goldenPath/help/hgTracksHelp.html\" TARGET=_blank class=\"topbar\">%s</A> </TD>\n", "Help"); } + hPuts("<TD colspan=20> </TD></TR></TABLE></TD>"); hPuts("</TR></TABLE>"); hPuts("</TD></TR></TABLE>\n"); } static void setSuperTrackHasVisibleMembers(struct trackDb *tdb) /* Determine if any member tracks are visible -- currently * recording this in the parent's visibility setting */ { tdb->visibility = tvDense; } boolean superTrackHasVisibleMembers(struct trackDb *tdb) /* Determine if any member tracks are visible -- currently * recording this in the parent's visibility setting */