JWS-109 & JWS-116 Regenerated the JABAWS JavaDoc (with eclipse java 8) and moved...

[jabaws.git] / website / template_header.jsp

diff --git a/website/template_header.jsp b/website/template_header.jsp
index 4276f36..ba9f2b1 100644 (file)
--- a/website/template_header.jsp
+++ b/website/template_header.jsp
@@ -42,7 +42,6 @@
     <link href="${pageContext.request.contextPath}/static/css/font-awesome.min.css" rel="stylesheet">
     <%--&lt;%&ndash;<!-- Barton Group specific CSS -->&ndash;%&gt;--%>
     <link href="${pageContext.request.contextPath}/static/css/main.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/static/css/table.css" rel="stylesheet">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/default.min.css">
     ${param.html_custom_css}
     ${param.html_custom_js}
@@ -56,14 +55,15 @@
 <!-- BG header part -->
 <div class="container" id="mainpage">
     <div class="row">
-        <div class="col-md-2 col-xs-2 text-right">
+        <div class="col-md-1 col-xs-1 text-left"></div>
+        <div class="col-md-2 col-xs-2 text-left">
             <a href="http://www.compbio.dundee.ac.uk/"><img src="${pageContext.request.contextPath}/static/img/BG_with_text.svg" style="width:80%;height:80%" alt="Barton Group Logo"></a>
         </div>
         <div class="col-md-2 col-xs-2 text-left">
             <a href="http://www.dundee.ac.uk"><img src="${pageContext.request.contextPath}/static/img/University_white_logo.svg" style="width:90%;height:90%" alt="University of Dundee Logo"></a>
         </div>
-        <div class="col-md-7 col-xs-7 text-left">
-            <a href="/"><img src="${pageContext.request.contextPath}/static/img/jabaws2.2.svg" style="width:90%;height:90%" alt="Barton Group Banner"></a>
+        <div class="col-md-6 col-xs-6 text-left">
+            <a href="${pageContext.request.contextPath}/"><img src="${pageContext.request.contextPath}/static/img/jabaws2.2.svg" style="width:100%;height:100%" alt="Barton Group Banner"></a>
         </div>
         <div class="col-md-1 col-xs-1 text-left"></div>
         <!--<div class="col-md-1 col-xs-1 text-left"></div>-->
@@ -100,33 +100,44 @@
                 <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/v_2_2_0/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/v_2_2_0/included_tools.html">Included Tools</a>
+                        </li>
+                        <li class="divider"></li>
+                       <li>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/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/v_2_2_0/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/v_2_2_0/va.html">Virtual Appliance (VA)</a>
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configure JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/advanced.html">Advanced Usage</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_dev.jsp">Accessing JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/develop.html">For Developers</a>
+                        </li>
+                        <li class="divider"></li>
+                        <li>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/changelog.html">Changelog</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Develop JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/stats.html">Usage Statistics</a>
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_stats.jsp">Usage Statistics</a>
+                            <a href="${pageContext.request.contextPath}/docs/full_javadoc/">Complete JavaDoc</a>
+                        </li>
+                        <li>
+                            <a href="${pageContext.request.contextPath}/docs/dm_javadoc/">Data Model JavaDoc</a>
                         </li>
                     </ul>
                 </li>