You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/05/27 11:38:42 UTC
[sling-site] branch master updated (cdab18c -> 98d603c)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git.
from cdab18c Release Apache Sling Scripting Core 2.0.58
new a420f1d trivial: switched apache.org links to https; dynamic year for footer
new 98d603c trivial: tabs vs spaces? spaces!
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/jbake/jbake.properties | 2 +-
src/main/jbake/templates/footer.tpl | 5 ++++-
src/main/jbake/templates/logos.tpl | 20 +++++++++---------
src/main/jbake/templates/menu.tpl | 42 ++++++++++++++++++-------------------
4 files changed, 36 insertions(+), 33 deletions(-)
[sling-site] 02/02: trivial: tabs vs spaces? spaces!
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 98d603c1a3a30ffaf8cfb01c43b970bc5f8b7544
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon May 27 13:38:12 2019 +0200
trivial: tabs vs spaces? spaces!
---
src/main/jbake/templates/logos.tpl | 20 ++++++++++----------
src/main/jbake/templates/menu.tpl | 28 ++++++++++++++--------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/jbake/templates/logos.tpl b/src/main/jbake/templates/logos.tpl
index 279b92d..8a22ecf 100644
--- a/src/main/jbake/templates/logos.tpl
+++ b/src/main/jbake/templates/logos.tpl
@@ -1,12 +1,12 @@
div(class:"title") {
- div(class:"logo") {
- a(href:"https://sling.apache.org") {
- img(border:"0", alt:"Apache Sling", src:"${config.site_contextPath}res/logos/sling.svg")
- }
- }
- div(class:"header") {
- a(href:"https://www.apache.org") {
- img(border:"0", alt:"Apache", src:"${config.site_contextPath}res/logos/apache.png")
- }
- }
+ div(class:"logo") {
+ a(href:"${config.site_host}") {
+ img(border:"0", alt:"Apache Sling", src:"${config.site_contextPath}res/logos/sling.svg")
+ }
+ }
+ div(class:"header") {
+ a(href:"https://www.apache.org") {
+ img(border:"0", alt:"Apache", src:"${config.site_contextPath}res/logos/apache.png")
+ }
+ }
}
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index 9048e14..e8b594b 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -1,20 +1,20 @@
// TODO read links from a Markdown or other definition file?
nav(class:"menu"){
- ul() {
- li(){
- strong("Documentation")
- ul() {
+ ul() {
+ li(){
+ strong("Documentation")
+ ul() {
li(){a(href:"${config.site_contextPath}documentation.html", "Overview")}
- li(){a(href:"${config.site_contextPath}documentation/getting-started.html", "Getting Started")}
- li(){a(href:"${config.site_contextPath}documentation/the-sling-engine.html", "The Sling Engine")}
- li(){a(href:"${config.site_contextPath}documentation/development.html", "Development")}
- li(){a(href:"${config.site_contextPath}documentation/bundles.html", "Bundles")}
- li(){a(href:"${config.site_contextPath}documentation/tutorials-how-tos.html", "Tutorials & How-Tos")}
- li(){a(href:"${config.site_contextPath}components/", "Maven Plugins")}
- li(){a(href:"${config.site_contextPath}documentation/configuration.html", "Configuration")}
- }
- }
+ li(){a(href:"${config.site_contextPath}documentation/getting-started.html", "Getting Started")}
+ li(){a(href:"${config.site_contextPath}documentation/the-sling-engine.html", "The Sling Engine")}
+ li(){a(href:"${config.site_contextPath}documentation/development.html", "Development")}
+ li(){a(href:"${config.site_contextPath}documentation/bundles.html", "Bundles")}
+ li(){a(href:"${config.site_contextPath}documentation/tutorials-how-tos.html", "Tutorials & How-Tos")}
+ li(){a(href:"${config.site_contextPath}components/", "Maven Plugins")}
+ li(){a(href:"${config.site_contextPath}documentation/configuration.html", "Configuration")}
+ }
+ }
li(){
strong("API Docs")
ul() {
@@ -77,6 +77,6 @@ nav(class:"menu"){
}}
}
}
- }
+ }
}
[sling-site] 01/02: trivial: switched apache.org links to https;
dynamic year for footer
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit a420f1de9cc6c9fafd11394ed47eef040ff01325
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon May 27 13:00:21 2019 +0200
trivial: switched apache.org links to https; dynamic year for footer
---
src/main/jbake/jbake.properties | 2 +-
src/main/jbake/templates/footer.tpl | 5 ++++-
src/main/jbake/templates/logos.tpl | 4 ++--
src/main/jbake/templates/menu.tpl | 16 ++++++++--------
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties
index 2733d0e..1e847ee 100644
--- a/src/main/jbake/jbake.properties
+++ b/src/main/jbake/jbake.properties
@@ -1,5 +1,5 @@
feed.id=localhost
-site.host=http://sling.apache.org
+site.host=https://sling.apache.org
site.contextPath=/
foundation.version=5.5.1
blog.title=Apache Sling
diff --git a/src/main/jbake/templates/footer.tpl b/src/main/jbake/templates/footer.tpl
index 7db103e..6eebaf5 100644
--- a/src/main/jbake/templates/footer.tpl
+++ b/src/main/jbake/templates/footer.tpl
@@ -1,8 +1,11 @@
+import java.text.SimpleDateFormat
+
p() {
yield "Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project "
yield "logo are trademarks of The Apache Software Foundation. All other marks mentioned "
yield "may be trademarks or registered trademarks of their respective owners."
}
p() {
- yield "Copyright \u00a9 2007-2018 The Apache Software Foundation."
+ String currentYear = new SimpleDateFormat("YYYY").format(new Date())
+ yield "Copyright \u00a9 2007-${currentYear} The Apache Software Foundation."
}
diff --git a/src/main/jbake/templates/logos.tpl b/src/main/jbake/templates/logos.tpl
index e49e9bf..279b92d 100644
--- a/src/main/jbake/templates/logos.tpl
+++ b/src/main/jbake/templates/logos.tpl
@@ -1,11 +1,11 @@
div(class:"title") {
div(class:"logo") {
- a(href:"http://sling.apache.org") {
+ a(href:"https://sling.apache.org") {
img(border:"0", alt:"Apache Sling", src:"${config.site_contextPath}res/logos/sling.svg")
}
}
div(class:"header") {
- a(href:"http://www.apache.org") {
+ a(href:"https://www.apache.org") {
img(border:"0", alt:"Apache", src:"${config.site_contextPath}res/logos/apache.png")
}
}
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index 6092f94..9048e14 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -11,7 +11,7 @@ nav(class:"menu"){
li(){a(href:"${config.site_contextPath}documentation/development.html", "Development")}
li(){a(href:"${config.site_contextPath}documentation/bundles.html", "Bundles")}
li(){a(href:"${config.site_contextPath}documentation/tutorials-how-tos.html", "Tutorials & How-Tos")}
- li(){a(href:"http://sling.apache.org/components/", "Maven Plugins")}
+ li(){a(href:"${config.site_contextPath}components/", "Maven Plugins")}
li(){a(href:"${config.site_contextPath}documentation/configuration.html", "Configuration")}
}
}
@@ -27,8 +27,8 @@ nav(class:"menu"){
li(){
strong("Support")
ul() {
- li(){a(href:"http://s.apache.org/sling.wiki", "Wiki")}
- li(){a(href:"http://s.apache.org/sling.faq", "FAQ")}
+ li(){a(href:"https://s.apache.org/sling.wiki", "Wiki")}
+ li(){a(href:"https://s.apache.org/sling.faq", "FAQ")}
li(){a(href:"${config.site_contextPath}sitemap.html", "Site Map")}
}
}
@@ -36,7 +36,7 @@ nav(class:"menu"){
strong("Project Info")
ul() {
li(){a(href:"${config.site_contextPath}downloads.cgi", "Downloads")}
- li(){a(href:"http://www.apache.org/licenses/", "License")}
+ li(){a(href:"https://www.apache.org/licenses/", "License")}
li(){a(href:"${config.site_contextPath}news.html", "News")}
li(){a(href:"${config.site_contextPath}releases.html", "Releases")}
li(){a(href:"https://issues.apache.org/jira/browse/SLING", "Issue Tracker")}
@@ -56,9 +56,9 @@ nav(class:"menu"){
li(){
strong("Apache Software Foundation")
ul() {
- li(){a(href:"http://www.apache.org/foundation/thanks.html", "Thanks!")}
- li(){a(href:"http://www.apache.org/foundation/sponsorship.html", "Become a Sponsor")}
- li(){a(href:"http://www.apache.org/foundation/buy_stuff.html", "Buy Stuff")}
+ li(){a(href:"https://www.apache.org/foundation/thanks.html", "Thanks!")}
+ li(){a(href:"https://www.apache.org/foundation/sponsorship.html", "Become a Sponsor")}
+ li(){a(href:"https://www.apache.org/foundation/buy_stuff.html", "Buy Stuff")}
li(){a(href:"https://www.apache.org/events/current-event.html") {
img(
border:"0",
@@ -67,7 +67,7 @@ nav(class:"menu"){
width:"125"
)
}}
- li(){a(href:"http://apache.org/foundation/contributing.html") {
+ li(){a(href:"https://apache.org/foundation/contributing.html") {
img(
border:"0",
alt:"Support the Apache Software Foundation!",