sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject [38/50] [abbrv] sling-site git commit: Fix footer
Date Mon, 19 Jun 2017 12:31:22 GMT
Fix footer


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/06cb7843
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/06cb7843
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/06cb7843

Branch: refs/heads/master
Commit: 06cb78431503a96ace03f5f2052e875684208572
Parents: 152a4b4
Author: Bertrand Delacretaz <bdelacretaz@apache.org>
Authored: Wed Jun 14 12:29:33 2017 -0400
Committer: Bertrand Delacretaz <bdelacretaz@apache.org>
Committed: Wed Jun 14 12:29:33 2017 -0400

----------------------------------------------------------------------
 templates/footer.tpl      | 11 +++++++++--
 templates/layout/main.tpl | 14 ++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sling-site/blob/06cb7843/templates/footer.tpl
----------------------------------------------------------------------
diff --git a/templates/footer.tpl b/templates/footer.tpl
index de4d240..d7e9200 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,3 +1,10 @@
-div(class:"footer"){
-	yield "TODO Sling footer here"
+div(class:"footer") {
+	div(class:"timestamp") {
+		yield "TODO display revision number here"
+	}
+	div(class:"trademarkFooter") {
+		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."
+	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sling-site/blob/06cb7843/templates/layout/main.tpl
----------------------------------------------------------------------
diff --git a/templates/layout/main.tpl b/templates/layout/main.tpl
index 62bab68..677b783 100644
--- a/templates/layout/main.tpl
+++ b/templates/layout/main.tpl
@@ -9,15 +9,13 @@ html(lang:'en'){
 
         include template: 'menu.tpl'
 
-        main {
-			div(class:"main") {
-				bodyContents()
-			}
-        }
+		div(class:"main") {
+			bodyContents()
 
-        newLine()
-        include template: 'footer.tpl'
-        newLine()
+			newLine()
+			include template: 'footer.tpl'
+			newLine()
+        }
     }
 }
 newLine()


Mime
View raw message