3846f517009c43abc65d227a4695645c9b5f3e8a
braney
Fri Feb 15 18:31:21 2013 -0800
changes necessary to support assembly hubs (#8072)
diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c
index 0c2d288..8f663f6 100644
--- src/hg/hgTracks/config.c
+++ src/hg/hgTracks/config.c
@@ -4,30 +4,31 @@
#include "dystring.h"
#include "cheapcgi.h"
#include "htmshell.h"
#include "hdb.h"
#include "hCommon.h"
#include "cart.h"
#include "web.h"
#include "customTrack.h"
#include "hgTracks.h"
#include "hgConfig.h"
#include "jsHelper.h"
#include "imageV2.h"
#include "search.h"
#include "hubConnect.h"
#include "fileUi.h"
+#include "trackHub.h"
static void themeDropDown(struct cart* cart)
/* Create drop down for UI themes.
* specfied in hg.conf like this
* browser.theme.modern=background.png,HGStyle
* */
{
struct slName* themes = cfgNamesWithPrefix("browser.theme.");
//struct slName* themes = cfgNames();
if (themes==NULL)
return;
hPrintf("
website style:");
hPrintf(" | ");
@@ -464,34 +465,34 @@
hPrintf(" |
\n");
hPrintf("");
hCheckBox("nextExonArrows", cartUsualBoolean(cart, "nextExonArrows", TRUE));
hPrintf(" | ");
hPrintf("Next/previous exon navigation");
hPrintf(" |
\n");
hTableEnd();
cgiDown(0.9);
char *freeze = hFreezeFromDb(database);
char buf[128];
if (stringIn(database, freeze))
safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s",
- organization, browserName, organism, freeze);
+ organization, browserName, trackHubRemoveHubName(organism), freeze);
else
safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s (%s)",
- organization, browserName, organism, freeze, database);
+ organization, browserName, trackHubRemoveHubName(organism), freeze, trackHubRemoveHubName(database));
webNewSection(buf);
hPrintf("Tracks: ");
if (isSearchTracksSupported(database,cart))
{
cgiMakeButtonWithMsg(TRACK_SEARCH, TRACK_SEARCH_BUTTON,TRACK_SEARCH_HINT);
hPrintf(" ");
}
cgiMakeButtonWithMsg(configHideAll, "hide all","Hide all tracks in this genome assembly");
hPrintf(" ");
cgiMakeButtonWithMsg(configShowAll, "show all","Show all tracks in this genome assembly");
hPrintf(" ");
cgiMakeButtonWithMsg(configDefaultAll, "default","Display only default tracks");
hPrintf(" Groups: ");
hButtonWithOnClick("hgt.collapseGroups", "collapse all", "Collapse all track groups",
"return vis.expandAllGroups(false)");