501e55a67f5bb19ecf63258f70aa408c3d30dbfa tdreszer Wed Nov 2 16:58:42 2011 -0700 Exclude IE <9 from particilating in matrixSqueeze diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 5f8c4c8..c7a453b 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -6313,30 +6313,34 @@ printf(PM_BUTTON_UC,"false","", "", "", "", "", "minus_all", "remove_sm.gif"); } static void buttonsForOne(char *name,char *class,boolean vertical) { printf(PM_BUTTON_UC, "true", ",'", class, "'", "", "", name, "add_sm.gif"); if (vertical) puts("<BR>"); printf(PM_BUTTON_UC, "false", ",'", class, "'", "", "", name, "remove_sm.gif"); } #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) { if(dimensionX->count>MATRIX_SQUEEZE) { int ixX,cntX=0; for (ixX = 0; ixX < dimensionX->count; ixX++) { if(dimensionX->subtrackList && dimensionX->subtrackList[ixX] && dimensionX->subtrackList[ixX]->val) { cntX++; char *ptr = dimensionX->titles[ixX]; int ttlLen = strlen(ptr); @@ -6390,31 +6394,31 @@ printf("<TH ALIGN=RIGHT valign=%s> <B><EM>%s</EM></B></TH>",(top?"TOP":"BOTTOM"), dimensionX->groupTitle); for (ixX = 0; ixX < dimensionX->count; ixX++) { if(dimensionX->subtrackList && dimensionX->subtrackList[ixX] && dimensionX->subtrackList[ixX]->val) { #ifdef MATRIX_SQUEEZE if(dimensionY && squeeze>0) printf("<TH nowrap='' class='%s'><div class='%s'>%s</div></TH>\n",dimensionX->tags[ixX],(top?"up45":"dn45"), compositeLabelWithVocabLink(db,parentTdb,dimensionX->subtrackList[ixX]->val,dimensionX->groupTag,dimensionX->titles[ixX])); else #endif///def MATRIX_SQUEEZE { char *label =replaceChars(dimensionX->titles[ixX]," (","<BR>("); #ifdef MATRIX_SQUEEZE - printf("<TH WIDTH='60' class='%s'> %s </TH>",dimensionX->tags[ixX], + printf("<TH WIDTH='60' class='matCell %s all'> %s </TH>",dimensionX->tags[ixX], #else///ifndef MATRIX_SQUEEZE printf("<TH WIDTH='60'> %s </TH>", #endif///ndef MATRIX_SQUEEZE compositeLabelWithVocabLink(db,parentTdb,dimensionX->subtrackList[ixX]->val,dimensionX->groupTag,label)); freeMem(label); } cntX++; } } // If dimension is big enough, then add Y buttons to right as well if(cntX>MATRIX_RIGHT_BUTTONS_AFTER) { if(dimensionY) { #ifdef MATRIX_SQUEEZE