Skip to content

Added accessibility and docs support to tool listing page #614

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
brendanx67 wants to merge 3 commits into
base: release25.11-SNAPSHOT
Choose a base branch
from
+18 −6
Open

Added accessibility and docs support to tool listing page #614

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deb711b
Added accessibility and docs support to tool listing page
brendanx67 Mar 18, 2026
c1bb7c6
- Replaced <a><button> nesting with link() builder
vagisha Mar 18, 2026
f0c6b86
Converted Download button to anchor and fixed styled-button link styling
brendanx67 Mar 19, 2026
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
24 changes: 18 additions & 6 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
.content {margin: 8px 12px 0 0; padding:0; text-align:justify;}
.toolButtons {margin-top: 12px;}
.styled-button{
display:inline-flex;
align-items:center;
box-shadow:rgba(0,0,0,0.0.1) 0 1px 0 0;
background-color:#5B74A8;
border:1px solid #29447E;
Expand All @@ -72,6 +74,8 @@
cursor:pointer;
}
.styled-button:hover{background-color:#1e90ff; color:#f5f5dc;}
a.styled-button{text-decoration:none; color:#fff;}
a.styled-button:visited{color:#fff;}
.toolOwners {width: 80%; min-width: 300px;}
.ui-menu {width:240px;}
.dropMenu {position: absolute;}
Expand Down Expand Up @@ -153,6 +157,8 @@
// Get supporting files in map <url, icon url>
HashMap<String, String> suppFiles = SkylineToolsStoreController.getSupplementaryFiles(tool);
Iterator suppIter = suppFiles.entrySet().iterator();
boolean hasDocs = tool.hasDocumentation();
int docCount = suppFiles.size() + (hasDocs ? 1 : 0);

final String curToolOwners = StringUtils.join(SkylineToolsStoreController.getToolOwners(tool), ", ");
toolOwners.put(tool.getRowId(), curToolOwners);
Expand Down Expand Up @@ -200,17 +206,23 @@

<div class="toolButtons">

<button type="button" id="download-tool-btn-<%=tool.getRowId()%>" class="styled-button">Download <span class="visually-hidden"><%=h(tool.getName())%></span></button>
<% addHandler("download-tool-btn-" + tool.getRowId(), "click", "window.location.href = " + q(urlFor(SkylineToolsStoreController.DownloadToolAction.class).addParameter("id", tool.getRowId()))); %>
<%=link(unsafe("Download<span class=\"visually-hidden\">&nbsp;" + h(tool.getName()) + "</span>")).href(urlFor(SkylineToolsStoreController.DownloadToolAction.class).addParameter("id", tool.getRowId()).toString()).clearClasses().addClass("styled-button")%>
<%
if (suppFiles.size() == 1) {
if (docCount == 1 && hasDocs) {
%>
<%=link(unsafe("Documentation<span class=\"visually-hidden\">&nbsp;" + h(tool.getName()) + "</span>")).href(tool.getDocsUrl()).clearClasses().addClass("styled-button").target("_blank").rel("noopener noreferrer")%>
<%
} else if (docCount == 1) {
Map.Entry suppPair = (Map.Entry)suppIter.next();
%>
<a href="<%=h(suppPair.getKey())%>"><button type="button" class="styled-button">Documentation</button></a>
<% } else if (suppFiles.size() > 1) { %>
<%=link(unsafe("Documentation<span class=\"visually-hidden\">&nbsp;" + h(tool.getName()) + "</span>")).href(suppPair.getKey().toString()).clearClasses().addClass("styled-button")%>
<% } else if (docCount > 1) { %>
<div class="menuMouseArea">
<button type="button" class="styled-button">Documentation</button>
<button type="button" class="styled-button">Documentation<span class="visually-hidden"><%=h(tool.getName())%></span></button>
<ul class="dropMenu">
<% if (hasDocs) { %>
<li><a href="<%=h(tool.getDocsUrl())%>" target="_blank" rel="noopener noreferrer"><img class="menuIconImg" src="<%= h(imgDir) %>link.png" alt="Documentation">Online Documentation</a></li>
<% } %>
<%
while (suppIter.hasNext()) {
Map.Entry suppPair = (Map.Entry)suppIter.next();
Expand Down
Loading