be7d95ecf61449e6631d154427504e141561ead2 larrym Mon Oct 18 12:36:08 2010 -0700 UI tweaks; add About ... section at the bottom, join submit buttons into one piece of code and show below simple/advanced tab diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c index 774d0a1..57b6e16 100644 --- src/hg/hgTracks/searchTracks.c +++ src/hg/hgTracks/searchTracks.c @@ -348,6 +348,7 @@ int descWordCount = 0; boolean searchTermsExist = FALSE; int cols; +char buf[64]; if(sameString(currentTab, "simpleTab")) { @@ -386,12 +387,13 @@ internalErr(); } } -webStartWrapperDetailedNoArgs(cart, database, "", "Search for Tracks", FALSE, FALSE, FALSE, FALSE); + +safef(buf, sizeof(buf),"Search for Tracks in the %s %s Assembly", organism, hFreezeFromDb(database)); +webStartWrapperDetailedNoArgs(cart, database, "", buf, FALSE, FALSE, FALSE, FALSE); hPrintf("
"); hPrintf("
\n\n", hgTracksName()); cartSaveSession(cart); // Creates hidden var of hgsid to avoid bad voodoo -char buf[64]; safef(buf, sizeof(buf), "%lu", clock1()); cgiMakeHiddenVar("hgt_", buf); // timestamps page to avoid browser cache @@ -415,12 +417,7 @@ if (simpleSearch && descSearch) searchTermsExist = TRUE; -hPrintf("\n", searchTracks); -hPrintf("\n"); -hPrintf("\n"); -hPrintf("help\n"); -//hPrintf("help\n"); -hPrintf("
\n" +hPrintf("\n" "
\n" "\n"); @@ -563,13 +560,13 @@ } } -hPrintf("\n"); hPrintf("
\n", cols); -hPrintf("\n", searchTracks); -hPrintf("\n"); -hPrintf("\n"); -hPrintf("help
\n"); hPrintf("
\n\n"); + +hPrintf("

\n", searchTracks); +hPrintf("\n"); +hPrintf("

\n"); + hPrintf("\n"); hPrintf("= ENOUGH_FOUND_TRACKS) { - hPrintf("\n"); + hPrintf("\n"); hPrintf(""); hPrintf("    \n"); @@ -821,7 +818,7 @@ //hPrintf("\n"); // Closing view in browser button and foundTracks count - hPrintf(""); + hPrintf(""); hPrintf(""); hPrintf("    "); if(tracksFound >= ENOUGH_FOUND_TRACKS) @@ -862,5 +859,16 @@ #endif///def OMIT hPrintf("Search for terms in track descriptions, groups, names, and ENCODE " + "metadata. If multiple terms are entered, only tracks with all terms " + "will be part of the results.

"); +else + hPrintf("

Search for terms in track descriptions, groups, and names. " + "If multiple terms are entered, only tracks with all terms " + "will be part of the results.

"); +hPrintf("

more help

\n"); + webEndSectionTables(); }