From: Natasha Sherstneva <n.shertneva@gmail.com>
Date: Mon, 20 Jan 2014 11:01:33 +0000 (+0000)
Subject: Merge branch 'DAO' of https://source.jalview.org/git/proteocache into DAO
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0349dbf0d18575d9d35758bc9ced99af202766ce;hp=-c;p=proteocache.git

Merge branch 'DAO' of https://source.jalview.org/git/proteocache into DAO
---

0349dbf0d18575d9d35758bc9ced99af202766ce
diff --combined webapp/view/reports/Job.jsp
index db8f352,4883412..dd0b1dd
--- a/webapp/view/reports/Job.jsp
+++ b/webapp/view/reports/Job.jsp
@@@ -21,8 -21,6 +21,8 @@@
  		<div class="panel-body">
  			<p>Start timestamp : ${result.dateStart}</p>
  			<p>End timestamp : ${result.dateEnd}</p>
 +			<p>Run : ${result.programmeName} server</p>
 +			<p>Version : ${result.version}</p>
  <sec:authorize access="hasRole('ROLE_ADMIN')">
  			<p>IP: <a title="Click to view other jobs" href="${ip_query}?ip=${result.ip}">${result.ip}</a></p>
  </sec:authorize>
@@@ -30,6 -28,9 +30,9 @@@
  				<spring:url value="../${jobarchive}" var="jobarchivefile" />
  				<p>Job archive: <a title="Click to get the file" href="${jobarchivefile}">download</a></p>
  			</c:if>
+ 			<c:if test='${jobremotelink != null}'>
+ 				<p>Original job link: <a title="Click to go to original job" href="${jobremotelink}">view</a></p>
+ 			</c:if>
  			<div class="grid-wrapper-div">
  			<table class="table table-striped table-hover table-bordered">
  			<tbody>