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 afe026a96221b4896878ebbeb6383bc9496b051b Author: Dan Klco <[email protected]> AuthorDate: Mon Jul 8 08:25:28 2019 -0400 Updating icons and adding the ability to brand the application --- ui/pom.xml | 28 ++++++++++++++++--- .../frontend/src/img/android-chrome-192x192.png | Bin 3262 -> 2477 bytes .../frontend/src/img/android-chrome-512x512.png | Bin 7552 -> 6171 bytes ui/src/main/frontend/src/img/apple-touch-icon.png | Bin 3224 -> 2138 bytes ui/src/main/frontend/src/img/browserconfig.xml | 4 +-- ui/src/main/frontend/src/img/favicon-16x16.png | Bin 497 -> 359 bytes ui/src/main/frontend/src/img/favicon-32x32.png | Bin 800 -> 544 bytes ui/src/main/frontend/src/img/favicon.ico | Bin 15086 -> 7406 bytes ui/src/main/frontend/src/img/mstile-150x150.png | Bin 2473 -> 1655 bytes ui/src/main/frontend/src/img/safari-pinned-tab.svg | 2 +- .../components/cms/pageeditbar/pageeditbar.jsp | 4 +-- .../libs/sling-cms/components/pages/base/base.jsp | 4 +-- .../libs/sling-cms/components/pages/base/head.jsp | 30 +++++++++++---------- .../libs/sling-cms/components/pages/base/nav.jsp | 2 +- .../libs/sling-cms/components/pages/error/nav.jsp | 2 +- .../jcr_root/libs/sling-cms/content/branding.json | 14 ++++++++++ .../resources/jcr_root/libs/sling-cms/global.jsp | 3 ++- 17 files changed, 66 insertions(+), 27 deletions(-) diff --git a/ui/pom.xml b/ui/pom.xml index 5923629..67f12f1 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -4,7 +4,9 @@ in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>org.apache.sling.cms</artifactId> @@ -47,6 +49,26 @@ <build> <plugins> + + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- don't check anything in target --> + <exclude>target/*</exclude> + <exclude>**/*.webmanifest</exclude> + </excludes> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -113,14 +135,14 @@ <instructions> <Sling-Nodetypes>SLING-INF/nodetypes/nodetypes.cnd</Sling-Nodetypes> <Sling-Initial-Content> - jcr_root, + jcr_root;ignoreImportProviders:=xml, jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index, jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global, jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs, jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy, jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/errorhandler, jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms, - jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms + jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms;ignoreImportProviders:=xml </Sling-Initial-Content> <Include-Resource>{maven-resources},${basedir}/target/frontend/dist</Include-Resource> </instructions> diff --git a/ui/src/main/frontend/src/img/android-chrome-192x192.png b/ui/src/main/frontend/src/img/android-chrome-192x192.png index 9449505..a5f8875 100644 Binary files a/ui/src/main/frontend/src/img/android-chrome-192x192.png and b/ui/src/main/frontend/src/img/android-chrome-192x192.png differ diff --git a/ui/src/main/frontend/src/img/android-chrome-512x512.png b/ui/src/main/frontend/src/img/android-chrome-512x512.png index 195ebe0..10a5c54 100644 Binary files a/ui/src/main/frontend/src/img/android-chrome-512x512.png and b/ui/src/main/frontend/src/img/android-chrome-512x512.png differ diff --git a/ui/src/main/frontend/src/img/apple-touch-icon.png b/ui/src/main/frontend/src/img/apple-touch-icon.png index df261e9..76ae6d0 100644 Binary files a/ui/src/main/frontend/src/img/apple-touch-icon.png and b/ui/src/main/frontend/src/img/apple-touch-icon.png differ diff --git a/ui/src/main/frontend/src/img/browserconfig.xml b/ui/src/main/frontend/src/img/browserconfig.xml index 5f597c9..39931ac 100644 --- a/ui/src/main/frontend/src/img/browserconfig.xml +++ b/ui/src/main/frontend/src/img/browserconfig.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,11 +16,12 @@ specific language governing permissions and limitations under the License. --> +<?xml version="1.0" encoding="utf-8"?> <browserconfig> <msapplication> <tile> <square150x150logo src="/static/clientlibs/sling-cms/img/mstile-150x150.png"/> - <TileColor>#ffffff</TileColor> + <TileColor>#662f8f</TileColor> </tile> </msapplication> </browserconfig> diff --git a/ui/src/main/frontend/src/img/favicon-16x16.png b/ui/src/main/frontend/src/img/favicon-16x16.png index 3f2e70f..d7f7d8f 100644 Binary files a/ui/src/main/frontend/src/img/favicon-16x16.png and b/ui/src/main/frontend/src/img/favicon-16x16.png differ diff --git a/ui/src/main/frontend/src/img/favicon-32x32.png b/ui/src/main/frontend/src/img/favicon-32x32.png index 4be0b97..9c810e3 100644 Binary files a/ui/src/main/frontend/src/img/favicon-32x32.png and b/ui/src/main/frontend/src/img/favicon-32x32.png differ diff --git a/ui/src/main/frontend/src/img/favicon.ico b/ui/src/main/frontend/src/img/favicon.ico index ce0c6b4..ff627a0 100644 Binary files a/ui/src/main/frontend/src/img/favicon.ico and b/ui/src/main/frontend/src/img/favicon.ico differ diff --git a/ui/src/main/frontend/src/img/mstile-150x150.png b/ui/src/main/frontend/src/img/mstile-150x150.png index 7564a96..c45ca93 100644 Binary files a/ui/src/main/frontend/src/img/mstile-150x150.png and b/ui/src/main/frontend/src/img/mstile-150x150.png differ diff --git a/ui/src/main/frontend/src/img/safari-pinned-tab.svg b/ui/src/main/frontend/src/img/safari-pinned-tab.svg index 2ada06c..37b7f30 100644 --- a/ui/src/main/frontend/src/img/safari-pinned-tab.svg +++ b/ui/src/main/frontend/src/img/safari-pinned-tab.svg @@ -16,4 +16,4 @@ specific language governing permissions and limitations under the License. --> -<svg version="1" xmlns="http://www.w3.org/2000/svg"; width="1024" height="1024" viewBox="0 0 768.000000 768.000000"><path d="M63 146.1c-30.2 6.1-50.8 22.8-59.4 48.1C1.1 201.7.8 203.9.5 216c-.7 28.6 10.1 50.8 31.7 65.7 6.6 4.5 24.7 13.9 40.1 20.7 9.4 4.1 25.2 13.3 31 18.1 6.8 5.5 11.2 12.1 13.7 20.5 6.6 22.4-1.4 42.1-21 52-8.8 4.5-15.7 5.8-27.4 5.5-5.7-.1-10.7-.5-11.2-.8-.5-.3-2.6-.8-4.8-1.1-8.7-1.4-25.4-8.2-34.8-14.3-1.5-.9-2.9-1.5-3-1.3-.3.4-11.1 27.4-13.3 33.2-1.1 2.8 23.9 14 36.4 16.3 [...] \ No newline at end of file +<svg version="1" xmlns="http://www.w3.org/2000/svg"; width="682.667" height="682.667" viewBox="0 0 512.000000 512.000000"><path d="M72 125.9c-7 2.2-9.5 3.5-14.8 7.9-11.7 9.4-16.8 25.9-12.7 41.5 4.1 15.8 10.3 21.8 34.6 33.9 25 12.4 30.1 17.6 30.2 31.3 0 7.1-1.8 11.9-6.4 16.4-11 11-28.1 10.5-51-1.7-.4-.1-2.3 3.8-4.3 8.9-4.2 10.4-4.1 10.6 3.4 13.8 13 5.6 31.5 7.2 44.7 3.8 14.2-3.7 26-12.6 31.1-23.4 2.5-5.4 2.7-6.8 2.7-18.3-.1-10.8-.4-13.3-2.4-18.5-3.5-8.8-12.9-17.8-24.3-23.3-4.9-2.3-12.7-6.1 [...] \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp index 0316182..e6f6cfb 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp @@ -23,9 +23,9 @@ <div class="sling-cms-editor"> <div class="level has-background-grey"> <div class="level-left"> - <a href="/cms/start.html" target="_blank" title="Sling CMS" + <a href="/cms/start.html" target="_blank" title="${branding.appName}" class="button"> <img - src="/static/clientlibs/sling-cms/img/sling-logo.svg" + src="${branding.logo}" class="sling-cms-logo" /> </a> </div> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/base.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/base.jsp index ba73388..db32cd5 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/base.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/base.jsp @@ -18,6 +18,6 @@ */ --%> <%@include file="/libs/sling-cms/global.jsp"%> <html lang="en"> - <sling:call script="head.jsp" /> - <sling:call script="body.jsp" /> + <sling:call script="head.jsp" /> + <sling:call script="body.jsp" /> </html> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp index 97cf252..665f7b0 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp @@ -18,18 +18,20 @@ */ --%> <%@include file="/libs/sling-cms/global.jsp"%> <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <title>${properties['jcr:title']} :: Apache Sling CMS</title> - <link href="/static/clientlibs/sling-cms/css/styles.min.css" rel="stylesheet" /> - <link rel="apple-touch-icon" sizes="180x180" href="/static/clientlibs/sling-cms/img/apple-touch-icon.png"> - <link rel="icon" type="image/png" sizes="32x32" href="/static/clientlibs/sling-cms/img/favicon-32x32.png"> - <link rel="icon" type="image/png" sizes="16x16" href="/static/clientlibs/sling-cms/img/favicon-16x16.png"> - <link rel="shortcut icon" href="/static/clientlibs/sling-cms/img/favicon.ico"> - <meta name="apple-mobile-web-app-title" content="Apache Sling CMS"> - <meta name="application-name" content="Apache Sling CMS"> - <meta name="msapplication-TileColor" content="#ffffff"> - <meta name="msapplication-config" content="/static/clientlibs/sling-cms/img/browserconfig.xml"> - <meta name="theme-color" content="#ffffff"> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <title>${properties['jcr:title']} :: ${branding.appName}</title> + <link href="${branding.css}" rel="stylesheet" /> + <link rel="apple-touch-icon" sizes="180x180" href="${branding.appleTouchIcon}" /> + <link rel="icon" type="image/png" sizes="32x32" href="${branding.favicon32}" /> + <link rel="icon" type="image/png" sizes="16x16" href="${branding.favicon16}" /> + <link rel="shortcut icon" href="${branding.favicon}" /> + <meta name="apple-mobile-web-app-title" content="${branding.appName}" /> + <meta name="application-name" content="${branding.appName}" /> + <link rel="mask-icon" href="${branding.appleMaskIcon}" color="${branding.tileColor}" /> + <meta name="msapplication-TileColor" content="${branding.tileColor}" /> + <meta name="theme-color" content="${branding.tileColor}" /> + <meta name="msapplication-config" content="${branding.browserConfig}"> + <link rel="manifest" href="${branding.webManifest }"> </head> \ No newline at end of file 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 36279aa..eb42fc1 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 @@ -20,7 +20,7 @@ <nav class="navbar" role="navigation" aria-label="main mavigation"> <div class="navbar-brand"> <a class="navbar-item" href="http://sling.apache.org"; > - <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling"/> + <img src="${branding.logo}" width="100" alt="${branding.appName}"/> </a> <a href="/cms/start.html" class="navbar-item" title="CMS Home"> <span class="icon"> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp index ba023a4..6ae82e2 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp @@ -20,7 +20,7 @@ <nav class="navbar" role="navigation" aria-label="main navigation"> <div class="navbar-brand"> <a class="navbar-item" href="http://sling.apache.org"; > - <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling"/> + <img src="${branding.logo}" width="100" alt="${branding.appName}"/> </a> <a href="/cms/start.html" class="navbar-item" title="CMS Home"><span class="icon"><i class="jam jam-home-f"></i></span></a> </div> 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 new file mode 100644 index 0000000..e9ad0b7 --- /dev/null +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/branding.json @@ -0,0 +1,14 @@ +{ + "jcr:primaryType": "nt:unstructured", + "appName": "Apache Sling CMS", + "appleTouchIcon": "/static/clientlibs/sling-cms/img/apple-touch-icon.png", + "appleMaskIcon": "/static/clientlibs/sling-cms/img/safari-pinned-tab.svg", + "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", + "logo": "/static/clientlibs/sling-cms/img/sling-logo.svg", + "tileColor": "#662f8f", + "browserConfig": "/static/clientlibs/sling-cms/img/browserconfig.xml", + "webManifest": "/static/clientlibs/sling-cms/img/site.webmanifest", + "css": "/static/clientlibs/sling-cms/css/styles.min.css" +} \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/global.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/global.jsp index 8b34fcc..2d9b3bd 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/global.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/global.jsp @@ -20,4 +20,5 @@ %><%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %><% %><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %><% %><%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %><% -%><sling:defineObjects /><sling:adaptTo var="properties" adaptable="${resource}" adaptTo="org.apache.sling.api.resource.ValueMap" /> \ No newline at end of file +%><sling:defineObjects /><sling:adaptTo var="properties" adaptable="${resource}" adaptTo="org.apache.sling.api.resource.ValueMap" /><% +%><c:set var="branding" value="${sling:getResource(resourceResolver,'/mnt/overlay/sling-cms/content/branding').valueMap}" /> \ No newline at end of file
