c2f76a8b519313e22f6c91ee7745e86e4dc660bc gperez2 Mon Jun 17 10:56:57 2024 -0700 Switching more hgTracks and hgTables buttons/labels to sentence case, refs #25787 diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c index 3e5d585..5693264 100644 --- src/hg/hgTracks/config.c +++ src/hg/hgTracks/config.c @@ -285,56 +285,56 @@ collapseGroupVar(group->name),collapseGroupVar(group->name), (isOpen?0:1)); char idText[256]; safef(idText, sizeof idText, "%s_button", group->name); hPrintf("<IMG class='toggleButton' " "id='%s' src='%s' alt='%s' title='%s this group'> ", idText, indicatorImg, indicator,isOpen?"Collapse":"Expand"); // TODO XSS filter group->name jsOnEventByIdF("click", idText, "return vis.toggleForGroup(this,'%s');", group->name); hPrintf("<B> %s</B> ", group->label); hPrintf(" "); hPrintf("</td><td style='text-align:right;'>\n"); safef(idText, sizeof idText, "%s_hideAllBut", group->name); hPrintf("<INPUT TYPE=SUBMIT NAME=\"%s\" id='%s' VALUE=\"%s\" " "title='Hide all tracks in this groups'>", - configHideAll, idText, "hide all"); + configHideAll, idText, "Hide all"); // TODO XSS filter configGroupTarget char jsText[256]; // used several times safef(jsText, sizeof jsText, "document.mainForm.%s.value='%s'; %s", configGroupTarget, group->name, jsSetVerticalPosition("mainForm")); jsOnEventById("click", idText, jsText); hPrintf(" "); safef(idText, sizeof idText, "%s_showAllBut", group->name); hPrintf("<INPUT TYPE=SUBMIT NAME=\"%s\" id='%s' VALUE=\"%s\" " "title='Show all tracks in this groups'>", - configShowAll, idText, "show all"); + configShowAll, idText, "Show all"); jsOnEventById("click", idText, jsText); hPrintf(" "); safef(idText, sizeof idText, "%s_defaultBut", group->name); hPrintf("<INPUT TYPE=SUBMIT NAME=\"%s\" id='%s' VALUE=\"%s\" " "title='Show default tracks in this group'>", - configDefaultAll, idText, "default"); + configDefaultAll, idText, "Default"); jsOnEventById("click", idText, jsText); hPrintf(" "); /* do not want all the submit buttons named the same. It is * confusing to the javascript submit() function. */ char submitName[256]; safef(submitName, sizeof(submitName), "%sSubmit", group->name); - cgiMakeButtonWithMsg(submitName, "submit","Submit your selections and view them in the browser"); + cgiMakeButtonWithMsg(submitName, "Submit","Submit your selections and view them in the browser"); hPrintf("</td></tr></table>\n"); hPrintf("</TH></TR>\n"); /* First non-CT, non-hub group gets ruler. */ if (!showedRuler && !isHubTrack(group->name) && differentString(group->name, "user")) { showedRuler = TRUE; hPrintf("<TR %sid='%s-0'>",(isOpen ? "" : "style='display: none'"), group->name); hPrintf("<TD>"); hPrintf("<A HREF=\"%s?%s=%s&c=%s&g=%s&hgTracksConfigPage=configure\">", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), chromName, RULER_TRACK_NAME); hPrintf("%s</A>", RULER_TRACK_LABEL); hPrintf("</TD><TD>"); @@ -573,82 +573,82 @@ struct group *groupList; configInitTrackList(vis, &groupTarget, &trackList, &ideoTrack, &groupList); struct dyString *title = dyStringNew(0); dyStringPrintf(title, "Configure Image"); hPrintf("<FORM ACTION=\"%s\" NAME=\"mainForm\" METHOD=%s>\n", hgTracksName(), cartUsualString(cart, "formMethod", "POST")); webStartWrapperDetailedNoArgs(cart, database, "", title->string, FALSE, FALSE, FALSE, FALSE); cartSaveSession(cart); hPrintf("<INPUT TYPE=HIDDEN NAME=\"hgTracksConfigPage\" VALUE=\"\">"); /* do not want all the submit buttons named the same thing, this one is: */ -cgiMakeButton("topSubmit", "submit"); +cgiMakeButton("topSubmit", "Submit"); // 3 column table hPrintf("<TABLE style=\"border:0px; \">\n"); -hPrintf("<TR><TD>image width:"); +hPrintf("<TR><TD>Image width:"); hPrintf("<TD style=\"text-align: right\">"); hIntVar("pix", tl.picWidth, 4); hPrintf("<TD>pixels</TR>"); -hPrintf("<TR><TD>label area width:"); +hPrintf("<TR><TD>Label area width:"); hPrintf("<TD style=\"text-align: right\">"); hIntVar(leftLabelWidthVar, tl.leftLabelWidthChars, 2); hPrintf("<TD>characters<TD></TR>"); -hPrintf("<TR><TD>text size:"); +hPrintf("<TR><TD>Text size:"); hPrintf("<TD style=\"text-align: right\">"); textSizeDropDown(); hPrintf("</TD>"); if (trackLayoutInclFontExtras()) { hPrintf("<TD>"); char *defaultStyle = cartUsualString(cart, "fontType", "medium"); cartMakeRadioButton(cart, "fontType", "medium", defaultStyle); hPrintf(" medium "); cartMakeRadioButton(cart, "fontType", "fixed", defaultStyle); hPrintf(" fixed "); cartMakeRadioButton(cart, "fontType", "bold", defaultStyle); hPrintf(" bold "); hPrintf(" "); hPrintf("</TD>"); } hPrintf("</TR>"); if (freeTypeOn()) { - hPrintf("<TR><TD>font:"); + hPrintf("<TR><TD>Font:"); hPrintf("<TD style=\"text-align: right\">"); textFontDropDown(); hPrintf("</TD></TR>"); - hPrintf("<TR><TD id='textStyleName'>style:"); + hPrintf("<TR><TD id='textStyleName'>Style:"); hPrintf("<TD style=\"text-align: right\" id='textStyleDrop' >"); textStyleDropDown(); hPrintf("</TR>"); hPrintf("</TR>"); } if (cfgOptionBooleanDefault("showMouseovers", FALSE)) { /* I predict most people will want the browser text size as the tooltip text size * but just in case, users can change the value and it will remain independent * of the font size by saving to localStorage. */ - hPrintf("<tr><td>tooltip text size:</td>"); + hPrintf("<tr><td>Tooltip text size:</td>"); hPrintf("<td style=\"text-align: right\">"); static char *sizes[] = {"6", "8", "10", "12", "14", "18", "24", "34"}; int i; hPrintf("<select name='tooltipTextSize'>"); for (i = 0; i < ArraySize(sizes); i++) { hPrintf("<option "); if (sameString(tl.textSize,sizes[i])) {hPrintf("selected");} hPrintf(">%s</option>", sizes[i]); } hPrintf("</select>"); hPrintf("</td>"); hPrintf("</tr>"); jsInlineF("" "function updateSelectedTooltipSize(newSize) {\n" @@ -748,40 +748,40 @@ safef(buf, sizeof buf, "Configure Tracks on %s %s: %s", organization, browserName, trackHubSkipHubName(organism)); else if (stringIn(database, freeze)) safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s", organization, browserName, trackHubSkipHubName(organism), freeze); else safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s (%s)", organization, browserName, trackHubSkipHubName(organism), freeze, trackHubSkipHubName(database)); webNewSection("%s",buf); hPrintf("Tracks: "); if (isSearchTracksSupported(database,cart)) { cgiMakeButtonWithMsg(TRACK_SEARCH, TRACK_SEARCH_BUTTON,TRACK_SEARCH_HINT); hPrintf(" "); } -cgiMakeButtonWithMsg(configHideAll, "hide all","Hide all tracks in this genome assembly"); +cgiMakeButtonWithMsg(configHideAll, "Hide all","Hide all tracks in this genome assembly"); hPrintf(" "); -cgiMakeButtonWithMsg(configShowAll, "show all","Show all tracks in this genome assembly"); +cgiMakeButtonWithMsg(configShowAll, "Show all","Show all tracks in this genome assembly"); hPrintf(" "); -cgiMakeButtonWithMsg(configDefaultAll, "default","Display only default tracks"); +cgiMakeButtonWithMsg(configDefaultAll, "Default","Display only default tracks"); hPrintf(" Groups: "); -hButtonWithOnClick("hgt.collapseGroups", "collapse all", "Collapse all track groups", +hButtonWithOnClick("hgt.collapseGroups", "Collapse all", "Collapse all track groups", "return vis.expandAllGroups(false)"); hPrintf(" "); -hButtonWithOnClick("hgt.expandGroups", "expand all", "Expand all track groups", +hButtonWithOnClick("hgt.expandGroups", "Expand all", "Expand all track groups", "return vis.expandAllGroups(true)"); hPrintf("<div style='margin-top:.2em; margin-bottom:.9em;'>Control track and group visibility " "more selectively below.</div>"); trackConfig(trackList, groupList, groupTarget, vis); dyStringFree(&title); freez(&groupTarget); webEndSectionTables(); hPrintf("</FORM>"); } void configPage() /* Put up configuration page. */ { configPageSetTrackVis(-2);