TAMAYA-178: Add header elements.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/46d4b44f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/46d4b44f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/46d4b44f Branch: refs/heads/master Commit: 46d4b44f1bed06e8466c114e276a3c8a86c6b261 Parents: 8834f54 Author: Phil Ottlinger <pottlin...@apache.org> Authored: Tue Oct 4 20:13:41 2016 +0200 Committer: Phil Ottlinger <pottlin...@apache.org> Committed: Tue Oct 4 20:13:41 2016 +0200 ---------------------------------------------------------------------- jbake.properties | 4 ++-- templates/archive.thyme | 8 ++++---- templates/feed.thyme | 6 +++--- templates/header.thyme | 12 ++++++------ templates/index.thyme | 12 ++++++------ templates/page.thyme | 12 ++++++------ templates/post.thyme | 14 +++++++------- templates/tags.thyme | 10 +++++----- 8 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/jbake.properties ---------------------------------------------------------------------- diff --git a/jbake.properties b/jbake.properties index b4892c5..d6dc217 100644 --- a/jbake.properties +++ b/jbake.properties @@ -1,4 +1,4 @@ -site.host=http://jbake.org +site.host=https://tamaya.incubator.apache.org/ render.tags=false render.sitemap=true template.index.file=index.thyme @@ -7,4 +7,4 @@ template.tag.file=tags.thyme template.sitemap.file=sitemap.thyme template.post.file=post.thyme template.page.file=page.thyme -template.feed.file=feed.thyme \ No newline at end of file +template.feed.file=feed.thyme http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/archive.thyme ---------------------------------------------------------------------- diff --git a/templates/archive.thyme b/templates/archive.thyme index 531c623..dd740b9 100644 --- a/templates/archive.thyme +++ b/templates/archive.thyme @@ -9,17 +9,17 @@ <div class="page-header"> <h1>Blog Archive</h1> </div> - + <div th:each="post : ${posts}" th:with='last_month=null' th:remove='tag'> <h3 th:if='${last_month!=#dates.format(post.date,"MMMM yyyy")}' th:text='${#dates.format(post.date,"MMMM yyyy")}'>June 2014</h3> - + <h4><span th:text='${#dates.format(post.date,"dd")}' th:remove='tag'/> - <a th:href="${content.rootpath+post.uri}" th:text='${post.title}' href="foo.html">Post title</a></h4> <span th:remove='all' th:with='last_month = ${#dates.format(post.date,"MMMM yyyy")}'/> </div> </div> </div> - + <div th:replace="footer.thyme::footer"></div> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/feed.thyme ---------------------------------------------------------------------- diff --git a/templates/feed.thyme b/templates/feed.thyme index 56dffd3..0b12abb 100644 --- a/templates/feed.thyme +++ b/templates/feed.thyme @@ -1,7 +1,7 @@ <?xml version="1.0"?> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"; xmlns:th="http://www.thymeleaf.org";> <channel> - <title>JBake</title> + <title>Apache Incubator Tamaya</title> <link th:text='${config.site_host}'>link</link> <atom:link th:href='${config.site_host+"/feed.xml"}' href="link" rel="self" type="application/rss+xml" /> <description>JBake Bootstrap Template</description> @@ -14,8 +14,8 @@ <link th:text='${config.site_host+"/"+post.uri}'>link</link> <pubDate th:text='${#dates.format(post.date,"EEE, d MMM yyyy HH:mm:ss Z")}'>pubdate</pubDate> <guid th:text='${post.uri}' isPermaLink="false">guid</guid> - <description th:text='${#strings.escapeXml(post.body)}'>description</description> + <description th:text='${#strings.escapeXml(post.body)}'>description</description> </item> - </channel> + </channel> </rss> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/header.thyme ---------------------------------------------------------------------- diff --git a/templates/header.thyme b/templates/header.thyme index 9f09dc4..4b6c10c 100644 --- a/templates/header.thyme +++ b/templates/header.thyme @@ -2,24 +2,24 @@ <html lang="en"> <head th:fragment="head"> <meta charset="utf-8"/> - <title th:with="title=(${content.title != null} ? ${content.title} : 'JBake')" th:text="${title}"></title> + <title th:with="title=(${content.title != null} ? ${content.title} : 'Tamaya Incubator')" th:text="${title}"></title> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="description" content=""/> <meta name="author" content=""/> <meta name="keywords" content=""/> - <meta name="generator" content="JBake"/> - + <meta name="generator" content="JBake ${version}"/> + <!-- Le styles --> <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'css/bootstrap.min.css'" rel="stylesheet"/> <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'css/asciidoctor.css'" rel="stylesheet"/> <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'css/base.css'" rel="stylesheet"/> <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'css/prettify.css'" rel="stylesheet"/> - + <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> <script th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:src="${rootpath}+'js/html5shiv.min.js'"></script> <![endif]--> - + <!-- Fav and touch icons --> <!--<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"/> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"/> @@ -27,4 +27,4 @@ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png"/>--> <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" rel="shortcut icon" th:href="${rootpath}+'favicon.ico'"/> </head> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/index.thyme ---------------------------------------------------------------------- diff --git a/templates/index.thyme b/templates/index.thyme index c7892ef..f1d0609 100644 --- a/templates/index.thyme +++ b/templates/index.thyme @@ -9,19 +9,19 @@ <div class="page-header"> <h1>Blog</h1> </div> - + <div th:each="post : ${published_posts}"> <a th:href='${post.uri}' href='href'><h1 th:text='${post.title}'>title</h1></a> - <p th:text='${#dates.format(post.date,"dd MMMM yyyy")}'>date</p> + <p th:text='${#dates.format(post.date,"yyyy-MM-dd")}'>date</p> <p th:utext='${post.body}'>body</p> </div> - + <hr /> - + <p>Older posts are available in the <a th:href='${content.rootpath+config.archive_file}' href='href'>archive</a>.</p> </div> </div> - + <div th:replace="footer.thyme::footer"></div> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/page.thyme ---------------------------------------------------------------------- diff --git a/templates/page.thyme b/templates/page.thyme index 7e24f0f..9752ff2 100644 --- a/templates/page.thyme +++ b/templates/page.thyme @@ -6,18 +6,18 @@ <div id="wrap"> <div th:replace="menu.thyme::menu"/> <div class="container"> - + <div class="page-header"> <h1 th:text='${content.title}'>title</h1> </div> - - <p><em th:text='${#dates.format(content.date,"dd MMMM yyyy")}'>date</em></p> - + + <p><em th:text='${#dates.format(content.date,"yyyy-MM-dd")}'>date</em></p> + <p th:utext='${content.body}'>body</p> - + <hr /> </div> </div> <div th:replace="footer.thyme::footer"></div> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/post.thyme ---------------------------------------------------------------------- diff --git a/templates/post.thyme b/templates/post.thyme index 1ddd882..986aa11 100644 --- a/templates/post.thyme +++ b/templates/post.thyme @@ -6,19 +6,19 @@ <div id="wrap"> <div th:replace="menu.thyme::menu"/> <div class="container"> - + <div class="page-header"> <h1 th:text='${content.title}'>title</h1> </div> - - <p><em th:text='${#dates.format(content.date,"dd MMMM yyyy")}'>date</em></p> - + + <p><em th:text='${#dates.format(content.date,"yyyy-MM-dd")}'>date</em></p> + <p th:utext='${content.body}'>body</p> - + <hr /> - + </div> </div> <div th:replace="footer.thyme::footer"></div> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/46d4b44f/templates/tags.thyme ---------------------------------------------------------------------- diff --git a/templates/tags.thyme b/templates/tags.thyme index 1bdb740..d438758 100644 --- a/templates/tags.thyme +++ b/templates/tags.thyme @@ -6,20 +6,20 @@ <div id="wrap"> <div th:replace="menu.thyme::menu"/> <div class="container"> - + <div class="page-header"> <h1 th:text="'Tag: '+${tag}">tag</h1> </div> - + <div th:each="post : ${tag_posts}" th:with='last_month=null' th:remove='tag'> <h3 th:if='${last_month!=#dates.format(post.date,"MMMM yyyy")}' th:text='${#dates.format(post.date,"MMMM yyyy")}'>June 2014</h3> - + <h4><span th:text='${#dates.format(post.date,"dd")}' th:remove='tag'/> - <a th:href="${content.rootpath+post.uri}" th:text='${post.title}' href="foo.html">Post title</a></h4> <span th:remove='all' th:with='last_month = ${#dates.format(post.date,"MMMM yyyy")}'/> </div> </div> </div> - + <div th:replace="footer.thyme::footer"></div> </body> -</html> \ No newline at end of file +</html>
