Mercurial > hg > ismi-richfaces

changeset 42:72b58ef8b9ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed: PDF Button Signed-off-by: Alistair-Russell <russell.alistair@gmail.com>
author arussell
date Fri, 10 Jul 2015 15:13:04 +0000
parents 464224060150
children 9a623c3f80a9
files src/main/webapp/imageServer/displayDigi.jsp src/main/webapp/public/publicCodex.jsp
diffstat 2 files changed, 10 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/imageServer/displayDigi.jsp	Thu Jul 02 21:26:32 2015 +0000
+++ b/src/main/webapp/imageServer/displayDigi.jsp	Fri Jul 10 15:13:04 2015 +0000
@@ -208,17 +208,11 @@
 <body bgcolor=white>
 
 	<jsp:include page="header.jsp" />
-	<c:if test="${digiBean.getDigiLabel().substring(0,6) == 'Glaser'||
-		digiBean.getDigiLabel().substring(0,6) == 'Landbe'||
-		digiBean.getDigiLabel().substring(0,6) == 'Minuto'||
-		digiBean.getDigiLabel().substring(0,6) == 'Ms_or_'||
-		digiBean.getDigiLabel().substring(0,6) == 'Peterm'||
-		digiBean.getDigiLabel().substring(0,6) == 'Spreng'||
-		digiBean.getDigiLabel().substring(0,6) == 'Wetzst'}">
-		<form method="GET" action='https://images.rasi.mcgill.ca/pdfs/${digiBean.getDigiLabel()}.pdf'>
-			<input type="button" style="font-size: 12; float: right; width: 100px; margin-right: 33px; margin-top: -10px;">Download PDF</input>
-		</form>
-	</c:if>
+
+	<form method="GET" action='https://images.rasi.mcgill.ca/pdfs/${digiBean.getDigiLabel()}.pdf'>
+		<button type="submit" style="font-size: 12; float: right; width: 100px; margin-right: 33px; margin-top: -10px;">Download PDF</button>
+	</form>
+
 	<div class="custom-container">
 
 		<div class="row-fluid">
--- a/src/main/webapp/public/publicCodex.jsp	Thu Jul 02 21:26:32 2015 +0000
+++ b/src/main/webapp/public/publicCodex.jsp	Fri Jul 10 15:13:04 2015 +0000
@@ -237,17 +237,11 @@
 	<div class="magnifiedAttributePanel">
 	</div>
 	 -->
-	<c:if test="${digiBean.getDigiLabel().substring(0,6) == 'Glaser'||
-		digiBean.getDigiLabel().substring(0,6) == 'Landbe'||
-		digiBean.getDigiLabel().substring(0,6) == 'Minuto'||
-		digiBean.getDigiLabel().substring(0,6) == 'Ms_or_'||
-		digiBean.getDigiLabel().substring(0,6) == 'Peterm'||
-		digiBean.getDigiLabel().substring(0,6) == 'Spreng'||
-		digiBean.getDigiLabel().substring(0,6) == 'Wetzst'}">
-		<form method="get" value="<%=codexPage.getDigiLabel()%>" action='https://images.rasi.mcgill.ca/pdfs/${codexPage.getDigiLabel()}.pdf'>
-			<input type="button" style="font-size: 12; float: right; width: 100px; margin-right: 33px; margin-top: -10px;">Download PDF</input>
-		</form>
-	</c:if>
+
+	<form method="GET" action='https://images.rasi.mcgill.ca/pdfs/${codexPage.getDigiLabel()}.pdf'>
+		<button type="submit" style="font-size: 12; float: right; width: 100px; margin-right: 33px; margin-top: -10px;">Download PDF</button>
+	</form>
+
 	<div class="custom-container">