From a2554b8ee14069994e5dda3db8ee81520528a53e Mon Sep 17 00:00:00 2001
From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 26 May 2011 17:15:41 +0000
Subject: [PATCH] Further work on statistics display

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4177 e3abac25-378b-4346-85de-24260fe3988d
---
 statpages/MonthlySummary.jsp  |   14 +++++++-------
 statpages/Statistics.jsp      |    3 ---
 statpages/StatisticsTable.jsp |   18 +++++++++---------
 statpages/displaytag.css      |   10 +++++-----
 statpages/footer.jsp          |    2 +-
 statpages/header.jsp          |    3 +--
 statpages/screen.css          |   13 +++++++++++++
 7 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/statpages/MonthlySummary.jsp b/statpages/MonthlySummary.jsp
index 6c08d4d..78f2fe2 100644
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -9,18 +9,18 @@ Date: May 2011
 
 <jsp:include page="header.jsp" />
 
-<h2>Web Services Usage Statistics</h2>
-<table class="its"> 
+<h1>JABAWS Usage Statistics</h1>
+<table class="center its" style="width: 600px "> 
 <thead>
 <tr>
 <th rowspan="2">Month</th>
 <th colspan="4" style="text-align: center">Number of Jobs</th>
 </tr>
 <tr>
-<th>Total</th>
-<th>Incomplete</th>
-<th>Cancelled</th>
-<th>Abandoned</th>
+<th title="Total number of jobs received">Total</th>
+<th title="The number of jobs with no result">Incomplete</th>
+<th title="The number of cancelled jobs">Cancelled</th>
+<th title="The number of jobs started but not collected by the user">Abandoned</th>
 </tr>
 </thead>
 <tbody>
@@ -35,7 +35,7 @@ Date: May 2011
 	</c:otherwise>
 </c:choose>
 
-<td><a href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>
+<td><a title="Click to view the detailed statistics for the period" href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>
 <td>${monthTotal.value.total}</td>
 <td>${monthTotal.value.incomplete}</td>
 <td>${monthTotal.value.cancelled}</td>
diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index 65575a6..fc11f39 100644
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -12,7 +12,6 @@ Date: May 2011
     
 <h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>
 <h2>All jobs</h2>
-
 <c:set var="statistics"  value="${stat.allStat}" scope="request"/>
 <c:set var="totals" value="${statTotal}" scope="request"/>
 <c:import url="StatisticsTable.jsp"/> 
@@ -22,11 +21,9 @@ Date: May 2011
 <c:set var="totals" value="${statTotalLocal}" scope="request"/>
 <c:import url="StatisticsTable.jsp"/>
 	
- 
 <h2>Cluster jobs</h2>
 <c:set var="statistics"  value="${stat.clusterStat}" scope="request"/>
 <c:set var="totals" value="${statTotalCluster}" scope="request"/>
 <c:import url="StatisticsTable.jsp"/>
 
-
 <jsp:include page="footer.jsp" />
diff --git a/statpages/StatisticsTable.jsp b/statpages/StatisticsTable.jsp
index d744abe..2d847ee 100644
--- a/statpages/StatisticsTable.jsp
+++ b/statpages/StatisticsTable.jsp
@@ -9,17 +9,17 @@ Date: May 2011
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
 
     
-<table class="its" style="border-collapse: separate;"> 
+<table class="its" style="width:600px "> 
 <thead>
 <tr>
 <th rowspan="2">Web Service</th>
 <th colspan="4" style="text-align: center">Number of Jobs</th>
 </tr>
 <tr>
-<th>Total</th>
-<th>Incomplete</th>
-<th>Cancelled</th>
-<th>Abandoned</th>
+<th title="Total number of jobs received">Total</th>
+<th title="The number of jobs with no result">Incomplete</th>
+<th title="The number of cancelled jobs">Cancelled</th>
+<th title="The number of jobs started but not collected by the user">Abandoned</th>
 </tr>
 </thead>
 <tbody>
@@ -36,10 +36,10 @@ Date: May 2011
 </c:choose>
 
 <td>${ws.key}</td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate.time}&to=${stopDate.time}">${ws.value.jobNumber}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.incompleteJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.cancelledJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.abandonedJobs)}</a></td>
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate.time}&to=${stopDate.time}">${ws.value.jobNumber}</a></td>
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.incompleteJobs)}</a></td>
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.cancelledJobs)}</a></td>
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.abandonedJobs)}</a></td>
 </tr>
 </c:forEach>
 
diff --git a/statpages/displaytag.css b/statpages/displaytag.css
index d1a75c0..77a5d13 100644
--- a/statpages/displaytag.css
+++ b/statpages/displaytag.css
@@ -1,7 +1,7 @@
 table {
 	border: 1px solid #666;
-	width: 80%;
-	margin: 20px 0 20px 0 !important;
+	width: 100%;
+	margin: 10px 0 10px 0 !important;
 }
 
 th,td {
@@ -58,7 +58,7 @@ div.exportlinks {
 	border: 1px dotted #999;
 	padding: 2px 4px 2px 4px;
 	margin: 2px 0 10px 0;
-	width: 79%;
+	width: 99%;
 }
 
 span.export {
@@ -92,7 +92,7 @@ span.pagebanner {
 	background-color: #eee;
 	border: 1px dotted #999;
 	padding: 2px 4px 2px 4px;
-	width: 79%;
+	width: 99%;
 	margin-top: 10px;
 	display: block;
 	border-bottom: none;
@@ -102,7 +102,7 @@ span.pagelinks {
 	background-color: #eee;
 	border: 1px dotted #999;
 	padding: 2px 4px 2px 4px;
-	width: 79%;
+	width: 99%;
 	display: block;
 	border-top: none;
 	margin-bottom: -5px;
diff --git a/statpages/footer.jsp b/statpages/footer.jsp
index 5a464b6..9943ff0 100644
--- a/statpages/footer.jsp
+++ b/statpages/footer.jsp
@@ -1,3 +1,3 @@
-</div> <!-- wrapper end -->
+</div>
 </body>
 </html>
diff --git a/statpages/header.jsp b/statpages/header.jsp
index 1e54eaa..a80bd08 100644
--- a/statpages/header.jsp
+++ b/statpages/header.jsp
@@ -11,5 +11,4 @@
 
 </head>
 <body>
-<div id="statwrapper">
-
+<div id="mainpage">
\ No newline at end of file
diff --git a/statpages/screen.css b/statpages/screen.css
index 9f4c984..acf7562 100644
--- a/statpages/screen.css
+++ b/statpages/screen.css
@@ -3,6 +3,19 @@
 @import url("alternative.css");
 
 
+#mainpage {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.center { 
+	margin: 0 auto;
+}
+
+h2 {
+	font-size: 1.5em; line-height: 1em; margin-bottom: -0.3em;
+	}
+	
 body,input,select,td,textarea {
 	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
 	font-size: 11px;
-- 
1.7.10.2