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 2020/11/23 14:28:53 UTC
[sling-org-apache-sling-app-cms] 01/05: Improving branding support
to be able to override all major aspects
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 f6e0051fcdbf9ae233f69cb93418c0f2517bdc46
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 22:25:29 2020 -0500
Improving branding support to be able to override all major aspects
---
.../libs/sling-cms/components/cms/contentgrid/contentgrid.jsp | 8 ++++----
.../jcr_root/libs/sling-cms/components/cms/tilecard/tilecard.jsp | 2 +-
.../jcr_root/libs/sling-cms/components/pages/base/nav.jsp | 4 ++--
.../main/resources/jcr_root/libs/sling-cms/content/branding.json | 3 +++
.../jcr_root/libs/sling-cms/content/publication/home.json | 8 ++++----
5 files changed, 14 insertions(+), 11 deletions(-)
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 e834133..64f2c3a 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
@@ -48,10 +48,10 @@
<img src="${child.path}.transform/sling-cms-thumbnail.png" loading="lazy" alt="${child.name}">
</c:when>
<c:when test="${child.resourceType == 'sling:Site'}">
- <img src="/static/sling-cms/thumbnails/site.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
+ <img src="${branding.gridIconsBase}/site.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
</c:when>
<c:when test="${child.resourceType == 'sling:OrderedFolder' || child.resourceType == 'sling:Folder' || child.resourceType == 'nt:folder'}">
- <img src="/static/sling-cms/thumbnails/folder.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
+ <img src="${branding.gridIconsBase}/folder.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
</c:when>
<c:when test="${child.resourceType == 'sling:Page'}">
<c:set var="templateThumbnail" value="${child.valueMap['jcr:content/sling:template']}/thumbnail"/>
@@ -60,12 +60,12 @@
<img src="${templateThumbnail}.transform/sling-cms-thumbnail.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
</c:when>
<c:otherwise>
- <img src="/static/sling-cms/thumbnails/page.png" loading="lazy" alt="${child.name}">
+ <img src="${branding.gridIconsBase}/page.png" loading="lazy" alt="${child.name}">
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
- <img src="/static/sling-cms/thumbnails/file.png" loading="lazy" alt="${child.name}">
+ <img src="${branding.gridIconsBase}/file.png" loading="lazy" alt="${child.name}">
</c:otherwise>
</c:choose>
</figure>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/tilecard/tilecard.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/tilecard/tilecard.jsp
index fb3a9e2..10d95d5 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/tilecard/tilecard.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/tilecard/tilecard.jsp
@@ -22,7 +22,7 @@
<div class="card is-linked" title="${sling:encode(properties.title,'HTML_ATTR')}" data-value="${resource.path}">
<div class="card-image">
<figure class="image is-5by4">
- <img src="${sling:encode(properties.image,'HTML_ATTR')}" loading="lazy" alt="${sling:encode(properties.title,'HTML_ATTR')}">
+ <img src="${branding.gridIconsBase}${sling:encode(properties.icon,'HTML_ATTR')}" loading="lazy" alt="${sling:encode(properties.title,'HTML_ATTR')}">
</figure>
</div>
<footer class="card-footer">
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 e0773a3..5823c7b 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
@@ -19,7 +19,7 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<nav class="navbar has-background-light" role="navigation" aria-label="main mavigation">
<div class="navbar-brand">
- <a class="navbar-item" href="http://sling.apache.org">
+ <a class="navbar-item" href="${branding.logoLink}">
<img src="${branding.logo}" width="100" alt="${branding.appName}"/>
</a>
<a href="/cms/start.html" class="navbar-item" title="CMS Home">
@@ -53,7 +53,7 @@
</em>
Profile
</a>
- <a class="navbar-item" href="https://github.com/apache/sling-org-apache-sling-app-cms" target="_blank" rel="noopener noreferrer">
+ <a class="navbar-item" href="${branding.helpLink}" target="_blank" rel="noopener noreferrer">
<em class="jam jam-help">
<span class="is-vhidden">Help</span>
</em>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/branding.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/branding.json
index 450cd91..6661951 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/branding.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/branding.json
@@ -6,7 +6,10 @@
"favicon32": "/static/clientlibs/sling-cms/img/favicon-32x32.png",
"favicon16": "/static/clientlibs/sling-cms/img/favicon-16x16.png",
"favicon": "/static/clientlibs/sling-cms/img/favicon.ico",
+ "gridIconsBase": "/static/sling-cms/thumbnails",
+ "helpLink": "https://github.com/apache/sling-org-apache-sling-app-cms",
"logo": "/static/clientlibs/sling-cms/img/sling-logo.svg",
+ "logoLink": "https://sling.apache.org",
"tileColor": "#662f8f",
"browserConfig": "/static/clientlibs/sling-cms/img/browserconfig.xml",
"webManifest": "/static/clientlibs/sling-cms/img/site.webmanifest",
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
index 8d93902..ee00036 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
@@ -22,28 +22,28 @@
"agents": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/cms/tilecard",
- "image": "/static/sling-cms/thumbnails/publish-agent.png",
+ "icon": "/publish-agent.png",
"link": "/cms/publication/agents.html/libs/sling/distribution/settings/agents",
"title": "Agents"
},
"bulk-publication": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/cms/tilecard",
- "image": "/static/sling-cms/thumbnails/bulk-publication.png",
+ "icon": "/bulk-publication.png",
"link": "/cms/jobs/list.html",
"title": "Bulk Publication"
},
"exporters": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/cms/tilecard",
- "image": "/static/sling-cms/thumbnails/exporter.png",
+ "icon": "/exporter.png",
"link": "/cms/publication/exporters.html/libs/sling/distribution/settings/exporters",
"title": "Exporters"
},
"importers": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/cms/tilecard",
- "image": "/static/sling-cms/thumbnails/importer.png",
+ "icon": "/importer.png",
"link": "/cms/publication/importers.html/libs/sling/distribution/settings/importers",
"title": "Importers"
}