X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webapp%2Fview%2Ffragments%2Flogos.jsp;h=c4c7ea952fe055d98ec309da8b3493161118a93d;hb=6e642e37482f7f84dfb2dc21719f79ca5f8a8826;hp=3f825cbc9330deeeb902ac4334556c7a441c0237;hpb=16fc8d7210b2e7e1141170ab93d50311a2e058ca;p=proteocache.git

diff --git a/webapp/view/fragments/logos.jsp b/webapp/view/fragments/logos.jsp
index 3f825cb..c4c7ea9 100644
--- a/webapp/view/fragments/logos.jsp
+++ b/webapp/view/fragments/logos.jsp
@@ -1,35 +1,25 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-<spring:url value="/images/proteocache.png" var="logo" />
-<spring:url value="/images/uod_logo_transparent.svg" var="university" />
+<spring:url value="/images/proteocache05d.svg" var="logoSVG" />
+<spring:url value="/images/proteocache05d.png" var="logoPNG" />
+<spring:url value="/images/uod_logo_transparent.svg" var="universitySVG" />
 <spring:url value="/images/uod_logo_transparent.png" var="universityPNG" />
+<spring:url value="/images/bg_logo_transparent.svg" var="bartongroupSVG" />
+<spring:url value="/images/bg_logo_transparent.png" var="bartongroupPNG" />
+<script>
+function checkSVG(svg,png,title) {
+	if (Modernizr.svg) {
+		document.write('<img class=\"displayed\" src=\"' + svg + '\" alt=\"'+ title + '\"/>');
+	} else {
+		document.write('<img class=\"displayed\" src=\"' + png + '\" alt=\"'+ title + '\"/>');
+	}
+}
+</script>
 
 <table class="table">
 	<tr>
-		<td>
-		<a href="http://www.dundee.ac.uk">
-		<script>
-			document.write("<img class=\"displayed\" ");
-			if (Modernizr.svg) {
-				document.write("src=\"${university}\"");
-			} else {
-				document.write("src=\"${universityPNG}\"");
-			}
-			document.write(" alt=\"University of Dundee\"/>");
-		</script>
-		</a>
-		</td>
-		<td><img class="displayed" src="${logo}" alt="ProteoCache 0.5" title="ProteoCache framework, version 0.5"/></td>
-		<td>
-		<script>
-			document.write("<img class=\"displayed\" ");
-			if (Modernizr.svg) {
-				document.write("src=\"${university}\"");
-			} else {
-				document.write("src=\"${universityPNG}\"");
-			}
-			document.write(" alt=\"University of Dundee\"/>");
-		</script>
-		</td>
+		<td><a href="http://www.compbio.dundee.ac.uk/"><script>checkSVG('${bartongroupSVG}', '${bartongroupPNG}', 'Barton Group Logo');</script></a></td>
+		<td><script>checkSVG('${logoSVG}', '${logoPNG}', 'ProteoCache Logo');</script>	</td>
+		<td><a href="http://www.dundee.ac.uk"><script>checkSVG('${universitySVG}', '${universityPNG}', 'University of Dundee Logo');</script></a></td>
 	</tr>
 </table>