diff --git a/api/src/org/labkey/api/query/AbstractNestableDataRegion.java b/api/src/org/labkey/api/query/AbstractNestableDataRegion.java index 2392710f88f..00b29cf5acb 100644 --- a/api/src/org/labkey/api/query/AbstractNestableDataRegion.java +++ b/api/src/org/labkey/api/query/AbstractNestableDataRegion.java @@ -38,6 +38,7 @@ import static org.labkey.api.util.DOM.A; import static org.labkey.api.util.DOM.Attribute.align; +import static org.labkey.api.util.DOM.Attribute.alt; import static org.labkey.api.util.DOM.Attribute.colspan; import static org.labkey.api.util.DOM.Attribute.id; import static org.labkey.api.util.DOM.Attribute.src; @@ -94,7 +95,8 @@ protected void renderExtraRecordSelectorContent(RenderContext ctx, HtmlWriter ou at( id, getName() + "-Handle" + value, valign, "middle", - src, ctx.getViewContext().getContextPath() + "/_images/" + (_expanded ? "minus" : "plus") + ".gif" + src, ctx.getViewContext().getContextPath() + "/_images/" + (_expanded ? "minus" : "plus") + ".gif", + alt, _expanded ? "Collapse row" : "Expand row" ) ) ).appendTo(out); diff --git a/api/src/org/labkey/api/util/LinkBuilder.java b/api/src/org/labkey/api/util/LinkBuilder.java index 13c5ff67262..26c90f4a50b 100644 --- a/api/src/org/labkey/api/util/LinkBuilder.java +++ b/api/src/org/labkey/api/util/LinkBuilder.java @@ -155,7 +155,8 @@ public Appendable appendTo(Appendable out) .at(!lb.enabled, disabled, true) .data(null != lb.tooltip, "tt", "tooltip") .data(null != lb.tooltip, "placement","top") - .data(null != lb.tooltip, "original-title", lb.tooltip), + .data(null != lb.tooltip, "original-title", lb.tooltip) + .at(lb.iconCls != null && lb.tooltip != null, DOM.Attribute.aria_label, lb.tooltip), (lb.iconCls != null ? null : lb.html) ).appendTo(out); } diff --git a/api/webapp/clientapi/ext3/PersistentToolTip.js b/api/webapp/clientapi/ext3/PersistentToolTip.js index a65026904cc..3d02731acbf 100644 --- a/api/webapp/clientapi/ext3/PersistentToolTip.js +++ b/api/webapp/clientapi/ext3/PersistentToolTip.js @@ -167,7 +167,7 @@ LABKEY.ext.CalloutTip = Ext.extend(LABKEY.ext.PersistentToolTip, { if (!this.targetAutoEl) { this.targetAutoEl = '' + - '' + + 'Show details' + ''; } diff --git a/core/package-lock.json b/core/package-lock.json index b780fa5c2e3..a9cfc961f64 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "dependencies": { "@labkey/components": "7.31.1", - "@labkey/themes": "1.8.0" + "@labkey/themes": "1.9.0" }, "devDependencies": { "@labkey/build": "9.1.1", @@ -3825,9 +3825,9 @@ } }, "node_modules/@labkey/themes": { - "version": "1.8.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/themes/-/@labkey/themes-1.8.0.tgz", - "integrity": "sha512-e/UgJ+Pd7+kuscsm0IJFkPH07SLcPKcHA1jfGRSdjGKYSMc6QRcBgE1/6ETAnly+39QKRukR3lNmC0w5KW/M/g==", + "version": "1.9.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/themes/-/@labkey/themes-1.9.0.tgz", + "integrity": "sha512-ecwSkBAcI4NqspsFCSiS1dRXh/lAtb/hHg4jyca1jl8JVosnpNfZI/XW99UTF4pwwKlVu6cDvxGeKErOJxVkvg==", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE.txt" }, diff --git a/core/package.json b/core/package.json index cf17dea5062..b494f26d13f 100644 --- a/core/package.json +++ b/core/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@labkey/components": "7.31.1", - "@labkey/themes": "1.8.0" + "@labkey/themes": "1.9.0" }, "devDependencies": { "@labkey/build": "9.1.1",