612c4476c87694b97463cc267edcfd60da5a0968 larrym Fri Sep 9 09:11:34 2011 -0700 restore order of session and pdf/ps links diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 4e647e1..f782a43 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3616,47 +3616,30 @@ 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")) { printEnsemblAnchor(database, NULL, chromName, winStart, winEnd, &links); } @@ -3820,30 +3803,46 @@ safef(buf, sizeof(buf), "http://ws170.wormbase.org/db/seq/gbrowse/wormbase?name=%s:%d-%d", skipChr(chromName), winStart+1, winEnd); appendLink(&links, buf, "WormBase", "wormbaseLink"); } if (sameString(database, "ce2")) { safef(buf, sizeof(buf), "http://ws120.wormbase.org/db/seq/gbrowse/wormbase?name=%s:%d-%d", skipChr(chromName), winStart+1, winEnd); appendLink(&links, buf, "WormBase", "wormbaseLink"); } } for(link = links; link != NULL; link = link->next) hPrintf("<TD ALIGN=CENTER> <A HREF=\"%s\" TARGET=\"_blank\" class=\"topbar\" id=\"%s\">%s</A> </TD>\n", link->url, link->id, link->name); +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"); }