1c9a09b17ced45028dcd2c6ed4ffdf82bc1d5949 tdreszer Thu Nov 17 15:13:18 2011 -0800 Better buttoning. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index cb8975b..ec2ebf6 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -6323,45 +6323,62 @@ char * cvSetting = words[ix] + strlen(words[ix]) + 1; const char * cvTerm = metadataFindValue(childTdb,cvSetting); if(cvTerm != NULL) { char *link = controlledVocabLink(words[0],(sameWord(cvSetting,"antibody")?"target":"term"),(char *)cvTerm,(char *)cvTerm,rootLabel,suffix); return link; } } } } freeMem(words[0]); freeMem(rootLabel); return cloneString(label); } +#ifdef SUBTRACK_CFG +#define DIV_BUTTON "<div class='pmButton' onclick=\"matSetMatrixCheckBoxes(%s%s%s%s)\">%s</div>" +#else///ifndef SUBTRACK_CFG #define PM_BUTTON_UC "<IMG height=18 width=18 onclick=\"return (matSetMatrixCheckBoxes(%s%s%s%s%s%s) == false);\" id='btn_%s' src='../images/%s'>" +#endif///def SUBTRACK_CFG + #define MATRIX_RIGHT_BUTTONS_AFTER 8 #define MATRIX_BOTTOM_BUTTONS_AFTER 20 static void buttonsForAll() { +#ifdef SUBTRACK_CFG +printf(DIV_BUTTON,"true", "", "", "", "+"); +printf(DIV_BUTTON,"false","", "", "", "-"); +#else///ifndef SUBTRACK_CFG printf(PM_BUTTON_UC,"true", "", "", "", "", "", "plus_all", "add_sm.gif"); printf(PM_BUTTON_UC,"false","", "", "", "", "", "minus_all", "remove_sm.gif"); +#endif///ndef SUBTRACK_CFG } static void buttonsForOne(char *name,char *class,boolean vertical) { +#ifdef SUBTRACK_CFG +printf(DIV_BUTTON, "true", ",'", class, "'", "+"); +if (vertical) + puts("<BR>"); +printf(DIV_BUTTON, "false", ",'", class, "'", "-"); +#else///ifndef SUBTRACK_CFG printf(PM_BUTTON_UC, "true", ",'", class, "'", "", "", name, "add_sm.gif"); if (vertical) puts("<BR>"); printf(PM_BUTTON_UC, "false", ",'", class, "'", "", "", name, "remove_sm.gif"); +#endif///ndef SUBTRACK_CFG } #define MATRIX_SQUEEZE 10 #ifdef MATRIX_SQUEEZE static int matrixSqueeze(membersForAll_t* membersForAll) // Returns non-zero if the matrix will be squeezed. Non-zero is actually squeezedLabelHeight { char *browserVersion; if (btIE == cgiClientBrowser(&browserVersion, NULL, NULL) && *browserVersion < '9') return 0; boolean labelHeight = 0; members_t *dimensionX = membersForAll->members[dimX]; members_t *dimensionY = membersForAll->members[dimY]; if(dimensionX && dimensionY)