From: Fábio Madeira <fmmarquesmadeira@dundee.ac.uk>
Date: Mon, 10 Apr 2017 17:09:55 +0000 (+0100)
Subject: JWS-109 Fixed the links in the navbar header and footer to match the new documentatio... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b4ff3ef8dc5d197f41d83de832e94e3b45a5c12e;p=jabaws.git

JWS-109 Fixed the links in the navbar header and footer to match the new documentation pages.
---

diff --git a/website/template_footer.jsp b/website/template_footer.jsp
index c260cf7..1beb4a0 100644
--- a/website/template_footer.jsp
+++ b/website/template_footer.jsp
@@ -55,31 +55,31 @@
         <div class="col-md-4">
             <ul class="list-unstyled">
                 <li>
-                    <strong><a href="${pageContext.request.contextPath}/man_docs.jsp">Documentation</a></strong>
+                    <strong><a href="${pageContext.request.contextPath}/docs/index.html">Documentation</a></strong>
                     <ul>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_about.jsp">What is JABAWS?</a>
+                            <a href="${pageContext.request.contextPath}/docs/getting_started.html">Getting Started</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_servervm.jsp">Virtual Appliance</a>
+                            <a href="${pageContext.request.contextPath}/docs/included_tools.html">Included Tools</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_serverwar.jsp">Web Application Archive</a>
+                            <a href="${pageContext.request.contextPath}/docs/client.html">Command Line Client (CLI)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_client.jsp">Command Line Client</a>
+                            <a href="${pageContext.request.contextPath}/docs/war.html">Web Application Archive (WAR)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configuring JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/va.html">Virtual Appliance (VA)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_dev.jsp">Accessing JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/advanced.html">Advanced Usage</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Developing JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/develop.html">For Developers</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_stats.jsp">Usage Statistics</a>
+                            <a href="${pageContext.request.contextPath}/docs/changelog.html">Changelog</a>
                         </li>
                     </ul>
                 </li>
@@ -93,7 +93,7 @@
     </div>
     <hr>
     <p class="text-right"><small>
-        Site Last updated: XX March 2017. This site was built using the <a href="http://getbootstrap.com">Bootstrap framework.</a>
+        Site Last updated: XX April 2017. This site was built using the <a href="http://getbootstrap.com">Bootstrap framework.</a>
     </small></p>
 </div>
 
diff --git a/website/template_header.jsp b/website/template_header.jsp
index 395eabd..a447d8f 100644
--- a/website/template_header.jsp
+++ b/website/template_header.jsp
@@ -100,33 +100,37 @@
                 <li class="dropdown">
                     <a href="${pageContext.request.contextPath}/man_about.jsp" class="dropdown-toggle" data-toggle="dropdown">
                         <i class="fa fa-file-text-o" aria-hidden="true"></i> Documentation<b class="caret"></b></a>
+
                     <ul class="dropdown-menu">
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_about.jsp">What is JABAWS?</a>
+                            <a href="${pageContext.request.contextPath}/docs/getting_started.html">Getting Started</a>
                         </li>
-                        <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_servervm.jsp">Virtual Appliance</a>
+                            <a href="${pageContext.request.contextPath}/docs/included_tools.html">Included Tools</a>
+                        </li>
+                        <li class="divider"></li>
+                       <li>
+                            <a href="${pageContext.request.contextPath}/docs/client.html">Command Line Client (CLI)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_serverwar.jsp">Web Application Archive</a>
+                            <a href="${pageContext.request.contextPath}/docs/war.html">Web Application Archive (WAR)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_client.jsp">Command Line Client</a>
+                            <a href="${pageContext.request.contextPath}/docs/va.html">Virtual Appliance (VA)</a>
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configuring JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/advanced.html">Advanced Usage</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_dev.jsp">Accessing JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/develop.html">For Developers</a>
                         </li>
+                        <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Developing JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/changelog.html">Changelog</a>
                         </li>
-                        <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_stats.jsp">Usage Statistics</a>
+                            <a href="${pageContext.request.contextPath}/docs/stats.html">Usage Statistics</a>
                         </li>
                         <li class="divider"></li>
                         <li>