| "); printf(""); if (sortOrder != NULL) { // First table row contains the display "selected/visible" or "all" radio buttons // NOTE: list subtrack radio buttons are inside tracklist table header if there are no sort columns // The reason is to ensure spacing of lines column headers when the only column header is "Restricted Until" printf("List subtracks: "); char javascript[JBUFSIZE]; safef(javascript, sizeof(javascript), "onclick=\"showOrHideSelectedSubtracks(true);\""); cgiMakeOnClickRadioButton("displaySubtracks", "selected", !displayAll,javascript); puts("only selected/visible "); safef(javascript, sizeof(javascript), "onclick=\"showOrHideSelectedSubtracks(false);\""); cgiMakeOnClickRadioButton("displaySubtracks", "all", displayAll,javascript); printf("all"); @@ -3942,79 +3936,69 @@ if (slCount(subtrackRefList) > 5) printf(" ()"); puts(" | "); columnCount = colspan; } // Add column headers which are sort button links if (sortOrder != NULL) { printf("\n", sortOrder->htmlId, sortOrder->sortOrder); // keeing track of sortOrder columnCount++; // Columns in tdb order (unchanging), sort in cart order (changed by user action) int sIx=0; for(sIx=0;sIx | %s", sortOrder->column[sIx],(sortOrder->forward[sIx]?"":" sortRev"),sortOrder->order[sIx],sortOrder->title[sIx]); printf("%s",(sortOrder->forward[sIx]?"↓":"↑")); if (sortOrder->count > 1) printf ("%d",sortOrder->order[sIx]); printf(""); puts (" | "); columnCount++; } // longLabel column -#ifdef SORT_ON_TRACK_NAME assert(sameString(SORT_ON_TRACK_NAME,sortOrder->column[sIx])); printf("Track Name", sortOrder->column[sIx],(sortOrder->forward[sIx]?"":" sortRev"),sortOrder->order[sIx]); printf("%s%d",(sortOrder->forward[sIx]?"↓":"↑"),sortOrder->order[sIx]); puts (" | "); -#else///ifndef SORT_ON_TRACK_NAME - puts(""); -#endif///ndef SORT_ON_TRACK_NAME columnCount++; } puts(" | "); // schema column columnCount++; // Finally there may be a restricted until column if (restrictions) { -#ifdef SORT_ON_RESTRICTED if (sortOrder != NULL) { int sIx=sortOrder->count-1; assert(sameString(SORT_ON_RESTRICTED,sortOrder->column[sIx])); printf(" | Restricted Until", sortOrder->column[sIx],(sortOrder->forward[sIx]?"":" sortRev"),sortOrder->order[sIx]); printf("%s%d",(sortOrder->forward[sIx]?"↓":"↑"),sortOrder->order[sIx]); //printf(" ? ", ENCODE_DATA_RELEASE_POLICY); puts (" | "); } else -#endif///def SORT_ON_RESTRICTED { printf(""); printf("Restricted Until", ENCODE_DATA_RELEASE_POLICY); puts(" | "); } columnCount++; } puts("%s ", dateDisplay); else printf(" | \n%s ", dateDisplay); } } // End of row and free ourselves of this subtrack puts(" | \n"); checkBoxIdFree(&id); subgroupMembershipFree(&membership); } // End of the table -puts(""); -printf("
|---|---|---|---|---|---|---|---|
| ",columnCount-1); +puts(""); +if (slCount(subtrackRefList) > 5 || (restrictions && sortOrder != NULL)) + { + printf(" | |||||||
| ", + COLOR_BG_DEFAULT_DARKER,columnCount-1); // Count of subtracks is filled in by javascript. if (slCount(subtrackRefList) > 5) printf("\n"); // Restruction policy needs a link -#ifdef SORT_ON_RESTRICTED if (restrictions && sortOrder != NULL) printf(" | Restriction Policy", ENCODE_DATA_RELEASE_POLICY); -#endif///def SORT_ON_RESTRICTED -printf(" |
Shade of lowest-scoring items: "); + puts("\nShade of lowest-scoring items: "); // Add javascript to select so that its color is consistent with option colors: int level = 255 - (255*minGrayLevel / maxShade); printf("
\n"); + printf("\n"); } } static boolean getScoreDefaultsFromTdb(struct trackDb *tdb, char *scoreName,char *defaults,char**min,char**max) /* returns TRUE if defaults exist and sets the string pointer (because they may be float or int) if min or max are set, then they should be freed */ { if(min) *min = NULL; // default these outs! if(max) *max = NULL; char *setting = trackDbSettingClosestToHome(tdb, scoreName); if(setting) { if(strchr(setting,':') != NULL) @@ -6135,31 +6121,31 @@ printf(">"); +puts(""); subgroupMembersFree(&membersOfView); freeMem(matchedSubtracks); return TRUE; } char *compositeLabelWithVocabLink(char *db,struct trackDb *parentTdb, struct trackDb *childTdb, char *vocabType, char *label) /* If the parentTdb has a controlledVocabulary setting and the vocabType is found, then label will be wrapped with the link to display it. Return string is cloned. */ { char *vocab = trackDbSetting(parentTdb, "controlledVocabulary"); (void)metadataForTable(db,childTdb,NULL); if(vocab == NULL) return cloneString(label); // No wrapping! @@ -6470,30 +6456,31 @@ static boolean compositeUiByFilter(char *db, struct cart *cart, struct trackDb *parentTdb, char *formName) /* UI for composite tracks: filter subgroups by multiselects to select subtracks. */ { membersForAll_t* membersForAll = membersForAllSubGroupsGet(parentTdb,cart); if(membersForAll == NULL || membersForAll->filters == FALSE) // Not Matrix or filters return FALSE; jsIncludeFile("ui.core.js",NULL); jsIncludeFile("ui.dropdownchecklist.js",NULL); webIncludeResourceFile("ui.dropdownchecklist.css"); // TODO: // 1) Scroll long lists should be configurable through tdb setting // #define FILTER_COMPOSITE_OPEN_SIZE 16 // 2) columnCount (Number of filterBoxes per row) should be configurable through tdb setting +cgiDown(0.7); printf("Filter subtracks %sby: (select multiple %sitems - %s)
\n", (membersForAll->members[dimX] != NULL || membersForAll->members[dimY] != NULL ? "further ":""), (membersForAll->dimMax == dimA?"":"categories and "),FILTERBY_HELP_LINK); printf("
| All: "); printf(PM_BUTTON_FILTER_COMP,"true", "plus_fc",'+'); printf(PM_BUTTON_FILTER_COMP,"false","minus_fc",'-'); //#define PM_BUTTON2_FILTER_COMP "  "
//printf(PM_BUTTON2_FILTER_COMP,"true", "plus_fc", "add_sm.gif");
//printf(PM_BUTTON2_FILTER_COMP,"false","minus_fc","remove_sm.gif");
@@ -6729,53 +6716,52 @@
else
printf(" | \n",(ttlX ? ttlX : ttlY)); //puts(" | "); } } } if(dimensionX && cntX>MATRIX_RIGHT_BUTTONS_AFTER) matrixYheadings(db,parentTdb, membersForAll,ixY,FALSE); puts(" |
\n"); // If any filter additional filter composites, they can be added at the end. compositeUiByFilter(db, cart, parentTdb, formName); return TRUE; } static boolean compositeUiAllButtons(char *db, struct cart *cart, struct trackDb *parentTdb, char *formName) /* UI for composite tracks: all/none buttons only (as opposed to matrix or lots of buttons */ { if (trackDbCountDescendantLeaves(parentTdb) <= 1) return FALSE; if(dimensionsExist(parentTdb)) return FALSE; #define PM_BUTTON_GLOBAL "
"
#define BUTTON_PLUS_ALL_GLOBAL() printf(PM_BUTTON_GLOBAL,"true", "plus_all", "add_sm.gif")
#define BUTTON_MINUS_ALL_GLOBAL() printf(PM_BUTTON_GLOBAL,"false","minus_all","remove_sm.gif")
BUTTON_PLUS_ALL_GLOBAL();
BUTTON_MINUS_ALL_GLOBAL();
-puts(" Select all subtracks"); +puts(" Select all subtracks
"); return TRUE; } static boolean compositeUiNoMatrix(char *db, struct cart *cart, struct trackDb *parentTdb, char *primarySubtrack, char *formName) /* UI for composite tracks: subtrack selection. This is the default UI without matrix controls. */ { int i, j, k; char *words[SMALLBUF]; char option[SMALLBUF]; int wordCnt; char javascript[JBUFSIZE]; char *primaryType = getPrimaryType(primarySubtrack, parentTdb); char *name, *value; @@ -6939,52 +6925,53 @@ if(trackDbSetting(tdb, "dragAndDrop") != NULL) jsIncludeFile("jquery.tablednd.js", NULL); jsIncludeFile("ajax.js",NULL); #ifdef TABLE_SCROLL jsIncludeFile("jquery.fixedtable.js",NULL); #endif//def TABLE_SCROLL } jsIncludeFile("hui.js",NULL); } #ifdef SUBTRACK_CFG_POPUP printf(""); cgiMakeHiddenVar("db", db); printf("\n",tdb->track); #endif -puts("
"); +cgiDown(0.7); if (trackDbCountDescendantLeaves(tdb) < MANY_SUBTRACKS && !hasSubgroups) { if(primarySubtrack) compositeUiSubtracksMatchingPrimary(db, cart, tdb,primarySubtrack); else compositeUiSubtracks(db, cart, tdb, trackHash); return; } if (fakeSubmit) cgiMakeHiddenVar(fakeSubmit, "submit"); if(primarySubtrack == NULL) { if(subgroupingExists(tdb,"view")) { hCompositeDisplayViewDropDowns(db, cart,tdb); if(subgroupCount(tdb) <= 1) viewsOnly = TRUE; } if(!viewsOnly) { + cgiDown(0.7); if(trackDbSettingOn(tdb, "allButtonPair")) { compositeUiAllButtons(db, cart, tdb, formName); } else if (!hasSubgroups || !isMatrix || primarySubtrack) { compositeUiNoMatrix(db, cart,tdb,primarySubtrack,formName); } else { compositeUiByMatrix(db, cart, tdb, formName); } } #ifdef SUBTRACK_CFG_POPUP if(primarySubtrack == NULL) @@ -6993,31 +6980,31 @@ #endif } cartSaveSession(cart); cgiContinueHiddenVar("g"); if(primarySubtrack) compositeUiSubtracksMatchingPrimary(db, cart, tdb,primarySubtrack); else compositeUiSubtracks(db, cart, tdb, trackHash); if (primarySubtrack == NULL) // primarySubtrack is set for tableBrowser but not hgTrackUi { if (trackDbCountDescendantLeaves(tdb) > 5) { - puts(""); + cgiDown(0.7); cgiMakeButton("Submit", "Submit"); } } } boolean superTrackDropDownWithExtra(struct cart *cart, struct trackDb *tdb, int visibleChild,char *extra) /* Displays hide/show dropdown for supertrack. * Set visibleChild to indicate whether 'show' should be grayed * out to indicate that no supertrack members are visible: * 0 to gray out (no visible children) * 1 don't gray out (there are visible children) * -1 don't know (this function should determine) * If -1,i the subtracks field must be populated with the child trackDbs. * Returns false if not a supertrack */