From 04f5e818d61dcdc1792a2f162db14acc28a0779f Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 8 Apr 2010 12:40:14 +0000
Subject: minor updates of the web application, more logging added,
 default-configuration: a-trust ccs support disabled until bugfixes ccs
 version is available, pdf-as configuration: small signature profile added

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@581 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 src/main/webapp/jsp/signupload.jsp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main/webapp')

diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp
index f6c02fe..4df2fe3 100644
--- a/src/main/webapp/jsp/signupload.jsp
+++ b/src/main/webapp/jsp/signupload.jsp
@@ -86,7 +86,7 @@
 		// signature device
 	   String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
 	   if (device == null) {
-	      device = Constants.SIGNATURE_DEVICE_BKU;
+	      device = Constants.SIGNATURE_DEVICE_MOC;
 	      session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY, device);
 	   }
 	   // signature mode
@@ -254,9 +254,15 @@
 			</td>
 		</tr>
 	</table>
+	<% if ((!freeText && (FormFields.VALUE_MODE_TEXTUAL.equals(mode))) || pdfa) { %>
 	<div class="pdfasnote"><span class="pdfasemphasis">
-		<fmt:message key="signupload.note.prefix"/>:</span> <% if (!freeText) { %><fmt:message key="signupload.note.file"/><% } %> <fmt:message key="signupload.note"/> <% if (pdfa) { %><fmt:message key="signupload.note.pdfa"/><% } %>
+		<fmt:message key="signupload.note.prefix"/>:</span>
+		<% if ((FormFields.VALUE_MODE_TEXTUAL.equals(mode))) { %>
+			<% if (!freeText) { %><fmt:message key="signupload.note.file"/><% } %> <fmt:message key="signupload.note"/> 
+		<% } // end if %>
+		<% if (pdfa) { %> <fmt:message key="signupload.note.pdfa"/><% } %>
 	</div>
+	<% } // end if %>
 
 	<input type="hidden" name="<%= FormFields.FIELD_DOWNLOAD %>" value="<%= FormFields.VALUE_DOWNLOAD_ATTACHMENT %>"/>
 	<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
-- 
cgit v1.2.3