Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@tamaya.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: pottlinger@apache.org
To: commits@tamaya.incubator.apache.org
Date: Mon, 24 Oct 2016 20:23:08 -0000
Message-Id: <9034df0ba105486386e7de3f5a45eef4@git.apache.org>
In-Reply-To: <8d441264221e4b1785d36cc5c9974697@git.apache.org>
References: <8d441264221e4b1785d36cc5c9974697@git.apache.org>
Subject: [2/2] incubator-tamaya-site git commit: TAMAYA-178: Add menu bar.
archived-at: Mon, 24 Oct 2016 20:23:12 -0000

TAMAYA-178: Add menu bar.


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/2ceff37f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/2ceff37f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/2ceff37f

Branch: refs/heads/master
Commit: 2ceff37fdcaafb838b49a22b48a28a9a49e05f4a
Parents: 8b0f3aa
Author: Phil Ottlinger <pottlinger@apache.org>
Authored: Mon Oct 24 22:16:15 2016 +0200
Committer: Phil Ottlinger <pottlinger@apache.org>
Committed: Mon Oct 24 22:16:15 2016 +0200

----------------------------------------------------------------------
 templates/menu.thyme | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/2ceff37f/templates/menu.thyme
----------------------------------------------------------------------
diff --git a/templates/menu.thyme b/templates/menu.thyme
index 91adaed..c4191c1 100644
--- a/templates/menu.thyme
+++ b/templates/menu.thyme
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 	<body>
 	<div th:fragment="menu">
-	
+
 	  <!-- Fixed navbar -->
       <div class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
@@ -14,14 +14,19 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}">JBake</a>
+          <a class="navbar-brand" th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}">Apache Tamaya (incubating)</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'index.html'">Home</a></li>
+						<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'index.html'">Home</a></li>
+						<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'index.html'">Documentation</a></li>
+						<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'/apidocs/index.html'">API</a></li>
+						<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'index.html'">Development</a></li>
+						<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'index.html'">Releases</a></li>
             <li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'about.html'">About</a></li>
             <li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+${config.feed_file}">Subscribe</a></li>
-            <li class="dropdown">
+<!--
+						<li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
               <ul class="dropdown-menu">
                 <li><a href="#">Action</a></li>
@@ -33,6 +38,7 @@
                 <li><a href="#">One more separated link</a></li>
               </ul>
             </li>
+-->						
           </ul>
         </div><!--/.nav-collapse -->
       </div>
@@ -40,4 +46,4 @@
 
 	</div>
   	</body>
-</html>
\ No newline at end of file
+</html>