869f0c60a4dbe87100c15e321ba7b6b93b3ceecd markd Tue Mar 15 18:25:02 2011 -0700 remove unneccssary nbsp from topbar to fix problems with IE diff --git src/hg/lib/web.c src/hg/lib/web.c index 08ed3b7..8fc461d 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -285,170 +285,170 @@ else { printf("<TD ALIGN=CENTER><A HREF=\"/goldenPath/help/sequenceViewHelp.html\" TARGET=_blank class=\"topbar\">%s</A></TD>", "<FONT COLOR=\"#FFFFFF\">Help</FONT>"); } printf("</TR></TABLE>"); printf("</TD></TR></TABLE>\n"); } else if (dbIsFound) { puts( "<!-- +++++++++++++++++++++ HOTLINKS BAR +++++++++++++++++++ -->" "\n" "<TR><TD COLSPAN=3 HEIGHT=40 >" "\n" "<table bgcolor=\"#000000\" cellpadding=\"1\" cellspacing=\"1\" width=\"100%%\" height=\"27\">" "\n" "<tr bgcolor=\"#"HG_COL_HOTLINKS"\"><td valign=\"middle\">" "\n" " <table BORDER=0 CELLSPACING=0 CELLPADDING=0 bgcolor=\"#"HG_COL_HOTLINKS"\" height=\"24\" class=\"topbar\"><TR>" "\n" - " <TD VALIGN=\"middle\"><font color=\"#89A1DE\"> " "\n" + " <TD VALIGN=\"middle\"><font color=\"#89A1DE\">" "\n" ); if (isEncode) { - printf(" <A HREF=\"../encode/\" class=\"topbar\">" "\n"); + printf("<A HREF=\"../encode/\" class=\"topbar\">" "\n"); puts(" Home</A>"); } else { - printf(" <A HREF=\"../index.html%s\" class=\"topbar\">" "\n", uiState); - puts(" Home</A> "); + printf("<A HREF=\"../index.html%s\" class=\"topbar\">" "\n", uiState); + puts(" Home</A> "); if (isGsid) { printf(" <A HREF=\"../cgi-bin/gsidSubj%s\" class=\"topbar\">\n", uiState); - puts(" Subject View</A> "); + puts(" Subject View</A> "); } if (!isGsid) { printf(" <A HREF=\"../cgi-bin/hgGateway%s\" class=\"topbar\">\n", uiState); - puts(" Genomes</A> "); + puts(" Genomes</A> "); } if (endsWith(scriptName, "hgTracks") || endsWith(scriptName, "hgGene") || endsWith(scriptName, "hgTables") || endsWith(scriptName, "hgTrackUi") || endsWith(scriptName, "hgSession") || endsWith(scriptName, "hgCustom") || endsWith(scriptName, "hgc") || endsWith(scriptName, "hgPal")) { printf(" <A HREF='../cgi-bin/hgTracks%s&hgTracksConfigPage=notSet&%s=0' class='topbar'>\n", uiState,TRACK_SEARCH); - puts(" Genome Browser</A> "); + puts(" Genome Browser</A> "); } if (haveBlat && !endsWith(scriptName, "hgBlat")) { printf(" <A HREF=\"../cgi-bin/hgBlat?command=start%s%s\" class=\"topbar\">", theCart ? "&" : "", uiState+1 ); - puts(" Blat</A> "); + puts(" Blat</A> "); } } { char *table = (theCart == NULL ? NULL : (endsWith(scriptName, "hgGene") ? cartOptionalString(theCart, "hgg_type") : cartOptionalString(theCart, "g"))); if (table && theCart && (endsWith(scriptName, "hgc") || endsWith(scriptName, "hgTrackUi") || endsWith(scriptName, "hgGene"))) { struct trackDb *tdb = hTrackDbForTrack(db, table); if (tdb != NULL) printf(" <A HREF=\"../cgi-bin/hgTables%s&hgta_doMainPage=1&" "hgta_group=%s&hgta_track=%s&hgta_table=%s\" " "class=\"topbar\">\n", uiState, tdb->grp, tdb->track, tdb->table); else printf(" <A HREF=\"../cgi-bin/hgTables%s&hgta_doMainPage=1\" " "class=\"topbar\">\n", uiState); trackDbFree(&tdb); } else printf(" <A HREF=\"../cgi-bin/hgTables%s%shgta_doMainPage=1\" " "class=\"topbar\">\n", uiState, theCart ? "&" : "?" ); } /* disable TB for both GSID and CGB servers */ - if (!isGsid && !hIsCgbServer()) puts(" Tables</A> "); + if (!isGsid && !hIsCgbServer()) puts(" Tables</A> "); if (!endsWith(scriptName, "hgNear")) /* possible to make this conditional: if (db != NULL && hgNearOk(db)) */ if (db != NULL && hgNearOk(db)) { if (isGsid) { printf(" <A HREF=\"../cgi-bin/gsidTable%s\" class=\"topbar\">\n", uiState); - puts(" Table View</A> "); + puts(" Table View</A> "); } else { printf(" <A HREF=\"../cgi-bin/hgNear%s\" class=\"topbar\">\n", uiState); - puts(" Gene Sorter</A> "); + puts(" Gene Sorter</A> "); } } if ((!endsWith(scriptName, "hgPcr")) && (db == NULL || hgPcrOk(db))) { printf(" <A HREF=\"../cgi-bin/hgPcr%s\" class=\"topbar\">\n", uiState); - puts(" PCR</A> "); + puts(" PCR</A> "); } if (endsWith(scriptName, "hgGenome")) { printf(" <A HREF=\"../cgi-bin/hgGenome%s&hgGenome_doPsOutput=on\" class=\"topbar\">\n", uiState); - puts(" PDF/PS</A> "); + puts(" PDF/PS</A> "); } if (endsWith(scriptName, "hgHeatmap")) { printf(" <A HREF=\"../cgi-bin/hgHeatmap%s&hgHeatmap_doPsOutput=on\" class=\"topbar\">\n", uiState); - puts(" PDF/PS</A> "); + puts(" PDF/PS</A> "); } #ifndef GBROWSE if (wikiLinkEnabled() && !endsWith(scriptName, "hgSession")) { printf("<A HREF=\"../cgi-bin/hgSession%s%shgS_doMainPage=1\" " "class=\"topbar\">Session</A>", uiState, theCart ? "&" : "?" ); - puts(" "); + puts(""); } #endif /* GBROWSE */ if (!isGsid) puts(" <A HREF=\"../FAQ/\" class=\"topbar\">" "\n" - " FAQ</A> " "\n" + " FAQ</A> " "\n" ); if (!isGsid) { if (endsWith(scriptName, "hgBlat")) puts(" <A HREF=\"../goldenPath/help/hgTracksHelp.html#BLATAlign\""); else if (endsWith(scriptName, "hgText")) puts(" <A HREF=\"../goldenPath/help/hgTextHelp.html\""); else if (endsWith(scriptName, "hgNear")) puts(" <A HREF=\"../goldenPath/help/hgNearHelp.html\""); else if (endsWith(scriptName, "hgTables")) puts(" <A HREF=\"../goldenPath/help/hgTablesHelp.html\""); else if (endsWith(scriptName, "hgGenome")) puts(" <A HREF=\"../goldenPath/help/hgGenomeHelp.html\""); else if (endsWith(scriptName, "hgSession")) puts(" <A HREF=\"../goldenPath/help/hgSessionHelp.html\""); else if (endsWith(scriptName, "pbGateway")) puts(" <A HREF=\"../goldenPath/help/pbTracksHelpFiles/pbTracksHelp.shtml\""); else if (endsWith(scriptName, "hgVisiGene")) puts(" <A HREF=\"../goldenPath/help/hgTracksHelp.html#VisiGeneHelp\""); else puts(" <A HREF=\"../goldenPath/help/hgTracksHelp.html\""); puts(" class=\"topbar\">"); puts(" Help</A> "); } } -puts(" </font></TD>" "\n" +puts("</font></TD>" "\n" " </TR></TABLE>" "\n" "</TD></TR></TABLE>" "\n" "</TD></TR> " "\n" "" "\n" ); if(!skipSectionHeader) /* this HTML must be in calling code if skipSectionHeader is TRUE */ { puts( "<!-- +++++++++++++++++++++ CONTENT TABLES +++++++++++++++++++ -->" "\n" "<TR><TD COLSPAN=3> " "\n" " <!--outer table is for border purposes-->" "\n" " <TABLE WIDTH=\"100%\" BGCOLOR=\"#"HG_COL_BORDER"\" BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"1\"><TR><TD> " "\n" " <TABLE BGCOLOR=\"#"HG_COL_INSIDE"\" WIDTH=\"100%\" BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD> " "\n"