Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion api/src/org/labkey/api/view/menu/NavTreeMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ private void renderLinks(NavTree nav, int level, String pathToHere, String rootI
ActionURL expandCollapseUrl = Objects.requireNonNull(PageFlowUtil.urlProvider(ProjectUrls.class)).getExpandCollapseURL(getViewContext().getContainer(), pathToHere, rootId);

String image = collapsed ? "plus.gif" : "minus.gif";
String altPrefix = collapsed ? "Expand" : "Collapse";
id = config.makeId("navtree");
oldWriter.printf("<a id=\"%s\" href=\"%s\">", id, filter(expandCollapseUrl));
config.addHandler(id, "click", "return LABKEY.Utils.toggleLink(this,true);");
oldWriter.printf("<img src=\"%s/_images/%s\" width=9 height=9></a>", context.getContextPath(), image);
oldWriter.printf("<img src=\"%s/_images/%s\" width=9 height=9 alt=\"%s %s\"></a>", filter(context.getContextPath()), filter(image), filter(altPrefix), filter(nav.getText()));
}
else if (indentForExpansionGifs)
oldWriter.printf("<div class=\"labkey-nav-tree-indenter\"></div>");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ public void renderCollapsiblePortalTitle(PrintWriter out)

public void renderCustomDropDown(String title, NavTree current, PrintWriter out)
{
renderMenuWithFontImage(null, current, out, null, false);
renderMenuWithFontImage(title, current, out, null, false);
}
}

Expand Down Expand Up @@ -750,7 +750,9 @@ private void renderMenuWithFontImage(String title, NavTree menu, PrintWriter out
if (rightAlign)
out.print(" pull-right");
out.print("\">");
out.print("<a href=\"#\" data-toggle=\"dropdown\" class=\"dropdown-toggle ");
out.print("<a href=\"#\" aria-label=\"");
out.print(filter(title) + " webpart options");
out.print("\" data-toggle=\"dropdown\" class=\"dropdown-toggle ");
out.print(!StringUtils.isEmpty(imageCls) ? imageCls : !StringUtils.isEmpty(menu.getImageCls()) ? menu.getImageCls() : "");
out.print("\">");
out.print("</a>");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
{
%>
<li class="navbar-search hidden-xs">
<a class="fa fa-search" id="global-search-trigger"></a>
<a class="fa fa-search" id="global-search-trigger" aria-label="<%=h(SearchUtils.getPlaceholder(c))%>"></a>
<div id="global-search" class="global-search">
<labkey:form id="global-search-form" action="<%=urlProvider(SearchUrls.class).getSearchURL(c, null)%>" method="GET">
<input type="text" class="search-box" name="q" placeholder="<%=h(SearchUtils.getPlaceholder(c))%>" value="">
Expand Down
2 changes: 1 addition & 1 deletion search/src/org/labkey/search/view/search.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<div style="position:relative;">
<labkey:form id="<%=searchFormId%>" className="lk-search-form" action="<%=searchConfig.getPostURL(c)%>">
<labkey:input type="text" name="q" placeholder="<%=form.isWebPart() ? \"\" : SearchUtils.getPlaceholder(c)%>" formGroup="false" value="<%=value%>"/>
<a class="search-overlay fa fa-search"></a>
<a class="search-overlay fa fa-search" aria-label="<%= h(SearchUtils.getPlaceholder(c)) %>"></a>
<% if (showAdvancedUI) { %>
<small>
<a class="search-advanced-toggle">advanced options</a>
Expand Down