0284b76bceb901ab77a2ccd87639a7722ff39966 tdreszer Fri Aug 13 19:25:01 2010 -0700 Removed unneeded links from blubar for PDF/PS page and left justified the links diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 72ab75f..85e4ce2 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3508,18 +3508,20 @@ boolean gotBlat = hIsBlatIndexedDatabase(database); struct dyString *uiVars = uiStateUrlPart(NULL); char *orgEnc = cgiEncode(organism); +boolean psOutput = cgiVarExists("hgt.psOutput"); hPrintf("
\n"); hPrintf("\n"); -hPrintf("", +hPrintf(""); hPuts("
Home\n"); +hPrintf("", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); if (hIsGisaidServer()) { /* disable hgGateway for gisaid for now */ - //hPrintf("", orgEnc, database); + //hPrintf("", orgEnc, database); hPrintf( - "", + "", '%', '%', cartSessionVarName(), cartSessionId(cart), @@ -3528,26 +3530,26 @@ else if (hIsGsidServer()) { - hPrintf("", orgEnc, database); + hPrintf("", orgEnc, database); hPrintf( - "", + "", '%', '%', "Select Subjects"); } else { - hPrintf("", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); + hPrintf("", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); } -if (cgiVarExists("hgt.psOutput")) +if (psOutput) { - hPrintf("", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); + hPrintf("", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); } if (gotBlat) { - hPrintf("", uiVars->string); + hPrintf("", uiVars->string); } if (hIsGisaidServer()) { - hPrintf("", + hPrintf("", database, cartSessionVarName(), cartSessionId(cart), @@ -3555,7 +3557,7 @@ } else if (hIsGsidServer()) { - hPrintf("", + hPrintf("", database, "Table View"); } else @@ -3563,7 +3565,7 @@ /* disable TB for CGB servers */ if (!hIsCgbServer()) { - hPrintf("", + hPrintf("", database, chromName, winStart+1, winEnd, cartSessionVarName(), cartSessionId(cart), @@ -3573,25 +3575,31 @@ if (hgNearOk(database)) { - hPrintf("", + hPrintf("", uiVars->string, "Gene Sorter"); } if (hgPcrOk(database)) { - hPrintf("", uiVars->string); + hPrintf("", uiVars->string); } -hPrintf("", hgcNameAndSettings(), +if (!psOutput) + { + hPrintf("", hgcNameAndSettings(), 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(""); + hPrintf("\" class=\"topbar\">Convert  "); + } } /* see if hgFixed.trackVersion exists */ @@ -3619,6 +3627,8 @@ hFreeConn(&conn); } +if (!psOutput) + { if (differentWord(database,"susScr2")) { /* Print Ensembl anchor for latest assembly of organisms we have @@ -3627,13 +3637,13 @@ { hPuts("", "Ensembl"); + hPrintf("%s  ", "Ensembl"); } else if (sameWord(database,"hg18")) { hPuts("", "Ensembl"); + hPrintf("%s  ", "Ensembl"); } else if (ensVersionString[0]) { @@ -3684,7 +3694,7 @@ hPuts("", "Ensembl"); + hPrintf("%s  ", "Ensembl"); } } ctgPosFree(&ctgItem); // the one we maybe used @@ -3694,118 +3704,128 @@ { hPuts("", "Ensembl"); + hPrintf("%s  ", "Ensembl"); + } } } } +if (!psOutput) + { /* Print NCBI MapView anchor */ if (sameString(database, "hg18")) { - hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "hg19")) { - hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "mm8")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "danRer2")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "galGal3")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "canFam2")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "rheMac2")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "panTro2")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (sameString(database, "anoGam1")) { hPrintf("", "NCBI"); + hPrintf("%s  ", "NCBI"); } if (startsWith("oryLat", database)) { - hPrintf("", + hPrintf("", skipChr(chromName), winStart+1, winEnd, "UTGB"); } if (sameString(database, "cb3")) { - hPrintf("", + hPrintf("", skipChr(chromName), winStart+1, winEnd, "WormBase"); } if (sameString(database, "ce4")) { - hPrintf("", + hPrintf("", skipChr(chromName), winStart+1, winEnd, "WormBase"); } if (sameString(database, "ce2")) { - hPrintf("", + hPrintf("", skipChr(chromName), winStart+1, winEnd, "WormBase"); } -if (!cgiVarExists("hgt.psOutput")) + } + +if (!psOutput) { - hPrintf("\n",cartSessionVarName(), + hPrintf("\n",cartSessionVarName(), cartSessionId(cart), "PDF/PS"); } + +if (!psOutput) + { if (wikiLinkEnabled()) { - printf("", + printf("", cartSessionVarName(), cartSessionId(cart)); } + } if (hIsGisaidServer()) { - //hPrintf("\n", "Help"); - hPrintf("\n", "Help"); + //hPrintf("\n", "Help"); + hPrintf("\n", "Help"); } else if (hIsGsidServer()) { - hPrintf("\n", "Help"); + hPrintf("\n", "Help"); } else { - hPrintf("\n", "Help"); + hPrintf("\n", "Help"); } +hPuts("
Home  Sequence View Gateway  Sequence View Gateway  %s  %s  Sequence View Gateway  Sequence View Gateway  %s  %s  Genomes  Genomes  Genome Browser  Genome Browser  Blat  Blat  %s  %s  %s  %s  %s  %s  %s  %s  PCR  PCR  " - " %s   " + " %s     string, database, chromName, winStart+1, winEnd); - hPrintf("\" class=\"topbar\">Convert"); printEnsemblAnchor(database, NULL, chromName, winStart, winEnd); - hPrintf("%s"); printEnsemblAnchor(database, "ncbi36", chromName, winStart, winEnd); - hPrintf("%s"); printEnsemblAnchor(database, archive, ctgItem->contig, ctgStart, ctgEnd); - hPrintf("%s"); printEnsemblAnchor(database, archive, chromName, winStart, winEnd); - hPrintf("%s", + hPrintf("  ", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s", + hPrintf("  ", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s"); hPrintf("", skipChr(chromName), winStart+1, winEnd); - hPrintf("%s%s  %s  %s  %s  %s  %s  %s  %s  %s  %s  Session  Session  %s%s  %s    %s  %s  %s  %s  %s   
"); hPuts("
\n"); }