5e4d4454c39fce5a422daef731c7888b273a6b88 kate Mon Mar 23 17:40:11 2015 -0700 Add pipeline image and improve track description for hg38 DNase tracks. Tweak trackUi to leave out downloads and contact links for non-ENCODE2 assemblies. Also, update ENCODE link label to reflect its UCSC-only ENCODE. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 70ab03b..6a211a4 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -65,44 +65,50 @@ #else///ifndef BUTTONS_BY_CSS #define PM_BUTTON "\"%s\"\n" #define DEF_BUTTON "\"%s\"\n" #define DEFAULT_BUTTON(nameOrId,anc,beg,contains) \ printf(DEF_BUTTON,(nameOrId),(beg),(contains),(nameOrId),(beg),(contains),(anc), \ "defaults_sm.png","default") #define PLUS_BUTTON(nameOrId,anc,beg,contains) \ printf(PM_BUTTON, (nameOrId),"true", (beg),(contains),(anc),"add_sm.gif", "+") #define MINUS_BUTTON(nameOrId,anc,beg,contains) \ printf(PM_BUTTON, (nameOrId),"false",(beg),(contains),(anc),"remove_sm.gif","-") #endif///ndef BUTTONS_BY_CSS +boolean isEncode2(char *database) +// Return true for ENCODE2 assemblies +{ +return (sameString(database, "hg18") || sameString(database, "hg19") || sameString(database, "mm9")); +} + static char *htmlStringForDownloadsLink(char *database, struct trackDb *tdb, char *name,boolean nameIsFile) // Returns an HTML string for a downloads link { // If has fileSortOrder, then link to new hgFileUi if (!nameIsFile && trackDbSetting(tdb, FILE_SORT_ORDER) != NULL) { char * link = needMem(PATH_LEN); // 512 should be enough safef(link,PATH_LEN,"%s", hgFileUiName(),database, /*cartSessionVarName(),cartSessionId(cart),*/ tdb->track, name); // Note the hgsid would be needed if downloads page ever saved fileSortOrder to cart. return link; } -else if (trackDbSetting(tdb, "wgEncode") != NULL) // Downloads directory if this is ENCODE +else if (trackDbSetting(tdb, "wgEncode") != NULL && isEncode2(database)) // Downloads directory if this is ENCODE { const char *compositeDir = metadataFindValue(tdb, MDB_OBJ_TYPE_COMPOSITE); if (compositeDir == NULL && tdbIsComposite(tdb)) compositeDir = tdb->track; if (compositeDir != NULL) { struct dyString *dyLink = dyStringCreate("%s", hDownloadsServer(), database, ENCODE_DCC_DOWNLOADS, compositeDir, (nameIsFile?name:""), nameIsFile?"file":"files",name); return dyStringCannibalize(&dyLink); } } return NULL;