66ec629db80c84d3524928baf4882560c8cf1b98 kate Thu Feb 8 11:36:19 2018 -0800 Fixes to reorged hgCollection help. refs #11630 diff --git src/hg/hgCollection/hgCollection.c src/hg/hgCollection/hgCollection.c index b4c5c38..8e0a26a 100644 --- src/hg/hgCollection/hgCollection.c +++ src/hg/hgCollection/hgCollection.c @@ -349,76 +349,72 @@ 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 mygbSectionBanner'>\n" +" <div class='row gbSectionBanner'>\n" " <div class='col-md-11'>Help</div>\n" " <div class='col-md-1'>\n" ); -#define DATA_INFO_JUMP_ARROW_ID "hgGtexDataInfo_jumpArrow" +#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", -DATA_INFO_JUMP_ARROW_ID +HELP_JUMP_ARROW_ID ); -onclickJumpToTop(DATA_INFO_JUMP_ARROW_ID); +onclickJumpToTop(HELP_JUMP_ARROW_ID); puts( " </div>\n" " </div>\n" ); puts( " <div class='row gbTrackDescriptionPanel'>\n" " <div class='gbTrackDescription'>\n"); -puts("<div class='dataInfo'>"); -puts("</div>"); -webIncludeHelpFileSubst("hgCollectionHelp", NULL, FALSE); - -puts("<div class='dataInfo'>"); -puts("</div>"); - +webIncludeFile("inc/hgCollectionHelpInclude.html"); puts( +" </div>" " </div>\n" -" </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("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'>"); puts("<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css' />"); puts("<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.1/jquery.min.js'></script>"); puts("<script src=\"//code.jquery.com/ui/1.10.3/jquery-ui.min.js\"></script>"); puts("<script src=\"https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.4/jstree.min.js\"></script>\n"); jsIncludeFile("utils.js", NULL); jsIncludeFile("ajax.js", NULL); jsIncludeFile("spectrum.min.js", NULL); jsIncludeFile("hgCollection.js", NULL); webEndGb(); } static char *getSqlBigWig(struct sqlConnection *conn, char *db, struct trackDb *tdb)