4390d7d4c09954c36d0a4a1ab455b2060ac8217c kate Wed Jan 13 17:07:45 2016 -0800 Cosmetics (stop shouting ;-) diff --git src/hg/lib/gtexUi.c src/hg/lib/gtexUi.c index c770950..352f446 100644 --- src/hg/lib/gtexUi.c +++ src/hg/lib/gtexUi.c @@ -79,150 +79,150 @@ for (i=0, tsel = tisSelects; tsel != NULL; tsel = tsel->next, i++) tisArray[i] = tsel; int col=0; int row=0; int tableColumns=3; for (i=0; i<count; i++) { int j = row + col*(count/tableColumns+1); if (j>=count) { printf("</tr><tr>"); row++; col = 0; } j = row + col*(count/tableColumns+1); - printf("<td><INPUT TYPE=CHECKBOX NAME=\"%s\" VALUE=\"%s\" %s></td>" "<td>%s</td>\n", - name, tisArray[j]->name, tisArray[j]->checked ? "CHECKED" : "", tisArray[j]->label); + printf("<td><input type=checkbox name=\"%s\" value=\"%s\" %s></td>" "<td>%s</td>\n", + name, tisArray[j]->name, tisArray[j]->checked ? "checked" : "", tisArray[j]->label); col++; } if ((i % tableColumns) != 0) while ((i++ % tableColumns) != 0) printf("<td></td>"); printf("</tr><tr><td></td></tr>\n"); } static void makeAllTissueCheckboxes(char *name, struct gtexTissue *tissues, struct slName *checked) { struct hash *checkHash = hashNew(0); struct slName *sel; for (sel = checked; sel != NULL; sel = sel->next) hashAdd(checkHash, sel->name, sel->name); -puts("<TABLE BORDERWIDTH=0><TR>"); +puts("<table borderwidth=0><tr>"); struct tissueSelect *tsel; struct gtexTissue *tis; struct tissueSelect *allTissues = NULL; for (tis = tissues; tis != NULL; tis = tis->next) { AllocVar(tsel); tsel->name = tis->name; tsel->label = makeTissueLabel(tis); if (hashNumEntries(checkHash) == 0) tsel->checked = TRUE; else tsel->checked = (hashLookup(checkHash, tis->name) != NULL); slAddHead(&allTissues, tsel); } slReverse(&allTissues); makeGroupCheckboxes(name, NULL, allTissues); -puts("</TR></TABLE>"); +puts("</tr></table>"); char buf[512]; safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name); cgiMakeHiddenVar(buf, "0"); } static void makeTableTissueCheckboxes(char *name, struct gtexTissue *tissues, struct slName *checked, boolean isPopup) { char *onClick = ""; // Sortable table can't be activated when in activated from right-click (popup mode) if (!isPopup) { jsIncludeFile("hui.js", NULL); onClick = "'tableSortAtButtonPress(this);"; } struct hash *checkHash = hashNew(0); struct slName *sel; for (sel = checked; sel != NULL; sel = sel->next) hashAdd(checkHash, sel->name, sel->name); -//puts("<TABLE BORDERWIDTH=0><TR>"); -puts("\n<TABLE CELLSPACING='2' CELLPADDING='0' border='0' class='sortable'>"); +//puts("<table borderwidth=0><tr>"); +puts("\n<table cellspacing='2' cellpadding='0' border='0' class='sortable'>"); /* table header */ -puts("\n<THEAD class='sortable'>"); -puts("\n<TR ID='tissueTableHeader' class='sortable'>"); -printf("\n<TH> <INPUT TYPE=HIDDEN NAME='%s' class='sortOrder' VALUE='%s'></TH>\n", +puts("\n<thead class='sortable'>"); +puts("\n<tr ID='tissueTableHeader' class='sortable'>"); +printf("\n<th> <input type=hidden name='%s' class='sortOrder' value='%s'></th>\n", "gtexGene.sortOrder", "tissue=+ samples=+ organ=+ system=+"); -puts("<TH> </TH>"); +puts("<th> </th>"); -printf("<TH id='tissue' class='sortable sort1' style='font-size:75%%' %s " - "align='left' title='Sort on tissue'> Tissue</TH>", onClick); +printf("<th id='tissue' class='sortable sort1' style='font-size:75%%' %s " + "align='left' title='Sort on tissue'> Tissue</th>", onClick); -printf("<TH id='samples' abbr='use' class='sortable sort2' style='font-size:75%%' %s " - "title='Sort on sample count'> Samples</TH>", onClick); +printf("<th id='samples' abbr='use' class='sortable sort2' style='font-size:75%%' %s " + "title='Sort on sample count'> Samples</th>", onClick); -printf("<TH id='organ' class='sortable sort3' style='font-size:75%%' %s " - "align='left' title='Sort on organ'> Organ</TH>", onClick); +printf("<th id='organ' class='sortable sort3' style='font-size:75%%' %s " + "align='left' title='Sort on organ'> Organ</th>", onClick); -printf("<TH id='system' class='sortable sort4' style='font-size:75%%' %s " - "align='left' title='Sort on system'> System</TH>", onClick); -puts("\n</TR>"); -puts("</THEAD>"); +printf("<th id='system' class='sortable sort4' style='font-size:75%%' %s " + "align='left' title='Sort on system'> System</th>", onClick); +puts("\n</tr>"); +puts("</thead>"); /* table body */ -puts("<TBODY class='sortable noAltColors' style='display: table-row-group;' id='tbodySort'>"); +puts("<tbody class='sortable noAltColors' style='display: table-row-group;' id='tbodySort'>"); struct hash *tscHash = gtexGetTissueSampleCount(); struct gtexTissue *tis; boolean isChecked = FALSE; for (tis = tissues; tis != NULL; tis = tis->next) { - puts("\n<TR valign='top'>"); + puts("\n<tr valign='top'>"); // checkbox if (hashNumEntries(checkHash) == 0) isChecked = TRUE; else isChecked = (hashLookup(checkHash, tis->name) != NULL); - printf("<td><INPUT TYPE=CHECKBOX NAME=\"%s\" VALUE=\"%s\" %s></td>", - name, tis->name, isChecked ? "CHECKED" : ""); + printf("<td><input type=checkbox name=\"%s\" value=\"%s\" %s></td>", + name, tis->name, isChecked ? "checked" : ""); // color patch printf("\n%s", makeTissueColorPatch(tis)); // tissue name - printf("\n<TD style='font-size:75%%'> %s</TD>", tis->description); + printf("\n<td style='font-size:75%%'> %s/td>", tis->description); // sample count int samples = hashIntValDefault(tscHash, tis->name, 0); - printf("\n<TD abbr='%05d' style='font-size:75%%; align='right';> %d</TD>", samples, samples); + printf("\n<td abbr='%05d' style='font-size:75%%; align='right';> %d/td>", samples, samples); // organ - printf("\n<TD style='font-size:75%%'> %s</TD>", tis->organ); + printf("\n<td style='font-size:75%%'> %s/td>", tis->organ); // system - printf("\n<TD style='font-size:75%%'> %s</TD>", getSystem(tis)); - puts("\n</TR>"); + printf("\n<td style='font-size:75%%'> %s/td>", getSystem(tis)); + puts("\n</tr>"); } -puts("</TBODY>"); -puts("</TABLE>"); +puts("</tbody>"); +puts("</table>"); char buf[512]; safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name); cgiMakeHiddenVar(buf, "0"); } static void makeGroupedTissueCheckboxes(char *name, struct gtexTissue *tissues, struct slName *checked) { struct hash *checkHash = hashNew(0); struct slName *sel; for (sel = checked; sel != NULL; sel = sel->next) hashAdd(checkHash, sel->name, sel->name); -puts("<TABLE BORDERWIDTH=0><TR>"); +puts("<table borderwidth=0><tr>"); struct tissueSelect *brainTissues = NULL; struct tissueSelect *digestiveTissues = NULL; struct tissueSelect *reproductiveTissues = NULL; struct tissueSelect *otherTissues = NULL; struct tissueSelect *tsel; struct gtexTissue *tis; for (tis = tissues; tis != NULL; tis = tis->next) { AllocVar(tsel); tsel->name = tis->name; tsel->label = makeTissueLabel(tis); if (hashNumEntries(checkHash) == 0) tsel->checked = TRUE; else tsel->checked = (hashLookup(checkHash, tis->name) != NULL); @@ -232,31 +232,31 @@ else if (sameString(SYSTEM_REPRODUCTIVE, system)) slAddHead(&reproductiveTissues, tsel); else if (sameString(SYSTEM_GASTRO, system)) slAddHead(&digestiveTissues, tsel); else slAddHead(&otherTissues, tsel); } slReverse(&brainTissues); slReverse(&digestiveTissues); slReverse(&reproductiveTissues); slReverse(&otherTissues); makeGroupCheckboxes(name, "Brain", brainTissues); makeGroupCheckboxes(name, "Gastrointestinal", digestiveTissues); makeGroupCheckboxes(name, "Reproductive", reproductiveTissues); makeGroupCheckboxes(name, "Other", otherTissues); -puts("</TR></TABLE>"); +puts("</tr></table>"); char buf[512]; safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name); cgiMakeHiddenVar(buf, "0"); } void gtexGeneUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed) /* GTEx (Genotype Tissue Expression) per gene data */ { boolean isPopup = FALSE; if (cartVarExists(cart, "ajax")) isPopup = TRUE; boxed = cfgBeginBoxAndTitle(tdb, boxed, title); printf("<table%s><tr><td>",boxed?" width='100%'":""); char cartVar[1024];