You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/04/30 03:56:54 UTC
[sling-org-apache-sling-app-cms] 02/03: Minor - fixing
accessibility issues
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 440fe3ee7c7cc938bc77a55c9bf01d0322758803
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Thu Apr 29 10:21:50 2021 -0400
Minor - fixing accessibility issues
---
.../main/resources/org/apache/sling/auth/form/impl/custom_login.html | 2 ++
.../sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp | 4 ++--
.../jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp | 4 ++--
.../libs/sling-cms/components/cms/startcontent/startcontent.jsp | 1 +
.../jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp | 4 ++--
.../jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp | 4 ++--
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html b/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
index c34d76e..13cf823 100644
--- a/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
+++ b/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
@@ -105,6 +105,7 @@
type="text"
placeholder="Username"
required="required"
+ title="Username"
/>
</div>
</div>
@@ -119,6 +120,7 @@
type="password"
placeholder="Password"
required="required"
+ title="Password"
/>
</div>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
index faf4127..f86d149 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
@@ -34,7 +34,7 @@
</li>
</ul>
<c:if test="${!properties.hideSearch}">
- <form method="get" class="contentnav-search">
+ <div class="contentnav-search">
<p class="control has-icons-left">
<label class="is-sr-only" for="search-term">Search</label>
<input class="input is-small" type="text" name="search" id="search-term">
@@ -42,6 +42,6 @@
<i class="jam jam-search" aria-hidden="true"></i>
</span>
</p>
- </form>
+ </div>
</c:if>
</nav>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
index 17570b7..e528178 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
@@ -19,12 +19,12 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<sling:findResources var="content" query="${properties.query}" language="JCR-SQL2" />
<aside class="menu">
-<a class="menu-label toggle-hidden" data-target="#nav-${fn:replace(properties.title,' ','-')}">${properties.title}</a>
+<a class="menu-label toggle-hidden toggle-${properties.title}" data-target="#nav-${fn:replace(properties.title,' ','-')}">${properties.title}</a>
<ul class="menu-list ${fn:startsWith(slingRequest.requestURI, properties.prefix) ? '' : 'is-hidden'}" id="nav-${fn:replace(properties.title,' ','-')}">
<c:forEach var="item" items="${content}">
<c:set var="prefixPath" value="${item.path}/" />
<li class="${(fn:startsWith(slingRequest.requestPathInfo.suffix, prefixPath) || slingRequest.requestPathInfo.suffix == item.path) ? 'is-active' : ''}">
- <a href="${properties.itemPrefix}${item.path}" title="View ${item.valueMap['jcr:title']}">
+ <a href="${properties.itemPrefix}${item.path}" class="nav-item-${fn:replace(item.valueMap['jcr:title'],' ','-'}" title="View ${item.valueMap['jcr:title']}">
<c:choose>
<c:when test="${sling:getRelativeResource(item,'jcr:content') != null}">
<sling:encode value="${sling:getRelativeResource(item,'jcr:content').valueMap['jcr:title']}" mode="HTML" />
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp
index 7cd7ff5..8b413a1 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp
@@ -63,6 +63,7 @@
<span class="icon is-small is-left">
<i class="jam jam-search" aria-hidden="true"></i>
</span>
+ <input class="is-right is-sr-only" type="submit" value="Search" id="search-submit" />
</p>
</form>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
index 98fe078..c09351b 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<nav class="menu">
- <a class="menu-label toggle-hidden" data-target="#${fn:replace(properties.title,' ','-')}-nav">
+ <a class="menu-label toggle-hidden toggle-${fn:replace(properties.title,' ','-')}" data-target="#${fn:replace(properties.title,' ','-')}-nav">
<sling:encode value="${properties.title}" mode="HTML" />
</a>
<c:set var="hidden" value="is-hidden" />
@@ -56,7 +56,7 @@
</c:forEach>
</c:if>
<c:if test="${enabled}">
- <li><a href="${item.valueMap.link}" class="${selected}">${item.valueMap.text}</a></li>
+ <li><a href="${item.valueMap.link}" class="${selected} nav-link-${fn:replace(item.valueMap.text,' ','-')}">${item.valueMap.text}</a></li>
</c:if>
</c:forEach>
</ul>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
index e995a23..e5253e1 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
@@ -22,7 +22,7 @@
enctype="multipart/form-data" class="Form-Ajax"
data-add-date="${properties.addDate != false}"
data-callback="${properties.callback}">
- <fieldset class="form-wrapper pt-4 field">
+ <div class="form-wrapper pt-4 field">
<input type="hidden" name="_charset_" value="utf-8" />
<sling:include path="fields" resourceType="sling-cms/components/general/container" />
<div class="field">
@@ -33,5 +33,5 @@
<a href="${sling:encode(header.referer,'HTML_ATTR')}" class="button close">Cancel</a>
</c:if>
</div>
- </fieldset>
+ </div>
</form>
\ No newline at end of file