Skip to content

Fix accessibility issues suggested by WAVE #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankurjuneja wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+19 −18
Open

Fix accessibility issues suggested by WAVE #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/org/labkey/targetedms/view/precursorConflictResolutionView.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ $(document).ready(function () {
{
row.child.hide();
tr.removeClass('shown');
$("." + cls).children('img').attr('src', "<%=getWebappURL("_images/plus.gif")%>");
$("." + cls).children('img').attr('src', "<%=getWebappURL("_images/minus.gif")%>");
Copy link
Copy Markdown
Contributor

@labkey-jeckels labkey-jeckels May 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this backwards now? My comment in the previous PR was meant to say that we should update the text when the code toggles between plus and minus, not that we should flip the plus and minus handling.

For example, on line 274 use plus.gif and use expand as the alt text, and do the same on line 122 (instead of just swapping the icon but leaving the original text)

}
else {
row.child.show();
tr.addClass('shown');
$("." + cls).children('img').attr('src', "<%=getWebappURL("_images/minus.gif")%>");
$("." + cls).children('img').attr('src', "<%=getWebappURL("_images/plus.gif")%>");
}

if(!srcTd.hasClass('content_loaded'))
Expand Down Expand Up @@ -271,7 +271,7 @@ function toggleCheckboxSelection(element)
<!--<td class="representative newPrecursor <%=precursor.getNewPrecursorId()%>"><%=precursor.getNewPrecursorId()%></td>-->
<td class="representative details-control newPrecursor <%=precursor.getNewPrecursorId()%>">
<span class="<%=precursor.getNewPrecursorId()%>_<%=precursor.getOldPrecursorId()%>">
<img src="<%=getWebappURL("_images/plus.gif")%>"/>
<img src="<%=getWebappURL("_images/minus.gif")%>" alt="Expand row details"/>
</span>
</td>
<td class="representative newPrecursor <%=precursor.getNewPrecursorId()%>">
Expand All @@ -291,7 +291,7 @@ function toggleCheckboxSelection(element)
<!--<td class="oldPrecursor <%=precursor.getNewPrecursorId()%>"><%=precursor.getOldPrecursorId()%></td>-->
<td class="details-control oldPrecursor <%=precursor.getNewPrecursorId()%>">
<span class="<%=precursor.getNewPrecursorId()%>_<%=precursor.getOldPrecursorId()%>">
<img src="<%=getWebappURL("_images/plus.gif")%>"/>
<img src="<%=getWebappURL("_images/minus.gif")%>" alt="Expand row details"/>
</span>
</td>
<td class="oldPrecursor <%=precursor.getNewPrecursorId()%>">
Expand Down
1 change: 1 addition & 0 deletions webapp/TargetedMS/css/qcTrendPlotReport.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
font-size: 18px;
padding: 0 8px;
border: solid #c0c0c0 1px;
background: none;
}
.qc-paging-prev {
border-right-width: 0;
Expand Down
28 changes: 14 additions & 14 deletions webapp/TargetedMS/js/QCTrendPlotPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'per replicate', id: 'x-axis-grouping-replicate', name: 'xAxisGrouping', inputValue: 'replicate', checked: this.groupedX === false },
{ boxLabel: 'per date', id: 'x-axis-grouping-date', name: 'xAxisGrouping', inputValue: 'date', checked: this.groupedX === true }
{ boxLabel: 'per replicate', id: 'x-axis-grouping-replicate', name: 'xAxisGrouping', inputValue: 'replicate', checked: this.groupedX === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'X-axis grouping: per replicate'}); } } },
{ boxLabel: 'per date', id: 'x-axis-grouping-date', name: 'xAxisGrouping', inputValue: 'date', checked: this.groupedX === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'X-axis grouping: per date'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1050,8 +1050,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'per precursor', name: 'showPlots', id: 'plots-per-precursor', inputValue: 'per-precursor', checked: this.singlePlot === false },
{ boxLabel: 'combined', name: 'showPlots', id: 'plots-combined', inputValue: 'combined', checked: this.singlePlot === true }
{ boxLabel: 'per precursor', name: 'showPlots', id: 'plots-per-precursor', inputValue: 'per-precursor', checked: this.singlePlot === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Plots: per precursor'}); } } },
{ boxLabel: 'combined', name: 'showPlots', id: 'plots-combined', inputValue: 'combined', checked: this.singlePlot === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Plots: combined'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1081,8 +1081,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'show', id: 'excluded-replicates-show', name: 'excludedSamples', inputValue: 'show', checked: this.showExcluded === true },
{ boxLabel: 'hide', id: 'excluded-replicates-hide', name: 'excludedSamples', inputValue: 'hide', checked: this.showExcluded === false }
{ boxLabel: 'show', id: 'excluded-replicates-show', name: 'excludedSamples', inputValue: 'show', checked: this.showExcluded === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded replicates: show'}); } } },
{ boxLabel: 'hide', id: 'excluded-replicates-hide', name: 'excludedSamples', inputValue: 'hide', checked: this.showExcluded === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded replicates: hide'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1110,8 +1110,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'show', id: 'excluded-precursors-show', name: 'excludedPrecursors', inputValue: 'show', checked: this.showExcludedPrecursors === true },
{ boxLabel: 'hide', id: 'excluded-precursors-hide', name: 'excludedPrecursors', inputValue: 'hide', checked: this.showExcludedPrecursors === false }
{ boxLabel: 'show', id: 'excluded-precursors-show', name: 'excludedPrecursors', inputValue: 'show', checked: this.showExcludedPrecursors === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded precursors: show'}); } } },
{ boxLabel: 'hide', id: 'excluded-precursors-hide', name: 'excludedPrecursors', inputValue: 'hide', checked: this.showExcludedPrecursors === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded precursors: hide'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1144,8 +1144,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'always show', id: 'reference-guide-set-show', name: 'referenceGuideSets', inputValue: 'show', checked: this.showReferenceGS === true },
{ boxLabel: 'when in date range', id: 'reference-guide-set-hide', name: 'referenceGuideSets', inputValue: 'hide', checked: this.showReferenceGS === false }
{ boxLabel: 'always show', id: 'reference-guide-set-show', name: 'referenceGuideSets', inputValue: 'show', checked: this.showReferenceGS === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Reference guide sets: always show'}); } } },
{ boxLabel: 'when in date range', id: 'reference-guide-set-hide', name: 'referenceGuideSets', inputValue: 'hide', checked: this.showReferenceGS === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Reference guide sets: when in date range'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1283,11 +1283,11 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
getPaginationBtns: function(numOfPrecursors) {
var btnHtml = '';

btnHtml += '<span class="qc-paging-prev ' + (this.pagingStartIndex > 0 ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '"><i class="fa fa-angle-left"></i></span>';
btnHtml += '<button type="button" class="qc-paging-prev ' + (this.pagingStartIndex > 0 ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '" aria-label="Previous page"' + (this.pagingStartIndex > 0 ? '' : ' disabled') + '><i class="fa fa-angle-left" aria-hidden="true"></i></button>';

btnHtml += '<span class="qc-paging-next ' + (this.pagingEndIndex < numOfPrecursors ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '"><i class="fa fa-angle-right"></i></span>';
btnHtml += '<button type="button" class="qc-paging-next ' + (this.pagingEndIndex < numOfPrecursors ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '" aria-label="Next page"' + (this.pagingEndIndex < numOfPrecursors ? '' : ' disabled') + '><i class="fa fa-angle-right" aria-hidden="true"></i></button>';

return btnHtml;
},
Expand Down
Loading