From b03eb7594abac17f1a0d77dde67940f8ab133e11 Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 26 Mar 2009 14:16:11 +0000
Subject: Layout for webapplication adjusted for IE.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@335 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 src/main/webapp/css/pdfas-standalone-styles.css |  7 +++++++
 src/main/webapp/css/pdfas-styles.css            |  1 +
 src/main/webapp/jsp/null_request_page.jsp       |  3 +++
 src/main/webapp/jsp/signupload.jsp              | 18 +++++++++---------
 src/main/webapp/sitemesh/standalone.jsp         | 12 ++++++++++--
 5 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 src/main/webapp/css/pdfas-standalone-styles.css

(limited to 'src/main')

diff --git a/src/main/webapp/css/pdfas-standalone-styles.css b/src/main/webapp/css/pdfas-standalone-styles.css
new file mode 100644
index 0000000..9131c0d
--- /dev/null
+++ b/src/main/webapp/css/pdfas-standalone-styles.css
@@ -0,0 +1,7 @@
+table.pdfassignature td.pdfaslabel {
+	font-size: 0.9em;
+}
+
+table.pdfassignature td.pdfasvalue {
+	font-size: 0.9em;
+}
diff --git a/src/main/webapp/css/pdfas-styles.css b/src/main/webapp/css/pdfas-styles.css
index 9dfed42..a7e1906 100644
--- a/src/main/webapp/css/pdfas-styles.css
+++ b/src/main/webapp/css/pdfas-styles.css
@@ -49,6 +49,7 @@ div.pdfasnote {
 	padding: 10px 0px 0px 0px;
 	margin: 0px 0px 0px 0px;
 	max-width: 700px;
+	text-align: left;
 }
 
 .pdfasemphasis {
diff --git a/src/main/webapp/jsp/null_request_page.jsp b/src/main/webapp/jsp/null_request_page.jsp
index 6d1008a..7f60325 100644
--- a/src/main/webapp/jsp/null_request_page.jsp
+++ b/src/main/webapp/jsp/null_request_page.jsp
@@ -74,6 +74,9 @@
 			<form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post">
 				<input type="hidden" name="XMLRequest"	value="<?xml version='1.0' encoding='UTF-8'?><NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" />
 				<input type="hidden" name="DataURL" value="<%= data_url %>" />
+				<% if (locale != null) { %>
+					<input type="hidden" name="locale" value="<%= locale.toString() %>"/>
+				<% } // end if %>
 				<% if (!isExternalInvocation) { %>
 					<input type="submit" id="SendRequestButton" value="<fmt:message key="nullrequestpage.button.submit"/>" />
 				<% } // end if %>
diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp
index 287afb1..f372ecf 100644
--- a/src/main/webapp/jsp/signupload.jsp
+++ b/src/main/webapp/jsp/signupload.jsp
@@ -92,7 +92,7 @@
 		<fmt:message key="common.title"/>
 	<% } // end if %>		   
 </h1>
-<h2><fmt:message key="signupload.heading2"/></h2>
+<h2 align="left"><fmt:message key="signupload.heading2"/></h2>
 <div class="pdfasnote"><fmt:message key="signupload.selectfilenote"/></div>
 <form name="updateform" id="updateform" method="post" action="<%= request.getContextPath() %>/UpdateForm">
 	<input type="hidden" name="<%= FormFields.FIELD_SIGNATURE_TYPE %>" value=""/>
@@ -106,8 +106,8 @@
       action="<%= request.getContextPath() %>/Sign">
 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">
 		<tr>
-			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturetype"/>:</label></td>
-			<td>
+			<td align="left" nowrap="nowrap"><label><fmt:message key="signupload.signaturetype"/>:</label></td>
+			<td align="left">
 				<select class="field" name="<%= FormFields.FIELD_SIGNATURE_TYPE %>" onchange="return updateForm();">
 					<option value="SIGNATURBLOCK_DE" <%= "SIGNATURBLOCK_DE".equals(type) ? "selected=\"selected\"" : "" %>><fmt:message key="signupload.signaturetype.signaturblock.de"/></option>
 					<option value="SIGNATURBLOCK_EN" <%= "SIGNATURBLOCK_EN".equals(type) ? "selected=\"selected\"" : "" %>><fmt:message key="signupload.signaturetype.signaturblock.en"/></option>
@@ -116,8 +116,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturemode"/>:</label></td>
-			<td>
+			<td align="left" nowrap="nowrap"><label><fmt:message key="signupload.signaturemode"/>:</label></td>
+			<td align="left">
 				<% if (forceTextualForMocca && Constants.SIGNATURE_DEVICE_MOC.equals(device)) {%>
 					<fmt:message key="common.textual"/>
 					<input type="hidden" name="<%= FormFields.FIELD_MODE %>" value="<%= FormFields.VALUE_MODE_TEXTUAL %>"/>
@@ -133,8 +133,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label><fmt:message key="signupload.signaturedevice"/>:</label></td>
-			<td>
+			<td align="left" nowrap="nowrap"><label><fmt:message key="signupload.signaturedevice"/>:</label></td>
+			<td align="left">
 				<select name="<%= FormFields.FIELD_CONNECTOR %>" onchange="return updateForm();">
 					<option value="<%= Constants.SIGNATURE_DEVICE_BKU %>" <%= Constants.SIGNATURE_DEVICE_BKU.equals(device) ? "selected=\"selected\"" : "" %>><fmt:message key="common.bku"/></option>
 					<option value="<%= Constants.SIGNATURE_DEVICE_MOC %>" <%= Constants.SIGNATURE_DEVICE_MOC.equals(device) ? "selected=\"selected\"" : "" %>><fmt:message key="common.mocca"/></option>
@@ -142,8 +142,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td nowrap="nowrap"><label><fmt:message key="signupload.file"/>:</label></td>
-			<td><input size="50" type="file" id="fileupload" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>
+			<td align="left" nowrap="nowrap"><label><fmt:message key="signupload.file"/>:</label></td>
+			<td align="left"><input size="50" type="file" id="fileupload" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>
 		</tr>
 	</table>
 	<div class="pdfasnote"><span class="pdfasemphasis"><fmt:message key="signupload.note.prefix"/>:</span> <fmt:message key="signupload.note"/></div>
diff --git a/src/main/webapp/sitemesh/standalone.jsp b/src/main/webapp/sitemesh/standalone.jsp
index add7185..d4813c2 100644
--- a/src/main/webapp/sitemesh/standalone.jsp
+++ b/src/main/webapp/sitemesh/standalone.jsp
@@ -5,20 +5,28 @@
 <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator"%>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+
 <html>
 
+	<%
+	   boolean testMode = request.getContextPath().startsWith("/test-");
+	%>
+
 	<head>
 		<decorator:head/>
 		<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />
+		<title><fmt:message key="<%= testMode ? "test.common.title" : "common.title" %>"/></title>
+		<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-standalone-styles.css" />
 	</head>
 
 	<body>
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
 			<tr>
 				<td align="center" valign="middle">
-					<table cellpadding="0" cellspacing="0" border="0">
+					<table cellpadding="0" cellspacing="0" border="0" width="700px">
 						<tr>
-							<td><decorator:body/></td>
+							<td align="left"><decorator:body/></td>
 						</tr>
 					</table>
 				</td>
-- 
cgit v1.2.3