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/01/27 16:00:01 UTC
[sling-org-apache-sling-app-cms] branch master updated: 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
The following commit(s) were added to refs/heads/master by this push:
new 075e0b0 Minor: Fixing accessibility issues
075e0b0 is described below
commit 075e0b03de1a44ae8825ef9cd5c9c5529b742246
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Jan 27 10:59:47 2021 -0500
Minor: Fixing accessibility issues
---
.../sling/cms/core/internal/filters/EditIncludeFilterTest.java | 2 +-
.../forms/impl/providers/UserProfileFormValueProvider.java | 3 ++-
ui/src/main/frontend/scss/_overrides.scss | 2 +-
.../libs/sling-cms/components/cms/actions/basic/basic.jsp | 2 +-
.../libs/sling-cms/components/cms/actions/modal/modal.jsp | 2 +-
.../libs/sling-cms/components/cms/columns/publish/publish.jsp | 4 ++--
.../components/cms/contentbreadcrumb/contentbreadcrumb.jsp | 2 +-
.../libs/sling-cms/components/cms/startcontent/startcontent.jsp | 2 +-
.../libs/sling-cms/components/cms/suffixswitch/suffixswitch.jsp | 3 ++-
.../libs/sling-cms/components/editor/fields/labelfield/field.jsp | 8 ++++++--
.../libs/sling-cms/components/editor/fields/path/path.jsp | 2 +-
.../libs/sling-cms/components/editor/fields/repeating/field.jsp | 4 ++--
.../libs/sling-cms/components/editor/fields/taxonomy/values.jsp | 6 +++++-
.../jcr_root/libs/sling-cms/components/jobs/list/list.jsp | 4 ++--
.../jcr_root/libs/sling-cms/components/pages/base/nav.jsp | 8 ++++----
15 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java b/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
index a775298..e9cf2b5 100644
--- a/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
@@ -107,7 +107,7 @@ public class EditIncludeFilterTest {
includeFilter.doFilter(context.request(), context.response(), Mockito.mock(FilterChain.class));
assertEquals(
- "<div class=\"sling-cms-component\" data-reload=\"false\" data-component=\"/libs/sling-cms/components/general/richtext\" data-sling-cms-title=\"Rich Text Editor\" data-sling-cms-resource-path=\"/content/apache/sling-apache-org/index/jcr:content/menu/richtext\" data-sling-cms-resource-type=\"sling-cms/components/general/richtext\" data-sling-cms-edit=\"/libs/sling-cms/components/general/richtext/edit\" data-sling-cms-resource-name=\"richtext\">\n <div class=\"sling-cms- [...]
+ "<div class=\"sling-cms-component\" data-reload=\"false\" data-component=\"/libs/sling-cms/components/general/richtext\" data-sling-cms-title=\"Rich Text Editor\" data-sling-cms-resource-path=\"/content/apache/sling-apache-org/index/jcr:content/menu/richtext\" data-sling-cms-resource-type=\"sling-cms/components/general/richtext\" data-sling-cms-edit=\"/libs/sling-cms/components/general/richtext/edit\" data-sling-cms-resource-name=\"richtext\">\n <div class=\"sling-cms- [...]
context.response().getOutputAsString());
}
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/providers/UserProfileFormValueProvider.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/providers/UserProfileFormValueProvider.java
index 323b51a..09b007f 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/providers/UserProfileFormValueProvider.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/providers/UserProfileFormValueProvider.java
@@ -53,6 +53,8 @@ public class UserProfileFormValueProvider implements FormValueProvider {
if (session != null) {
UserManager userManager = session.getUserManager();
User user = (User) userManager.getAuthorizable(userId);
+
+ formData.put("userId", user.getID());
String subpath = providerResource.getValueMap().get(FormConstants.PN_SUBPATH, FormConstants.PATH_PROFILE);
log.debug("Loading profile data from: {}/{}", user.getPath(), subpath);
@@ -63,7 +65,6 @@ public class UserProfileFormValueProvider implements FormValueProvider {
log.debug("Loading key {}", key);
loadKey(formData, subpath, key, user);
}
- formData.put("userId", user.getID());
} else {
log.warn("Failed to load Jackrabbit session for request");
}
diff --git a/ui/src/main/frontend/scss/_overrides.scss b/ui/src/main/frontend/scss/_overrides.scss
index 3f5a868..d29a1a4 100644
--- a/ui/src/main/frontend/scss/_overrides.scss
+++ b/ui/src/main/frontend/scss/_overrides.scss
@@ -22,7 +22,7 @@ $indigo: #282661;
$violet: #662F8F;
$magenta: #9E2165;
$crimson: #CB2138;
-$orange: #EA7826;
+$orange: #B74500;
$goldenrod: #F79A25;
$gray: #6D6E71;
$gray-light: lighten($gray, 50%);
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp
index 4aa1684..8714d29 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp
@@ -19,7 +19,7 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<a class="button" ${actionConfig.valueMap.new != false ? 'target="_blank"' : ''} href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
<span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
+ <span class="is-sr-only">
${sling:encode(actionConfig.valueMap.title,'HTML')}
</span>
</span>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp
index 6902f05..eb1511e 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp
@@ -19,7 +19,7 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<a class="button Fetch-Modal" data-title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}" data-path="${actionConfig.valueMap.ajaxPath != null ? actionConfig.valueMap.ajaxPath : '.Main-Content form'}" href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
<span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
+ <span class="is-sr-only">
${sling:encode(actionConfig.valueMap.title,'HTML')}
</span>
</span>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
index 6edc01e..2842e62 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
@@ -23,14 +23,14 @@
<c:when test="${publishableResource.published}">
<a class="button is-success is-outlined Fetch-Modal" href="/cms/shared/unpublish.html${resource.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form">
<i class="jam jam-check">
- <span class="is-vhidden">Content Published</span>
+ <span class="is-sr-only">Content Published</span>
</i>
</a>
</c:when>
<c:otherwise>
<a class="button is-warning is-outlined Fetch-Modal" href="/cms/shared/publish.html${resource.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form">
<i class="jam jam-close">
- <span class="is-vhidden">Content Not Published</span>
+ <span class="is-sr-only">Content Not Published</span>
</i>
</a>
</c:otherwise>
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 0d2a3f0..faf4127 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
@@ -36,7 +36,7 @@
<c:if test="${!properties.hideSearch}">
<form method="get" class="contentnav-search">
<p class="control has-icons-left">
- <label class="is-vhidden" for="search-term">Search</label>
+ <label class="is-sr-only" for="search-term">Search</label>
<input class="input is-small" type="text" name="search" id="search-term">
<span class="icon is-small is-left">
<i class="jam jam-search" aria-hidden="true"></i>
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 f4c643a..7cd7ff5 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
@@ -58,7 +58,7 @@
<div class="panel-block">
<form method="get" class="get-form" data-target=".search-result-container" data-load="div" action="${resource.path}.search.html">
<p class="control has-icons-left">
- <label class="is-vhidden" for="search-term">Search</label>
+ <label class="is-sr-only" for="search-term">Search</label>
<input class="input is-small" type="text" name="q" id="search-term" />
<span class="icon is-small is-left">
<i class="jam jam-search" aria-hidden="true"></i>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/suffixswitch/suffixswitch.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/suffixswitch/suffixswitch.jsp
index e704711..95b05aa 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/suffixswitch/suffixswitch.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/suffixswitch/suffixswitch.jsp
@@ -29,10 +29,11 @@
</label>
<div class="field has-addons">
<div class="control is-expanded">
- <input class="input pathfield" type="text" name="suffix" required="required" data-type="${properties.type}" data-base="${properties.base}" autocomplete="off" />
+ <input class="input pathfield" type="text" name="suffix" id="suffix" required="required" data-type="${properties.type}" data-base="${properties.base}" autocomplete="off" />
</div>
<div class="control">
<a href="/cms/shared/search.html" class="button Fetch-Modal search-button" data-title="Search" data-path=".Main-Content > *">
+ <span class="is-sr-only">Search</span>
<span class="jam jam-search"></span>
</a>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/labelfield/field.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/labelfield/field.jsp
index 70a1c23..ce92bbe 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/labelfield/field.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/labelfield/field.jsp
@@ -23,7 +23,11 @@
<input type="hidden" name="${properties.name}" value="" />
<span class="labelfield__title">
</span>
- <button class="delete is-small"></button>
+ <button class="delete is-small">
+ <span class="is-sr-only">
+ Delete
+ </span>
+ </button>
</a>
</fieldset>
<div class="labelfield__field field has-addons">
@@ -33,7 +37,7 @@
<div class="control">
<button class="labelfield__add button">
<span class="jam jam-plus">
- <span class="is-vhidden">
+ <span class="is-sr-only">
Add
</span>
</span>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
index 984323d..f0ce71e 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
@@ -63,7 +63,7 @@
<div class="control">
<a href="/cms/shared/search.html" class="button Fetch-Modal search-button" data-title="Search" data-path=".Main-Content > *">
<span class="jam jam-search">
- <span class="is-vhidden">Search</span>
+ <span class="is-sr-only">Search</span>
</span>
</a>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
index b41a72a..a5f6504 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
@@ -26,7 +26,7 @@
<div class="control">
<button class="repeating__remove button">
<span class="jam jam-minus">
- <span class="is-vhidden">
+ <span class="is-sr-only">
Remove
</span>
</span>
@@ -43,7 +43,7 @@
<div class="control">
<button class="repeating__remove button">
<span class="jam jam-minus">
- <span class="is-vhidden">
+ <span class="is-sr-only">
Remove
</span>
</span>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/taxonomy/values.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/taxonomy/values.jsp
index 14afc7d..2ba2355 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/taxonomy/values.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/taxonomy/values.jsp
@@ -23,6 +23,10 @@
<span class="labelfield__title">
${sling:encode(sling:getResource(resourceResolver,item).valueMap['jcr:title'],'HTML')}
</span>
- <button class="delete is-small"></button>
+ <button class="delete is-small">
+ <span class="is-sr-only">
+ Delete
+ </span>
+ </button>
</a>
</c:forEach>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/jobs/list/list.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/jobs/list/list.jsp
index 2e91522..62fa173 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/jobs/list/list.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/jobs/list/list.jsp
@@ -36,7 +36,7 @@
<th>
<fmt:message key="slingcms.state" />
</th>
- <th class="is-vhidden">
+ <th class="is-sr-only">
</th>
</tr>
</thead>
@@ -66,7 +66,7 @@
<td>
<sling:encode value="${job.jobState}" mode="HTML" />
</td>
- <td class="is-vhidden cell-actions">
+ <td class="is-sr-only cell-actions">
<a class="button Fetch-Modal" data-title="<fmt:message key="slingcms.jobs.remove" />" data-path=".Main-Content form" href="/cms/jobs/delete.html/bin/cms/removejob?id=${job.id}" title="<fmt:message key="slingcms.jobs.remove" />">
<span class="jam jam-trash">
</span>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
index 5823c7b..6351d4b 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
@@ -25,7 +25,7 @@
<a href="/cms/start.html" class="navbar-item" title="CMS Home">
<span class="icon">
<em class="jam jam-home-f">
- <span class="is-vhidden">Home</span>
+ <span class="is-sr-only">Home</span>
</em>
</span>
</a>
@@ -49,20 +49,20 @@
<div class="navbar-dropdown">
<a class="navbar-item Fetch-Modal" data-title="User Profile" data-path=".Main-Content form" href="/cms/auth/user/profile.html${auth.authorizable.path}">
<em class="jam jam-id-card">
- <span class="is-vhidden">Profile</span>
+ <span class="is-sr-only">Profile</span>
</em>
Profile
</a>
<a class="navbar-item" href="${branding.helpLink}" target="_blank" rel="noopener noreferrer">
<em class="jam jam-help">
- <span class="is-vhidden">Help</span>
+ <span class="is-sr-only">Help</span>
</em>
Help
</a>
<hr class="navbar-divider">
<a class="navbar-item" href="/system/sling/logout">
<em class="jam jam-log-out">
- <span class="is-vhidden">Logout</span>
+ <span class="is-sr-only">Logout</span>
</em>
Logout
</a>