JWS-109 Updated the base bootstrap theme header and footer. Also removed unused styling.

diff --git a/website/static/css/main.css b/website/static/css/main.css
index 80c1a34..56cbb9e 100644 (file)
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -37,55 +37,8 @@ margin: 2%
 
 .vspace { height: 60px;}
 
-
-/**
-*** BibBase reference-specific additions
-**/
-img.bibbase_icon {
-  display: none;
-}
-
-/* remove linkout to bibbase, but make it bold */
-.bibbase_paper_title a {
-  color: #333;
-  text-decoration: none;
-  pointer-events: none;
-  cursor: default;
-  font-weight: bold;
-}
-
-/* remove bibbase link to authors with bibbase accounts */
-a.bibbase.author.link {
-  color: #333;
-  text-decoration: none;
-  pointer-events: none;
-  cursor: default;
-}
-
-/* reformat refs borked by bootstrap css */
-.bibbase_group_body {
-  padding-left: 15px;
-}
-
-/* put links on same line as citation */
-br.bibbase_paper_content {
-  display: none;
-}
-
-/* resize link text */
-.bibbase_paper_content {
-  font-size: smaller;
-}
-
-/* space out separate refs */
-.bibbase_paper {
-  margin-bottom: 5px;
-}
-
-/* force display of year ref counts */
-.bibbase_group_count {
-  display: initial;
-  font-weight: normal;
+.panel-default .panel-body{
+  margin-top: -20px;
 }
 
 em2 {
@@ -94,3 +47,12 @@ em2 {
   font-size: 14px;
 }
 
+.navbar .navbar-nav {
+    display: inline-block;
+    float: none;
+    vertical-align: top;
+}
+
+.navbar .navbar-collapse {
+    text-align: center;
+}

diff --git a/website/template_footer.jsp b/website/template_footer.jsp
index 05054ee..c260cf7 100644 (file)
--- a/website/template_footer.jsp
+++ b/website/template_footer.jsp
@@ -70,13 +70,13 @@
                             <a href="${pageContext.request.contextPath}/man_client.jsp">Command Line Client</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configure JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configuring JABAWS</a>
                         </li>
                         <li>
                             <a href="${pageContext.request.contextPath}/man_dev.jsp">Accessing JABAWS</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Develop JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Developing JABAWS</a>
                         </li>
                         <li>
                             <a href="${pageContext.request.contextPath}/man_stats.jsp">Usage Statistics</a>
@@ -93,7 +93,7 @@
     </div>
     <hr>
     <p class="text-right"><small>
-        Site Last updated: XX February 2017. This site was built using the <a href="http://getbootstrap.com">Bootstrap framework.</a>
+        Site Last updated: XX March 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 4276f36..395eabd 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>-->
@@ -116,18 +116,25 @@
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configure JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/man_configuration.jsp">Configuring JABAWS</a>
                         </li>
                         <li>
                             <a href="${pageContext.request.contextPath}/man_dev.jsp">Accessing JABAWS</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Develop JABAWS</a>
+                            <a href="${pageContext.request.contextPath}/man_server_dev.jsp">Developing JABAWS</a>
                         </li>
                         <li class="divider"></li>
                         <li>
                             <a href="${pageContext.request.contextPath}/man_stats.jsp">Usage Statistics</a>
                         </li>
+                        <li class="divider"></li>
+                        <li>
+                            <a href="${pageContext.request.contextPath}/full_javadoc/">Complete JavaDoc</a>
+                        </li>
+                        <li>
+                            <a href="${pageContext.request.contextPath}/dm_javadoc/">Data Model JavaDoc</a>
+                        </li>
                     </ul>
                 </li>
                 <li>