3a91c4f9165ff5a106b7737f9066c95e798ce62a braney Fri Feb 9 19:24:12 2018 -0800 read in staticStyle and label help container correctly diff --git src/hg/hgCollection/hgCollection.c src/hg/hgCollection/hgCollection.c index 501e764..5ee0adc 100644 --- src/hg/hgCollection/hgCollection.c +++ src/hg/hgCollection/hgCollection.c @@ -339,71 +339,61 @@ { if ( sameString(tdb->grp, curGroup->name)) { printGroup(curGroup->name, tdb, FALSE, FALSE); } } jsInlineF("</ul>"); jsInlineF("</li>"); jsInlineF("</ul>"); } jsInlineF("\");\n"); jsInlineF("hgCollection.init();\n"); } -static void onclickJumpToTop(char *id) -/* CSP-safe click handler arrows that cause scroll to top */ -{ -jsOnEventById("click", id, "$('html,body').scrollTop(0);"); -} - static void printHelp() // print out the help page { puts( -"<a name='INFO_SECTION'></a>\n" -" <div class='row gbSectionBanner'>\n" -" <div class='col-md-11'>Help</div>\n" -" <div class='col-md-1'>\n" +"<br><a name='INFO_SECTION'></a>\n" +" <div class='row gbsPage'>\n" +" <div ><h1>Track Collection Builder Help</h1></div>\n" +" <div >\n" ); -#define HELP_JUMP_ARROW_ID "hgCollectionHelp_jumpArrow" -printf( -" <i id='%s' title='Jump to top of page' \n" -" class='gbIconArrow fa fa-lg fa-arrow-circle-up'></i>\n", -HELP_JUMP_ARROW_ID -); -onclickJumpToTop(HELP_JUMP_ARROW_ID); puts( " </div>\n" " </div>\n" ); puts( -" <div class='row gbTrackDescriptionPanel'>\n" -" <div class='gbTrackDescription'>\n"); +" <div class='row gbsPage'>\n" +" <div class='gbsPage'>\n"); + webIncludeFile("inc/hgCollectionHelpInclude.html"); puts( " </div>" " </div>\n" ); } static void doMainPage(struct cart *cart, char *db, struct grp *groupList, struct trackDb *trackList) /* Print out initial HTML of control page. */ { webStartGbNoBanner(cart, db, "Collections"); webIncludeResourceFile("gb.css"); +//webIncludeResourceFile("../staticStyle/gbStatic.css"); +webIncludeResourceFile("gbStatic.css"); webIncludeResourceFile("spectrum.min.css"); webIncludeResourceFile("hgGtexTrackSettings.css"); jsReloadOnBackButton(cart); // Write the page HTML: the application, followed by its help doc webIncludeFile("inc/hgCollection.html"); char *assembly = stringBetween("(", ")", hFreezeFromDb(db)); if (assembly != NULL) jsInlineF("$('#assembly').text('%s');\n",assembly); printHelp(); doTable(cart, db, groupList, trackList); puts("<link rel='stylesheet' href='https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css'>");