cbbb309fcbc6b5a8709f42c8ace1280f1a2c3cd3 kate Tue Oct 4 14:08:18 2016 -0700 Support JWest page design w/o banner. Per JK suggestion reviewing GTEx track settings page with body map. refs #17639 diff --git src/hg/lib/web.c src/hg/lib/web.c index df6840c..ef1a894 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -418,52 +418,72 @@ void webEnd() /* output the footer of the HTML page */ { if(!webInTextMode) { webEndSectionTables(); #ifndef GBROWSE googleAnalytics(); #endif /* GBROWSE */ puts( ""); webPopErrHandlers(); } } -void webStartJWest(struct cart *cart, char *db, char *title) -/* Start HTML with new banner design by jWest (with modifications). */ +void webStartJWestOptionalBanner(struct cart *cart, char *db, char *title, boolean doBanner) +/* Start HTML with new header and footer design by JWest. + Optionally display banner above menubar + */ { puts("Content-type:text/html\n"); printf( + #include "jWestHeader.h" + , title); +if (doBanner) + { + printf( #include "jWestBanner.h" - , title, title); + , title); + } webPushErrHandlersCartDb(cart, db); htmlWarnBoxSetup(stdout); // Add hotlinks bar char *navBar = menuBar(cart, db); if (navBar) { puts(navBar); // Override nice-menu.css's menu background and fonts: puts(""); } webHeadAlreadyOutputed = TRUE; errAbortSetDoContentType(FALSE); } +void webStartJWest(struct cart *cart, char *db, char *title) +/* Start HTML with new banner and footer design by jWest (with modifications). */ +{ +webStartJWestOptionalBanner(cart, db, title, TRUE); +} + +void webStartJWestNoBanner(struct cart *cart, char *db, char *title) +/* Start HTML with new header and footer design by jWest, but no banner */ +{ +webStartJWestOptionalBanner(cart, db, title, FALSE); +} + void webEndJWest() /* End HTML that was started with webStartJWest. */ { googleAnalytics(); puts(""); webPopErrHandlers(); } static boolean gotWarnings = FALSE; void webVaWarn(char *format, va_list args) /* Warning handler that closes out page and stuff in * the fancy form. */ { gotWarnings = TRUE;