[sling-site] 01/01: SLING-10717 move favicon.ico to website root

[kw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/favicon-in-root
in repository https://gitbox.apache.org/repos/asf/sling-site.git

commit 31774058a286ece31140a8273ad398769d6f395c
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Aug 13 16:02:05 2021 +0200

    SLING-10717 move favicon.ico to website root
---
 src/main/jbake/assets/.htaccess             |   2 ++
 src/main/jbake/assets/{res => }/favicon.ico | Bin
 src/main/jbake/templates/header.tpl         |   2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/jbake/assets/.htaccess b/src/main/jbake/assets/.htaccess
index 6a43b9e..1413c58 100644
--- a/src/main/jbake/assets/.htaccess
+++ b/src/main/jbake/assets/.htaccess
@@ -34,6 +34,8 @@ Redirect Permanent /plugins.html /
 Redirect Permanent /documentation/the-sling-engine/eventing-and-jobs.html /documentation/bundles/apache-sling-eventing-and-job-handling.html
 Redirect Permanent /documentation/bundles/scripting/scripting-sightly.html /documentation/bundles/scripting/scripting-htl.html
 
+Redirect Permanent /res/favicon.ico /favicon.ico
+
 # Add redirects from /site to the CMS-managed content here, after verifying that /site pages have been converted correctly
 # Please keep entries in alphabetical order
 Redirect Permanent /site/46-line-blog.html /documentation/tutorials-how-tos/46-line-blog.html
diff --git a/src/main/jbake/assets/res/favicon.ico b/src/main/jbake/assets/favicon.ico
similarity index 100%
rename from src/main/jbake/assets/res/favicon.ico
rename to src/main/jbake/assets/favicon.ico
diff --git a/src/main/jbake/templates/header.tpl b/src/main/jbake/templates/header.tpl
index 4127748..dcf993e 100644
--- a/src/main/jbake/templates/header.tpl
+++ b/src/main/jbake/templates/header.tpl
@@ -3,7 +3,7 @@ head {
 	title("${config.blog_title} :: ${content.title?:tag}") newLine()
 
 	// For now, try to reproduce the layout of the current website, to be able to compare pages
-	link(rel:"icon", href:"${config.site_contextPath}res/favicon.ico") newLine()
+	link(rel:"icon", href:"${config.site_contextPath}favicon.ico") newLine()
 	link(rel:"stylesheet", href:"https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.5/css/bulma.min.css") newLine()
 	link(rel:"stylesheet", href:"${config.site_contextPath}res/css/site.css") newLine()