From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 27 Sep 2013 14:27:20 +0000 (+0100)
Subject: Improve JSP pages
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=66897889124f42c7b9fec63e29d920cc2c144093;p=jabaws.git

Improve JSP pages
---

diff --git a/statpages/MonthlySummary.jsp b/statpages/MonthlySummary.jsp
index 55af94b..41bfd1d 100644
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -2,7 +2,7 @@
 Author: Peter Troshin
 Date: May 2011
 --%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
diff --git a/statpages/ServicesStatus.jsp b/statpages/ServicesStatus.jsp
index bc1d873..67255a3 100644
--- a/statpages/ServicesStatus.jsp
+++ b/statpages/ServicesStatus.jsp
@@ -17,13 +17,13 @@ TODO refactor
 <div style="margin: 20px ">
 <h2 style="text-align: center;">JABAWS Services Status</h2>
 
-<ul style="font-weight: bold;">
+<c:set var="host" value="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}" />
+
+<ul style="font-weight:bold;">
 	<li>All the services are tested while this page is being loaded</li>
 	<li>If you want to test the services again, just reload this page.</li>
 	<li>Click on the service status to see the results of the testing.</li>
-	<li>Server tested: <a href="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}">
-	${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}
-	</a> </li>
+	<li>Server tested: <a href="${host}">${host}</a> </li>
 	<li>Time of execusion: ${timeexec} msec</li>
 </ul>
 
@@ -48,7 +48,7 @@ TODO refactor
 	</c:if><c:if test="${status.count%2!=0}">
 	<tr class="odd">
 	</c:if>
-		<td width="100px">${res.service}</td>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
 		<td>${res.version}</td>
 		<c:if test="${res.status}">
 			<td><div class="source">
@@ -98,7 +98,7 @@ TODO refactor
 	</c:if><c:if test="${status.count%2!=0}">
 	<tr class="odd">
 	</c:if>
-		<td width="100px">${res.service}</td>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
 		<td>${res.version}</td>
 		<c:if test="${res.status}">
 			<td><div class="source">
@@ -148,7 +148,7 @@ TODO refactor
 	</c:if><c:if test="${status.count%2!=0}">
 	<tr class="odd">
 	</c:if>
-		<td width="100px">${res.service}</td>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
 		<td>${res.version}</td>
 		<c:if test="${res.status}">
 			<td><div class="source">
diff --git a/statpages/StatisticsTable.jsp b/statpages/StatisticsTable.jsp
index e6da204..01e070a 100644
--- a/statpages/StatisticsTable.jsp
+++ b/statpages/StatisticsTable.jsp
@@ -3,7 +3,7 @@ Author: Peter Troshin
 Date: May 2011
 --%>
 
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>