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/DOM.java b/api/src/org/labkey/api/util/DOM.java index f31179179b2..296c9b0bfc8 100644 --- a/api/src/org/labkey/api/util/DOM.java +++ b/api/src/org/labkey/api/util/DOM.java @@ -579,6 +579,23 @@ public _Attributes data(boolean condition, String datakey, Object value) } return this; } + public _Attributes aria(String ariakey, Object value) + { + if (null == expandos) + expandos = new ArrayList<>(); + expandos.add(new Pair<>("aria-" + ariakey,value)); + return this; + } + public _Attributes aria(boolean condition, String ariakey, Object value) + { + if (condition) + { + if (null == expandos) + expandos = new ArrayList<>(); + expandos.add(new Pair<>("aria-" + ariakey,value)); + } + return this; + } public _Attributes cl(String...names) { diff --git a/api/src/org/labkey/api/util/LinkBuilder.java b/api/src/org/labkey/api/util/LinkBuilder.java index 13c5ff67262..fde40f659b8 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) + .aria(lb.iconCls != null && lb.tooltip != null, "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' + ''; }