9a7fb2974573b7e57ddac45f2b35c80c66deca53 kate Mon Nov 21 11:31:32 2016 -0800 1. Fix Firefox initialization -- it apparently loads SVG faster than Chrome, so need to check before setting event handler. 2. Fix HOME link image (UCSC browser logo), lost during CSS refactoring. refs #17369 diff --git src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c index ff01549..55ae3d3 100644 --- src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c +++ src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c @@ -308,57 +308,58 @@ struct trackDb *tdb = trackDbLoadWhere(conn, "trackDb", where); trackDbAddTableField(tdb); sqlDisconnect(&conn); return tdb; } static void doMiddle(struct cart *theCart) /* Send HTML with javascript to display the user interface. */ { cart = theCart; char *db = NULL, *genome = NULL, *clade = NULL; getDbGenomeClade(cart, &db, &genome, &clade, oldVars); // Start web page with new-style header webStartGbNoBanner(cart, db, "Genome Browser GTEx Track Settings"); +puts("<link rel='stylesheet' href='../style/gb.css'>"); // NOTE: This will likely go to web.c puts("<link rel='stylesheet' href='../style/hgGtexTrackSettings.css'>"); char *track = cartUsualString(cart, "g", "gtexGene"); struct trackDb *tdb = getTrackDb(db, track); if (!tdb) errAbort("No GTEx track %s found in database %s\n", track, db); // Container for bootstrap grid layout puts( "<div class='container-fluid'>\n"); // Print form with configuration HTML, and track description printf( "<form action='%s' name='MAIN_FORM' method=%s>\n\n", hgTracksName(), cartUsualString(cart, "formMethod", "POST")); printTrackHeader(db, tdb); printTrackConfig(tdb); puts( "</form>"); printDataInfo(db, tdb); if (tdb->html) printTrackDescription(tdb); puts( "</div>"); // Initialize illustration display and handle mouseover and clicks -puts("<script src='../js/hgGtexTrackSettings.js'></script>"); +puts("<script type='text/javascript' src='../js/hgGtexTrackSettings.js'></script>"); 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);