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 a47f03d7fd60f14e4cdd622c5131c9f74118d069 Author: Dan Klco <[email protected]> AuthorDate: Thu Feb 27 20:56:00 2020 -0500 Fixing some minor HTML issues --- builder/src/main/provisioning/cms.txt | 2 +- .../libs/sling-cms/components/cms/contentgrid/contentgrid.jsp | 11 +++++++---- .../sling-cms/components/cms/contenttable/contenttable.jsp | 4 ++-- .../sling-cms/components/cms/i18ncontainer/i18ncontainer.jsp | 4 ++-- .../libs/sling-cms/components/cms/pageeditor/pageeditor.jsp | 2 +- .../libs/sling-cms/components/cms/references/references.jsp | 8 ++++---- .../sling-cms/components/cms/startcontent/startcontent.jsp | 2 +- .../components/cms/versionmanager/versionmanager.jsp | 10 +++++----- .../libs/sling-cms/components/editor/fields/file/field.jsp | 2 +- .../components/editor/fields/references/references.jsp | 8 ++++---- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt index da5f99b..d475251 100644 --- a/builder/src/main/provisioning/cms.txt +++ b/builder/src/main/provisioning/cms.txt @@ -204,7 +204,7 @@ statusForFailedContraint="CRITICAL" org.apache.felix.hc.generalchecks.JmxAttributeCheck-slowqueries - mbean.name="org.apache.jackrabbit.oak:name\=Oak Query Statistics,type\=QueryStat" + mbean.name="org.apache.jackrabbit.oak:name\=Oak Query Statistics,type\=QueryStats" hc.name="Jackrabbit Oak - Slow Queries" hc.tags=["oak","system-resources"] attribute.value.constraint="0" diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp index 00ab099..664f595 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp @@ -91,6 +91,9 @@ <c:when test="${not empty child.valueMap['jcr:content/jcr:title']}"> <c:set var="title" value="${child.valueMap['jcr:content/jcr:title']}" /> </c:when> + <c:when test="${not empty child.valueMap['jcr:title']}"> + <c:set var="title" value="${child.valueMap['jcr:title']}" /> + </c:when> <c:otherwise> <c:set var="title" value="${child.name}" /> </c:otherwise> @@ -108,16 +111,16 @@ <c:choose> <c:when test="${sling:getRelativeResource(child,'jcr:content').valueMap.published}"> <a class="Fetch-Modal has-text-success" href="/cms/shared/unpublish.html${child.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form"> - <i class="jam jam-check"> + <em class="jam jam-check"> <span class="is-vhidden">Content Published</span> - </i> + </em> </a> </c:when> <c:otherwise> <a class="has-text-warning Fetch-Modal" href="/cms/shared/publish.html${child.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form"> - <i class="jam jam-close"> + <em class="jam jam-close"> <span class="is-vhidden">Content Not Published</span> - </i> + </em> </a> </c:otherwise> </c:choose> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp index 5c8ff58..ba5540e 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp @@ -21,11 +21,11 @@ <table class="table is-fullwidth is-striped sortable"> <thead> <tr> - <th> + <th scope="col"> # </th> <c:forEach var="column" items="${sling:listChildren(sling:getRelativeResource(resource,'columns'))}"> - <th class="${column.name == 'actions' ? 'is-hidden' : '' }" data-attribute="${column.name}"> + <th class="${column.name == 'actions' ? 'is-hidden' : '' }" data-attribute="${column.name}" scope="col"> <sling:encode value="${column.valueMap.title}" mode="HTML" /> </th> </c:forEach> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ncontainer/i18ncontainer.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ncontainer/i18ncontainer.jsp index 57aa356..721a616 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ncontainer/i18ncontainer.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ncontainer/i18ncontainer.jsp @@ -37,12 +37,12 @@ <table class="table is-fullwidth is-striped"> <thead> <tr> - <th class="Column-key"> + <th class="Column-key" scope="col"> Key </th> <c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}"> <c:if test="${not empty language.valueMap['jcr:language']}"> - <th class="Column-${language.valueMap['jcr:language']}"> + <th class="Column-${language.valueMap['jcr:language']}" scope="col"> <sling:adaptTo adaptable="${language}" adaptTo="org.apache.sling.cms.core.models.LocaleResource" var="localeResource" /> <sling:encode value="${localeResource.locale.displayLanguage}" mode="HTML" /> <sling:encode value="${localeResource.locale.displayCountry}" mode="HTML" /> <br/> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditor/pageeditor.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditor/pageeditor.jsp index 309c013..b5d175c 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditor/pageeditor.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditor/pageeditor.jsp @@ -18,5 +18,5 @@ */ --%> <%@include file="/libs/sling-cms/global.jsp"%> <div class="sling-cms-editor reload-container" data-path="${resource.path}.html${sling:encode(slingRequest.requestPathInfo.suffix,'HTML_ATTR')}"> - <iframe class="page-wrapper-frame" src="/cms/page/pagewrapper.html${sling:encode(slingRequest.requestPathInfo.suffix,'HTML_ATTR')}"></iframe> + <iframe class="page-wrapper-frame" src="/cms/page/pagewrapper.html${sling:encode(slingRequest.requestPathInfo.suffix,'HTML_ATTR')}" title="Page Wrapper Frame"></iframe> </div> \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/references/references.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/references/references.jsp index a4f8f54..772d9d0 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/references/references.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/references/references.jsp @@ -21,10 +21,10 @@ <table class="table is-fullwidth"> <thead> <tr> - <th>Type</th> - <th>Content</th> - <th>Subpath</th> - <th>Property</th> + <th scope="col">Type</th> + <th scope="col">Content</th> + <th scope="col">Subpath</th> + <th scope="col">Property</th> </thead> <tbody> <c:forEach var="ref" items="${references.references}"> 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 2b2c117..94be095 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 @@ -21,7 +21,7 @@ <sling:adaptTo adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.StartContent" var="startContent" /> <div class="columns"> <div class="column"> - <nav class="panel"> + <nav class="panel" aria-label="<fmt:message key="slingcms.recentcontent" />"> <p class="panel-heading"> <fmt:message key="slingcms.recentcontent" /> </p> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp index b2d1eda..023def2 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp @@ -56,11 +56,11 @@ <table class="table is-fullwidth" data-sort="false" data-paginate="false"> <thead> <tr> - <th>Version</th> - <th>Created</th> - <th>Successors</th> - <th>Predecessors</th> - <th>Restore</th> + <th scope="col">Version</th> + <th scope="col">Created</th> + <th scope="col">Successors</th> + <th scope="col">Predecessors</th> + <th scope="col">Restore</th> </tr> </thead> <tbody class="load-versions"> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp index 647eb81..975de75 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp @@ -39,7 +39,7 @@ <input type="file" class="file-input" name="${properties.name}" ${required} accept="${accepts}" multiple="multiple" /> <span class="file-cta"> <span class="file-icon"> - <i class="jam jam-upload"></i> + <em class="jam jam-upload"></em> </span> <span class="file-label"> Browse / Drag File(s) diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/references/references.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/references/references.jsp index e196fd7..7149f3b 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/references/references.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/references/references.jsp @@ -34,10 +34,10 @@ <table class="table" data-paginate="false"> <thead> <tr> - <th>Type</th> - <th>Content</th> - <th>Subpath</th> - <th>Property</th> + <th scope="col">Type</th> + <th scope="col">Content</th> + <th scope="col">Subpath</th> + <th scope="col">Property</th> </thead> <tbody> <c:forEach var="ref" items="${references.references}">
