8155914f854a014bd26ca3effabc86067fc20c76 Merge parents 66f4a4f c8fef35 tdreszer Thu Jul 21 17:14:43 2011 -0700 Merge branch 'master' into tdreszer-subCfg diff --cc src/hg/hgTrackUi/hgTrackUi.c index 1b5b96e,c7bd36c..a5abea5 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@@ -2407,39 -2407,55 +2407,58 @@@ hTvFromString(cartUsualString(cart, tdb->track, hStringFromTv(tdb->visibility))); hTvDropDownClassVisOnly(tdb->track, tv, tdb->canPack, tv == tvHide ? "hiddenText" : "normalText", trackDbSetting(tdb, "onlyVisibility")); } printf("<TD>%s", tdb->longLabel); char *dataVersion = trackDbSetting(tdb, "dataVersion"); if (dataVersion) printf("  <EM style='color:#666666; font-size:smaller;'>%s</EM>", dataVersion); printf("</TD></TR>"); } printf("</TABLE>"); } + void previewLinks(char *db, struct trackDb *tdb) + /* Informational messages about preview browser (ENCODE tracks only) */ + { + if (trackDbSetting(tdb, "wgEncode") != NULL) + { + if (hIsPreviewHost()) + { + printf("<p><b>WARNING</b>: This data is provided for early access via the Preview Browser -- it is unreviewed and subject to change. For high quality reviewed annotations, see the <a target=_blank href='http://%s/cgi-bin/hgTracks?db=%s'>Genome Browser</a>.", + "genome.ucsc.edu", db); + } + else + { + // TODO: use hTrackUiName() + printf("<p><b>NOTE</b>: Early access to additional track data may be available on the <a target=_blank href='http://%s/cgi-bin/hgTrackUi?db=%s&g=%s'>Preview Browser</A>.", + "genome-preview.ucsc.edu", db, tdb->track); + } + } + } + void specificUi(struct trackDb *tdb, struct trackDb *tdbList, struct customTrack *ct, boolean ajax) /* Draw track specific parts of UI. */ { char *track = tdb->track; -if (sameString(track, "stsMap")) +eCfgType cType = cfgTypeFromTdb(tdb,FALSE); +if (ajax && cType != cfgNone) + cfgByCfgType(cType,database,cart,tdb,tdb->track,NULL,FALSE); +else if (sameString(track, "stsMap")) stsMapUi(tdb); else if (sameString(track, "affyTxnPhase2")) affyTxnPhase2Ui(tdb); else if (sameString(track, "cgapSage")) cgapSageUi(tdb); else if (sameString(track, "stsMapMouseNew")) stsMapMouseUi(tdb); else if (sameString(track, "stsMapRat")) stsMapRatUi(tdb); else if (sameString(track, "snpMap")) snpMapUi(tdb); else if (sameString(track, "snp")) snpUi(tdb); else if (snpVersion(track) >= 125) snp125Ui(tdb);