782c81418b4a7b3194393adf3efde7b868b61589 angie Wed Mar 1 11:54:05 2017 -0800 Replacing some more hardcoded ../js/ paths with calls to jsIncludeFile. diff --git src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c index 9d84c0e..f11ca93 100644 --- src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c +++ src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c @@ -1,28 +1,29 @@ /* hgGtexTrackSettings: Configure GTEx track, with tissues selected from Body Map or list * * Copyright (C) 2016 The Regents of the University of California */ #include "common.h" #include "trackDb.h" #include "cart.h" #include "portable.h" #include "cheapcgi.h" #include "web.h" #include "hCommon.h" #include "hui.h" +#include "jsHelper.h" #include "gtexUi.h" #include "gtexInfo.h" #include "gtexTissue.h" /* Global Variables */ struct cart *cart = NULL; /* CGI and other variables */ struct hash *oldVars = NULL; /* Old contents of cart before it was updated by CGI */ static void printTrackHeader(char *db, struct trackDb *tdb) /* Print top banner with track labels */ // TODO: Try to simplify layout { char *assembly = stringBetween("(", ")", hFreezeFromDb(db)); puts( "\n" @@ -356,32 +357,32 @@ // Print form with configuration HTML, and track description printf( "
\n\n", hgTracksName(), cartUsualString(cart, "formMethod", "POST")); printTrackHeader(db, tdb); printTrackConfig(tdb); puts( "
"); printDataInfo(db, tdb); if (tdb->html) printTrackDescription(tdb); puts( ""); // Initialize illustration display and handle mouseover and clicks -puts(""); -puts(""); +jsIncludeFile("utils.js", NULL); +jsIncludeFile("hgGtexTrackSettings.js", NULL); webIncludeFile("inc/gbFooter.html"); webEndJWest(); } int main(int argc, char *argv[]) /* Process CGI / command line. */ { /* Null terminated list of CGI Variables we don't want to save to cart */ /* TODO: check these */ char *excludeVars[] = {"submit", "Submit", "g", NULL}; long enteredMainTime = clock1000(); cgiSpoof(&argc, argv); oldVars = hashNew(10);