19e41db7a2c91f90967be5a7c550623b2d3d93b5
Merge parents 76db7c9 71376b3
tdreszer
  Wed Nov 2 15:39:59 2011 -0700
Merge-o-mania.
diff --cc src/hg/lib/hui.c
index 7ec6d14,3223c53..d698f84
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@@ -6791,56 -6693,72 +6884,70 @@@
                      }
                  if(cells[ixX][ixY] > 0)
                      {
                      boolean halfChecked = (chked[ixX][ixY] > 0 && chked[ixX][ixY] < enabd[ixX][ixY]);
  
                      struct dyString *dyJS = dyStringCreate("onclick='matCbClick(this);'");
                      if(dimensionX && dimensionY)
                          {
                          safef(objName, sizeof(objName), "mat_%s_%s_cb", dimensionX->tags[ixX],dimensionY->tags[ixY]);
                          }
                      else
                          {
                          safef(objName, sizeof(objName), "mat_%s_cb", (dimensionX ? dimensionX->tags[ixX] : dimensionY->tags[ixY]));
                          }
                      //printf("<TD title='subCBs:%d  checked:%d enabled:%d'>\n",cells[ixX][ixY],chked[ixX][ixY],enabd[ixX][ixY]);
+                 #ifdef MATRIX_SQUEEZE
+                     if(ttlX && ttlY)
+                         printf("<TD class='matCell %s %s'>\n",dimensionX->tags[ixX],dimensionY->tags[ixY]);
+                     else
+                         printf("<TD class='matCell %s'>\n", (dimensionX ? dimensionX->tags[ixX] : dimensionY->tags[ixY]));
+                 #else///ifndef MATRIX_SQUEEZE
                      if(ttlX && ttlY)
                          printf("<TD title='%s and %s'>\n",ttlX,ttlY);
                      else
                          printf("<TD title='%s'>\n",(ttlX ? ttlX : ttlY));
+                 #endif///ndef MATRIX_SQUEEZE
                      dyStringPrintf(dyJS, " class=\"matCB");
                      if(halfChecked)
 -                        dyStringPrintf(dyJS, " halfVis");  // needed for later js identification!
 +                        dyStringPrintf(dyJS, " disabled");  // appears disabled but still clickable!
                      if(dimensionX)
                          dyStringPrintf(dyJS, " %s",dimensionX->tags[ixX]);
                      if(dimensionY)
                          dyStringPrintf(dyJS, " %s",dimensionY->tags[ixY]);
                      dyStringAppendC(dyJS,'"');
                      if(chked[ixX][ixY] > 0)
                          dyStringAppend(dyJS," CHECKED");
                      if(halfChecked)
 -                        {
 -                        //dyStringAppend(dyJS," style='filter:alpha(opacity=50)'"); // Doesn't get set overkill with class=halfVis but IE doesn't cooperate!
 -                        dyStringAppend(dyJS," title='Not all associated subtracks have been selected'"); // overkill with class=halfVis but IE doesn't cooperate!
 -                        }
 +                        dyStringAppend(dyJS," title='Not all associated subtracks have been selected'");
 +
                      MAT_CB(objName,dyStringCannibalize(&dyJS)); // X&Y are set by javascript page load
                      puts("</TD>");
                      }
                  else
                      {
+                 #ifdef MATRIX_SQUEEZE
+                     if(ttlX && ttlY)
+                         printf("<TD class='matCell %s %s'></TD>\n",dimensionX->tags[ixX],dimensionY->tags[ixY]);
+                     else
+                         printf("<TD class='matCell %s'></TD>\n", (dimensionX ? dimensionX->tags[ixX] : dimensionY->tags[ixY]));
+                 #else///ifndef MATRIX_SQUEEZE
                      if(ttlX && ttlY)
                          printf("<TD title='%s and %s'></TD>\n",ttlX,ttlY);
                      else
                          printf("<TD title='%s'></TD>\n",(ttlX ? ttlX : ttlY));
+                 #endif///ndef MATRIX_SQUEEZE
                      //puts("<TD>&nbsp;</TD>");
                      }
                  }
              }
          if(dimensionX && cntX>MATRIX_RIGHT_BUTTONS_AFTER)
              matrixYheadings(db,parentTdb, membersForAll,ixY,FALSE);
          puts("</TR>\n");
          }
      }
  if(dimensionY && cntY>MATRIX_BOTTOM_BUTTONS_AFTER)
      matrixXheadings(db,parentTdb,membersForAll,FALSE);
  
  puts("</TD></TR></TABLE>");
  
  // If any filter additional filter composites, they can be added at the end.