diff options
| author | tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c> | 2009-01-14 11:39:31 +0000 |
|---|---|---|
| committer | tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c> | 2009-01-14 11:39:31 +0000 |
| commit | 95f6c6fe321d33dc8fa9e18c7d96bd9b21ef10cc (patch) | |
| tree | 98faaac7ffd2a5f11130c1412a6d2b96fa45f09d /src/main/webapp | |
| parent | 392c2cd13d0fcd24bce22987f454e529637307fc (diff) | |
| download | pdf-as-3-95f6c6fe321d33dc8fa9e18c7d96bd9b21ef10cc.tar.gz pdf-as-3-95f6c6fe321d33dc8fa9e18c7d96bd9b21ef10cc.tar.bz2 pdf-as-3-95f6c6fe321d33dc8fa9e18c7d96bd9b21ef10cc.zip | |
Switching to itext-2.1.5-rev3628.
itext library: minor adjustments for pdf-as
Adding new error code (103) for invalid pdfa/1b font configuration.
Minor updates for PDF/A support.
Support for local MOCCA CCS added.
Multi language for web application.
Encoding issue for web application fixed by implementing an EncodingFilter.
Dynamic sign upload form implemented.
Order of input fields for dynamic upload form changed.
MOCCA logo added to sign upload form.
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@319 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
Diffstat (limited to 'src/main/webapp')
28 files changed, 1058 insertions, 190 deletions
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index b27ca81..a0de89e 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<Context path="/pdf-as" cookies="false" reloadable="false">
+<Context path="/pdf-as" cookies="true" reloadable="false">
<Manager pathname="" />
<!-- Use system property "pdf-as.work-dir" or web.xml parameter "work-dir" instead. -->
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 64ee415..a88892d 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -2,13 +2,14 @@ <excludes>
<pattern>/bku-erkennung/*</pattern>
+ <pattern>/jsp/please_wait.jsp</pattern>
<pattern>/css/*</pattern>
<pattern>/img/*</pattern>
<pattern>*.pdf</pattern>
<pattern>/*.pdf</pattern>
</excludes>
- <decorator name="admin" page="/sitemesh/standalone.jsp">
+ <decorator name="standalone" page="/sitemesh/standalone.jsp">
<pattern>/*</pattern>
</decorator>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 3b97dab..ce82e9a 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -27,11 +27,43 @@ </context-param>
<filter>
+ <filter-name>encodingFilter</filter-name>
+ <filter-class>at.gv.egiz.pdfas.web.filter.EncodingFilter</filter-class>
+ <init-param>
+ <param-name>encoding</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ <init-param>
+ <param-name>setRequestEncoding</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>forceRequestEncoding</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+
+ <filter>
+ <filter-name>localeparam</filter-name>
+ <filter-class>at.gv.egiz.pdfas.web.i18n.LocaleParamFilter</filter-class>
+ </filter>
+
+ <filter>
<filter-name>sitemesh</filter-name>
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
</filter>
<filter-mapping>
+ <filter-name>encodingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>localeparam</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>sitemesh</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
@@ -86,8 +118,8 @@ </servlet>
<servlet>
- <servlet-name>SetLanguage</servlet-name>
- <servlet-class>at.gv.egiz.pdfas.web.i18n.SetLanguageServlet</servlet-class>
+ <servlet-name>UpdateForm</servlet-name>
+ <servlet-class>at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -136,8 +168,8 @@ </servlet-mapping>
<servlet-mapping>
- <servlet-name>SetLanguage</servlet-name>
- <url-pattern>/SetLanguage</url-pattern>
+ <servlet-name>UpdateForm</servlet-name>
+ <url-pattern>/UpdateForm</url-pattern>
</servlet-mapping>
<session-config>
diff --git a/src/main/webapp/images/button-search.jpg b/src/main/webapp/images/button-search.jpg Binary files differnew file mode 100644 index 0000000..3a17347 --- /dev/null +++ b/src/main/webapp/images/button-search.jpg diff --git a/src/main/webapp/images/chiperling.jpg b/src/main/webapp/images/chiperling.jpg Binary files differnew file mode 100644 index 0000000..fcb633a --- /dev/null +++ b/src/main/webapp/images/chiperling.jpg diff --git a/src/main/webapp/images/menu-divider.jpg b/src/main/webapp/images/menu-divider.jpg Binary files differnew file mode 100644 index 0000000..53272d7 --- /dev/null +++ b/src/main/webapp/images/menu-divider.jpg diff --git a/src/main/webapp/images/signatur-logo_en-100.png b/src/main/webapp/images/signatur-logo_en-100.png Binary files differnew file mode 100644 index 0000000..0d84ca7 --- /dev/null +++ b/src/main/webapp/images/signatur-logo_en-100.png diff --git a/src/main/webapp/images/signatur-logo_en.png b/src/main/webapp/images/signatur-logo_en.png Binary files differnew file mode 100644 index 0000000..505e6a5 --- /dev/null +++ b/src/main/webapp/images/signatur-logo_en.png diff --git a/src/main/webapp/jsp/SIGNATURBLOCK.jsp b/src/main/webapp/jsp/SIGNATURBLOCK.jsp new file mode 100644 index 0000000..dc21f9a --- /dev/null +++ b/src/main/webapp/jsp/SIGNATURBLOCK.jsp @@ -0,0 +1,110 @@ +<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
+
+<%@ page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
+
+<%@ include file="language.jsp" %>
+
+ <%
+ String mode = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY);
+ String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+ String type = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY);
+
+ String sbValue;
+ String sbLabel;
+ String sbMeta;
+ String sbName;
+ String sbDate;
+ String sbIssuer;
+ String sbNumber;
+ String sbKZ;
+ String sbID;
+ String sbMetaValue;
+ if ("SIGNATURBLOCK_DE".equals(type)) {
+ sbValue = "Signaturwert";
+ sbLabel = "signatur-logo_de-100.png";
+ sbMetaValue = "Informationen zur Prüfung der elektronischen Signatur und des Ausdrucks finden Sie unter: <input type=\"text\" name=\"vservice\" readonly=\"readonly\" disabled=\"disabled\" value=\"https://www.buergerkarte.at/signature-verification\" size=\"50\" maxlength=\"255\"/>";
+ sbName = "Unterzeichner";
+ sbDate = "Datum/Zeit-UTC";
+ sbIssuer = "Aussteller-Zertifikat";
+ sbNumber = "Serien-Nr.";
+ sbKZ = "Methode";
+ sbID = "Parameter";
+ sbMeta = "Prüfinformation";
+ } else {
+ sbValue = "Signature Value";
+ sbLabel = "signatur-logo_en-100.png";
+ sbMetaValue = "Information about the verification of the electronic signature and of the printout can be found at: <input type=\"text\" name=\"vservice\" readonly=\"readonly\" disabled=\"disabled\" value=\"https://www.buergerkarte.at/signature-verification\" size=\"50\" maxlength=\"255\"/>";
+ sbName = "Signatory";
+ sbDate = "Date/Time-UTC";
+ sbIssuer = "Issuer-Certificate";
+ sbNumber = "Serial-No.";
+ sbKZ = "Method";
+ sbID = "Parameter";
+ sbMeta = "Verification";
+ }
+
+ %>
+
+<html>
+
+<table border="0" cellpadding="3" cellspacing="0" class="pdfassignature">
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbValue %></td>
+ <td colspan="2" class="pdfasvalue">
+ <div style="float:left;">Aqs3vMeF81wm/UJjIcLOzUs9</div>
+ <div style="float:left;">dxTBzhi2RC8avQyMAmc3v</div>
+ <div style="float:left;">WEj9HT1DI3iish4smRr</div>
+ </td>
+ </tr>
+ <tr>
+ <td rowspan="6"><img src="<%= request.getContextPath() %>/images/<%= sbLabel %>" width="100" alt="Signatur-Logo"/></td>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbName %></td>
+ <td class="pdfasvalue"><input type="text" name="signer" value="<fmt:message key="signaturblock.signer.value"/>" readonly="readonly" disabled="disabled" size="40" maxlength="255"/></td>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbDate %></td>
+ <td class="pdfasvalue"><%= DateFormatUtils.formatUTC(new Date(), "yyyy-MM-dd'T'HH:mm:ss'Z'", request.getLocale()) %></td>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbIssuer %></td>
+ <td class="pdfasvalue">
+ <div class="pdfasnobreak">CN=<fmt:message key="signaturblock.issuer.value.cn"/>,</div>
+ <div class="pdfasnobreak">O=<fmt:message key="signaturblock.issuer.value.o"/>,</div>
+ <div class="pdfasnobreak">C=AT</div>
+ </td>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbNumber %></td>
+ <td class="pdfasvalue">123456</td>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbKZ %></td>
+ <td class="pdfasvalue">
+ <div class="pdfasnobreak">urn:pdfsigfilter:</div>
+ <div class="pdfasnobreak">bka.gv.at:</div>
+ <div class="pdfasnobreak"><%= FormFields.VALUE_MODE_TEXTUAL.equals(mode) ? "text" : "binaer" %>:v1.1.0</div>
+ </td>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbID %></td>
+ <td class="pdfasvalue">
+ <% if (Constants.SIGNATURE_DEVICE_MOC.equals(device)) { %>
+ <div class="pdfasnobreak">etsi-moc-1.0@12345678</div>
+ <% } else { %>
+ <div class="pdfasnobreak">etsi-bka-1.0@1234567890-123456789@</div>
+ <div class="pdfasnobreak">12345-1234-</div>
+ <div class="pdfasnobreak">0-</div>
+ <div class="pdfasnobreak">12345-</div>
+ <div class="pdfasnobreak">12345</div></td>
+ <% } // end if %>
+ </tr>
+ <tr>
+ <td class="pdfaslabel" nowrap="nowrap"><%= sbMeta %></td>
+ <td colspan="2" class="pdfasvalue"><%= sbMetaValue %></td>
+ </tr>
+</table>
+</html>
\ No newline at end of file diff --git a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp b/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp deleted file mode 100644 index 3b48294..0000000 --- a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp +++ /dev/null @@ -1,61 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
-
-<%@ page import="org.apache.commons.lang.time.DateFormatUtils" %>
-<%@ page import="java.util.Date" %>
-
-<html:xhtml />
-
-<table border="0" cellpadding="3" cellspacing="0" class="pdfassignature">
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Signaturwert</td>
- <td colspan="2" class="pdfasvalue">
- <div style="float:left;">Aqs3vMeF81wm/UJjIcLOzUs9</div>
- <div style="float:left;">dxTBzhi2RC8avQyMAmc3v</div>
- <div style="float:left;">WEj9HT1DI3iish4smRr</div>
- </td>
- </tr>
- <tr>
- <td rowspan="6"><img src="<%= request.getContextPath() %>/images/signatur-logo_de-100.png" width="100" alt="Signatur-Logo"/></td>
- <td class="pdfaslabel" nowrap="nowrap">Unterzeichner</td>
- <td class="pdfasvalue"><input type="text" name="signer" value="<wird aus dem Zertifikat extrahiert>" readonly="readonly" disabled="disabled" size="40" maxlength="255"/></td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Datum/Zeit-UTC</td>
- <td class="pdfasvalue"><%= DateFormatUtils.formatUTC(new Date(), "yyyy-MM-dd'T'HH:mm:ss'Z'", request.getLocale()) %></td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Aussteller-Zertifikat</td>
- <td class="pdfasvalue">
- <div class="pdfasnobreak">CN=Ausstellername,</div>
- <div class="pdfasnobreak">O=Ausstellerorganisation,</div>
- <div class="pdfasnobreak">C=AT</div>
- </td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Serien-Nr.</td>
- <td class="pdfasvalue">123456</td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Methode</td>
- <td class="pdfasvalue">
- <div class="pdfasnobreak">urn:pdfsigfilter:</div>
- <div class="pdfasnobreak">bka.gv.at:</div>
- <div class="pdfasnobreak">text:v1.1.0</div>
- </td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Parameter</td>
- <td class="pdfasvalue">
- <div class="pdfasnobreak">etsi-bka-1.0@1234567890-123456789@</div>
- <div class="pdfasnobreak">12345-1234-</div>
- <div class="pdfasnobreak">0-</div>
- <div class="pdfasnobreak">12345-</div>
- <div class="pdfasnobreak">12345</div></td>
- </tr>
- <tr>
- <td class="pdfaslabel" nowrap="nowrap">Prüfinformation</td>
- <td colspan="2" class="pdfasvalue">
- Informationen zur Prüfung der elektronischen Signatur und des Ausdrucks finden Sie unter: <input type="text" name="vservice" readonly="readonly" disabled="disabled" value="https://www.buergerkarte.at/signature-verification" size="50" maxlength="255"/>
- </td>
- </tr>
-</table>
diff --git a/src/main/webapp/jsp/dataok.jsp b/src/main/webapp/jsp/dataok.jsp index c77fb46..ae209ab 100644 --- a/src/main/webapp/jsp/dataok.jsp +++ b/src/main/webapp/jsp/dataok.jsp @@ -1,24 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ include file="language.jsp" %>
+
<html>
<head>
-<title>PDF-AS Amtssignaturen</title>
+<title><fmt:message key="common.title"/></title>
<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/styles.css" />
</head>
<body>
<div class="maindiv">
-<h1>PDF-AS Amtssignaturen</h1>
-<div class="mainframe">
-<div class="mainheadline">Datenänderung</div>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="dataok.heading2"/></h2>
<p>
-Die Daten wurden erfolgreich übernommen.
+<fmt:message key="dataok.taken"/>
</p>
-</div>
<%
String btlurl = (String)request.getAttribute("btlurl");
%>
-<a class="big" href="<%=btlurl%>">zurück zur Liste</a>
+<a class="big" href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
</div>
</body>
</html>
\ No newline at end of file diff --git a/src/main/webapp/jsp/download.jsp b/src/main/webapp/jsp/download.jsp index 76180cc..95109e3 100644 --- a/src/main/webapp/jsp/download.jsp +++ b/src/main/webapp/jsp/download.jsp @@ -1,5 +1,7 @@ <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="language.jsp" %>
+
<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
@@ -9,7 +11,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen Lokale Verbindung</title>
+ <title><fmt:message key="download.title"/></title>
<script language="javascript" type="text/javascript">
<!--
function disableElement(elementId) {
@@ -19,7 +21,7 @@ function hitButton() {
document.submitform.submit();
disableElement("SendRequestButton");
- document.getElementById("SendRequestButton").value = "Download bereits erfolgt";
+ document.getElementById("SendRequestButton").value = "<fmt:message key="download.button.alreadydone"/>";
return(true);
}
-->
@@ -28,15 +30,15 @@ </head>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Dokument Signatur erstellen</h2>
- <div class="pdfasnote">Der Signatur-Vorgang ist abgeschlossen. Das signierte Dokument kann nun heruntergeladen werden.<br/>Hinweis: Der Download ist nur einmalig möglich. Das Dokument wird nicht am Server gespeichert.</div>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="download.heading2"/></h2>
+ <div class="pdfasnote"><fmt:message key="download.note"/></div>
<div class="pdfasverticalspace"></div>
<form action="<%= downloadURL %>" name="submitform" accept-charset="UTF-8" method="post" enctype="application/x-www-form-urlencoded">
- <input type="submit" id="SendRequestButton" value="Signiertes Dokument herunterladen" onclick="return hitButton();"/>
+ <input type="submit" id="SendRequestButton" value="<fmt:message key="download.button.download"/>" onclick="return hitButton();"/>
</form>
<div class="pdfasverticalspace"></div>
- <a href="<%= request.getContextPath() %>/">zurück</a>
+ <a href="<%= (response.encodeRedirectURL(request.getContextPath() + "/") + "?") %><fmt:message key="common.locale.param"/>"><fmt:message key="common.back"/></a>
</body>
</html>
diff --git a/src/main/webapp/jsp/error.jsp b/src/main/webapp/jsp/error.jsp index 0ec94d8..2183a62 100644 --- a/src/main/webapp/jsp/error.jsp +++ b/src/main/webapp/jsp/error.jsp @@ -4,11 +4,13 @@ <%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %>
<%@ page import="java.io.*" %>
+<%@ include file="language.jsp" %>
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen Resultat</title>
+ <title><fmt:message key="error.title"/></title>
<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>
</head>
@@ -22,15 +24,24 @@ String error = (request.getAttribute("error") == null ? "" : request.getAttribute("error").toString());
String cause = (request.getAttribute("cause") == null ? "" : request.getAttribute("cause").toString());
+ boolean rb = Boolean.TRUE.equals((Boolean) request.getAttribute("resourcebundle"));
%>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Ein Fehler ist aufgetreten</h2>
- <div class="pdfasnote"><%= error %></div>
- <div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="error.heading2"/></h2>
+ <div class="pdfasnote">
+ <% if (rb) { %>
+ <fmt:message key="<%= error %>"/>
+ <% } else { out.write(error); } %>
+ </div>
+ <div class="pdfasnote"><fmt:message key="error.cause"/>: <strong>
+ <% if (rb) { %>
+ <fmt:message key="<%= cause %>"/>
+ <% } else { out.write(cause); } %>
+ </strong></div>
<div class="pdfasverticalspace"></div>
- <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/">zurück</a>
+ <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"><fmt:message key="common.back"/></a>
<pre style="display:none">
<%
if (pe != null) {
diff --git a/src/main/webapp/jsp/error_verify.jsp b/src/main/webapp/jsp/error_verify.jsp index 3b82a32..7d3e5cc 100644 --- a/src/main/webapp/jsp/error_verify.jsp +++ b/src/main/webapp/jsp/error_verify.jsp @@ -4,11 +4,13 @@ <%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %>
<%@ page import="java.io.*" %>
+<%@ include file="language.jsp" %>
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen Resultat</title>
+ <title><fmt:message key="errorverify.title"/></title>
<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>
</head>
@@ -25,12 +27,12 @@ %>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Ein Fehler ist aufgetreten</h2>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="errorverify.heading2"/></h2>
<div class="pdfasnote"><%= error %></div>
- <div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>
+ <div class="pdfasnote"><fmt:message key="errorverify.cause"/>: <strong><%= cause %></strong></div>
<div class="pdfasverticalspace"></div>
- <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/jsp/verifyupload.jsp">zurück</a>
+ <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
<pre style="display:none">
<%
if (pe != null) {
diff --git a/src/main/webapp/jsp/language.jsp b/src/main/webapp/jsp/language.jsp new file mode 100644 index 0000000..11aad84 --- /dev/null +++ b/src/main/webapp/jsp/language.jsp @@ -0,0 +1,9 @@ +<%@ page import="at.gv.egiz.pdfas.web.i18n.LocaleParamFilter" %>
+<%@ page import="java.util.Locale" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%
+ Locale currentLocale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+ if (currentLocale != null) {
+%>
+ <fmt:setLocale value="<%= currentLocale.getLanguage() %>"/>
+<% } // end if %>
diff --git a/src/main/webapp/jsp/null_request_page.jsp b/src/main/webapp/jsp/null_request_page.jsp index 5773f63..c54fa26 100644 --- a/src/main/webapp/jsp/null_request_page.jsp +++ b/src/main/webapp/jsp/null_request_page.jsp @@ -1,41 +1,67 @@ <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
+<%@ page import="java.util.Locale" %>
+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ include file="language.jsp" %>
<%
String local_request_url = (String)request.getAttribute("local_request_url");
String data_url = (String)request.getAttribute("data_url");
+ String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+ Locale locale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+
+ boolean isOnlineMOCCA = Constants.SIGNATURE_DEVICE_MOC.equals(device);
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>PDF-Signaturen Lokale Verbindung</title>
+ <title><fmt:message key="nullrequestpage.title"/></title>
<script language="javascript" type="text/javascript">
<!--
function disableElement(elementId) {
- document.getElementById(elementId).disabled = true;
- document.getElementById(elementId).blur();
+ if (elementId != null && document.getElementById(elementId)) {
+ document.getElementById(elementId).disabled = true;
+ document.getElementById(elementId).blur();
+ }
return(true);
}
function hitButton() {
document.submitform.submit();
disableElement("SendRequestButton");
- document.getElementById("SendRequestButton").value = "Bitte warten...";
+ if (document.getElementById("SendRequestButton")) {
+ document.getElementById("SendRequestButton").value = "<fmt:message key="nullrequestpage.button.pleasewait"/>";
+ }
}
-->
</script>
</head>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Dokument Signatur erstellen</h2>
- <div class="pdfasnote">Die Verbindung zu Ihrer Bürgerkartenumgebung wird hergestellt...</div>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="nullrequestpage.heading2"/></h2>
+ <div class="pdfasnote"><fmt:message key="nullrequestpage.note"/></div>
+ <% if (isOnlineMOCCA) { %>
+ <form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post" target="moccaframe">
+ <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 %>" />
+ <input type="hidden" name="appletWidth" value="190"/>
+ <input type="hidden" name="appletHeight" value="130"/>
+ <% if (locale != null) { %>
+ <input type="hidden" name="locale" value="<%= locale.toString() %>"/>
+ <% } // end if %>
+ </form>
+ <div class="pdfasverticalspace"></div>
+ <iframe name="moccaframe" style="border: 1px solid black;" width="190" height="130" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="<%= request.getContextPath() %>/jsp/please_wait.jsp" ></iframe>
+ <% } else { %>
<div class="pdfasverticalspace"></div>
- <form action="<%= local_request_url %>" name="submitform" accept-charset="UTF-8" method="post"><!-- enctype="multipart/form-data"-->
- <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 %>" />
- <input type="submit" id="SendRequestButton" value="Absenden..." />
- </form>
+ <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 %>" />
+ <input type="submit" id="SendRequestButton" value="<fmt:message key="nullrequestpage.button.submit"/>" />
+ </form>
+ <% } // end if %>
<div class="pdfasverticalspace"></div>
- <a href="<%= request.getContextPath() %>/">zurück</a>
+ <a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
<script language="javascript" type="text/javascript">
<!--
window.setTimeout("hitButton()", 800);
diff --git a/src/main/webapp/jsp/please_wait.jsp b/src/main/webapp/jsp/please_wait.jsp new file mode 100644 index 0000000..62c0d28 --- /dev/null +++ b/src/main/webapp/jsp/please_wait.jsp @@ -0,0 +1,16 @@ +<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
+
+<%@ include file="language.jsp" %>
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <title><fmt:message key="pleasewait.title"/></title>
+</head>
+
+<body>
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr height="100%" valign="middle">
+ <td align="center"><fmt:message key="pleasewait.body"/></td>
+ </tr>
+ </table>
+</body>
diff --git a/src/main/webapp/jsp/results.jsp b/src/main/webapp/jsp/results.jsp index faabc27..f3ab71c 100644 --- a/src/main/webapp/jsp/results.jsp +++ b/src/main/webapp/jsp/results.jsp @@ -3,6 +3,8 @@ <%@ page import="java.util.Iterator" %>
<%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureResponse" %>
+<%@ include file="language.jsp" %>
+
<%
List results = (List) request.getAttribute("results");
Object bb = request.getAttribute("backbutton");
@@ -15,11 +17,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen</title>
+ <title><fmt:message key="common.title"/></title>
</head>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Prüfergebnis</h2>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="results.heading2"/></h2>
<%
Iterator resit = results.iterator();
while (resit.hasNext()) {
@@ -28,34 +30,34 @@ <div class="pdfasverticalspace"></div>
<fieldset class="pdfasresultfieldset">
- <legend><b>Signatur-Check</b></legend>
+ <legend><b><fmt:message key="results.signaturecheck"/></b></legend>
<div class="<%= "0".equals(result.getSignatureCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getSignatureCheckInfo() %></div>
</fieldset>
<div class="pdfassmallverticalspace"></div>
<fieldset class="pdfasresultfieldset">
- <legend><b>Zertifikat</b></legend>
+ <legend><b><fmt:message key="results.certificatecheck"/></b></legend>
<table class="pdfaslisttable" cellpadding="1" cellspacing="1">
- <tr><td class="pdfascaption">Signator:</td><td class="pdfasvalue"><%= result.getX509SubjectName() %></td></tr>
- <tr><td class="pdfascaption">Aussteller:</td><td class="pdfasvalue"><%= result.getX509IssuerName() %></td></tr>
- <tr><td class="pdfascaption">Seriennummer:</td><td class="pdfasvalue"><%= result.getX509SerialNumber() %></td></tr>
+ <tr><td class="pdfascaption"><fmt:message key="results.signer"/>:</td><td class="pdfasvalue"><%= result.getX509SubjectName() %></td></tr>
+ <tr><td class="pdfascaption"><fmt:message key="results.issuer"/>:</td><td class="pdfasvalue"><%= result.getX509IssuerName() %></td></tr>
+ <tr><td class="pdfascaption"><fmt:message key="results.serialnumber"/>:</td><td class="pdfasvalue"><%= result.getX509SerialNumber() %></td></tr>
<%
List public_properties = result.getPublicProperties();
Iterator propit = public_properties.iterator();
while (propit.hasNext()) {
String public_property = (String) propit.next();
%>
- <tr><td class="pdfascaption">Eigenschaft:</td><td class="pdfasvalue"><%= public_property %></td></tr>
+ <tr><td class="pdfascaption"><fmt:message key="results.property"/>:</td><td class="pdfasvalue"><%= public_property %></td></tr>
<%
}
%>
- <tr><td class="pdfascaption">Zertifikat:</td><td class="<%= "0".equals(result.getCertificateCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getCertificateCheckInfo() %></td></tr>
+ <tr><td class="pdfascaption"><fmt:message key="results.certificate"/>:</td><td class="<%= "0".equals(result.getCertificateCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getCertificateCheckInfo() %></td></tr>
</table>
</fieldset>
<div class="pdfassmallverticalspace"></div>
<fieldset class="pdfasresultfieldset">
- <legend><b>Manifest-Check</b></legend>
+ <legend><b><fmt:message key="results.manifestcheck"/></b></legend>
<div class="<%= "0".equals(result.getSignatureManifestCheckCode()) ? "pdfasok" : "pdfasnok" %>"><%= result.getSignatureManifestCheckInfo() %></div>
</fieldset>
@@ -69,10 +71,10 @@ %>
<div class="pdfasverticalspace"></div>
<% if (backbutton) { %>
- <a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zurück</a>
+ <a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
<% } %>
<% if (btlurl != null) { %>
- <a href="<%=btlurl%>">zurück zur Liste</a>
+ <a href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
<% } %>
</body>
</html>
diff --git a/src/main/webapp/jsp/signpreview.jsp b/src/main/webapp/jsp/signpreview.jsp index ee97497..66a9f69 100644 --- a/src/main/webapp/jsp/signpreview.jsp +++ b/src/main/webapp/jsp/signpreview.jsp @@ -3,9 +3,11 @@ <%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureData" %>
<%@ page import="at.gv.egiz.pdfas.web.SignSessionInformation" %>
<%@ page import="at.gv.egiz.pdfas.impl.input.TextDataSourceImpl"%>
-<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ include file="language.jsp" %>
+
<%
SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
@@ -25,12 +27,12 @@ <html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>PDF-Signaturen Vorschau</title>
+ <title><fmt:message key="signpreview.title"/></title>
</head>
<body>
- <h1>PDF-Signaturen</h1>
- <h2>Vorschau: Dokument Signieren</h2>
+ <h1><fmt:message key="common.title"/></h1>
+ <h2><fmt:message key="signpreview.heading2"/></h2>
<%
if (si.mode.equals(FormFields.VALUE_MODE_TEXTUAL)) {
%>
@@ -42,15 +44,19 @@ <iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
<!-- ================================================ Stop BKU-Erkennung -->
</div>
+ <% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(si.connector)) { %>
+ <div>
+ <img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+ </div>
<% } // end if %>
- <input type="submit" value="Signieren..." />
+ <input type="submit" value="<fmt:message key="signpreview.button.sign"/>" />
</form>
<%
} else {
%>
<div class="pdfasverticalspace"></div>
<form action="<%= signature_data_url %>" method="get" target="blank_">
- <input type="submit" value="Vorschaudokument anzeigen..." />
+ <input type="submit" value="<fmt:message key="signpreview.showpreview"/>" />
</form>
<div class="pdfasverticalspace"></div>
<% if (Constants.SIGNATURE_DEVICE_BKU.equals(si.connector)) { %>
@@ -59,15 +65,19 @@ <iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
<!-- ================================================ Stop BKU-Erkennung -->
</div>
+ <% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(si.connector)) { %>
+ <div>
+ <img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+ </div>
<% } // end if %>
<form action="<%= submit_url %>" method="get">
- <input type="submit" value="Signieren..." />
+ <input type="submit" value="<fmt:message key="signpreview.button.sign"/>" />
</form>
<%
}
%>
<div class="pdfasverticalspace"></div>
- <a href="<%= request.getContextPath() %>/">zurück</a>
+ <a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
</body>
</html>
diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp index 3db3be5..287afb1 100644 --- a/src/main/webapp/jsp/signupload.jsp +++ b/src/main/webapp/jsp/signupload.jsp @@ -1,78 +1,180 @@ <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>
+<%@ page import="at.gv.egiz.pdfas.web.i18n.LanguageDecoratorMapper"%>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.UpdateFormServlet"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ include file="language.jsp" %>
+
<html>
<head>
- <title>PDF-Signaturen</title>
+ <%
+ boolean testMode = request.getContextPath().startsWith("/test-");
+ boolean forceTextualForMocca = true;
+ %>
+ <title>
+ <%
+ if (testMode) {
+ %>
+ <fmt:message key="test.common.title"/>
+ <% } else { %>
+ <fmt:message key="common.title"/>
+ <% } // end if %>
+ </title>
<% session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT); %>
+ <script language="javascript" type="text/javascript">
+ <!--
+ function updateForm() {
+ var updateform = document.getElementById('updateform');
+ var submitform = document.getElementById('submitform');
+
+ updateform.<%= FormFields.FIELD_SIGNATURE_TYPE %>.value = submitform.<%= FormFields.FIELD_SIGNATURE_TYPE %>.value;
+ updateform.<%= FormFields.FIELD_MODE %>.value = submitform.<%= FormFields.FIELD_MODE %>.value;
+ updateform.<%= FormFields.FIELD_CONNECTOR %>.value = submitform.<%= FormFields.FIELD_CONNECTOR %>.value;
+ updateform.submit();
+ return(false);
+ }
+ function submitForm(preview) {
+ var submitform = document.getElementById('submitform');
+ if (!submitform.fileupload.value) {
+ if (preview) {
+ alert('<fmt:message key="signupload.documentnotselected.preview"/>');
+ } else {
+ alert('<fmt:message key="signupload.documentnotselected"/>');
+ }
+ return(false);
+ }
+ if (preview) {
+ submitform.<%= FormFields.FIELD_PREVIEW %>.value='true';
+ } else {
+ submitform.<%= FormFields.FIELD_PREVIEW %>.value='false';
+ }
+ return(true);
+ }
+ -->
+ </script>
+ <%
+ String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
+ if (device == null) {
+ device = Constants.SIGNATURE_DEVICE_MOC;
+ session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY, device);
+ }
+ String mode = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY);
+ if (forceTextualForMocca && Constants.SIGNATURE_DEVICE_MOC.equals(device)) {
+ mode = FormFields.VALUE_MODE_TEXTUAL;
+ session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY, mode);
+ }
+ if (mode == null) {
+ mode = FormFields.VALUE_MODE_TEXTUAL;
+ session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_MODE_KEY, mode);
+ }
+ String type = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY);
+ if (type == null) {
+ Locale locale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+ if (locale == null) {
+ locale = request.getLocale();
+ }
+ type = Locale.GERMAN.getLanguage().equals(locale.getLanguage()) ? "SIGNATURBLOCK_DE" : "SIGNATURBLOCK_EN";
+ session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_TYPE_KEY, type);
+ }
+
+ %>
</head>
<body>
-<h1>PDF-Signaturen</h1>
-<h2>Dokument Signatur erstellen</h2>
-<div class="pdfasnote">Bitte wählen Sie die zu signierende PDF-Datei. Diese wird mit Ihrer Bürgerkarte signiert.</div>
-<form name="submitform"
+<h1>
+ <%
+ if (testMode) {
+ %>
+ <fmt:message key="test.common.title"/>
+ <% } else { %>
+ <fmt:message key="common.title"/>
+ <% } // end if %>
+</h1>
+<h2><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=""/>
+ <input type="hidden" name="<%= FormFields.FIELD_MODE %>" value=""/>
+ <input type="hidden" name="<%= FormFields.FIELD_CONNECTOR %>" value=""/>
+</form>
+<form name="submitform" id="submitform"
enctype="multipart/form-data"
accept-charset="UTF-8"
method="post"
action="<%= request.getContextPath() %>/Sign">
<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">
<tr>
- <td nowrap="nowrap"><label>PDF Datei:</label></td>
- <td><input size="50" type="file" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>
- </tr>
- <tr>
- <td nowrap="nowrap"><label>Signatur Typ:</label></td>
+ <td nowrap="nowrap"><label><fmt:message key="signupload.signaturetype"/>:</label></td>
<td>
- <select class="field" name="sig_type">
- <option value="SIGNATURBLOCK_DE" selected="selected">Standardsignatur Deutsch</option>
- <option value="SIGNATURBLOCK_EN" >Standardsignatur Englisch</option>
+ <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>
</select>
<!-- %= // FormFields.generateTypeSelectBox() % -->
</td>
</tr>
<tr>
- <td nowrap="nowrap"><label>Signatur Modus:</label></td>
+ <td nowrap="nowrap"><label><fmt:message key="signupload.signaturemode"/>:</label></td>
<td>
- <select name="<%= FormFields.FIELD_MODE %>">
- <option value="<%= FormFields.VALUE_MODE_BINARY %>">binär</option>
- <option value="<%= FormFields.VALUE_MODE_TEXTUAL %>" selected="selected">textuell</option>
- <!--
- <option value="<%= FormFields.VALUE_MODE_DETACHED %>">detached</option>
- -->
- </select>
+ <% 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 %>"/>
+ <% } else { %>
+ <select name="<%= FormFields.FIELD_MODE %>" onchange="return updateForm();">
+ <option value="<%= FormFields.VALUE_MODE_BINARY %>" <%= FormFields.VALUE_MODE_BINARY.equals(mode) ? "selected=\"selected\"" : "" %>><fmt:message key="common.binary"/></option>
+ <option value="<%= FormFields.VALUE_MODE_TEXTUAL %>" <%= FormFields.VALUE_MODE_TEXTUAL.equals(mode) ? "selected=\"selected\"" : "" %>><fmt:message key="common.textual"/></option>
+ <!--
+ <option value="<%= FormFields.VALUE_MODE_DETACHED %>">detached</option>
+ -->
+ </select>
+ <% } %>
</td>
</tr>
<tr>
- <td nowrap="nowrap"><label>Signaturgerät:</label></td>
+ <td nowrap="nowrap"><label><fmt:message key="signupload.signaturedevice"/>:</label></td>
<td>
- <select name="connector">
- <option value="<%= Constants.SIGNATURE_DEVICE_BKU %>">BKU</option>
- <option value="<%= Constants.SIGNATURE_DEVICE_MOC %>" selected="selected">MOCCA</option>
+ <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>
</select>
</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>
+ </tr>
</table>
- <div class="pdfasnote"><span class="pdfasemphasis">Bitte beachten Sie:</span> Im textuellen Modus signierte Dokumente können nur dann geprüft werden, wenn das Zertifikat in einem Verzeichnisdienst verfügbar ist.</div>
+ <div class="pdfasnote"><span class="pdfasemphasis"><fmt:message key="signupload.note.prefix"/>:</span> <fmt:message key="signupload.note"/></div>
<input type="hidden" name="<%= FormFields.FIELD_DOWNLOAD %>" value="<%= FormFields.VALUE_DOWNLOAD_ATTACHMENT %>"/>
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
<div class="pdfasverticalspace"></div>
- <jsp:include page="SIGNATURBLOCK_DE.jsp"/>
+ <jsp:include page="SIGNATURBLOCK.jsp"/>
- <div class="pdfasnote">Das Erscheinungsbild der Signaturmarke kann abhängig vom Signatur Typ, vom Signatur Modus, von der verwendeten Bürgerkarte, sowie von der verwendeten Bürgerkartenumgebung variieren.</div>
- <div>
- <!-- =============================================== Start BKU-Erkennung -->
- <iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
- <!-- ================================================ Stop BKU-Erkennung -->
- </div>
- <input type="submit" value="Signatur erstellen" />
- <input type="submit" value="Vorschau" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
+ <div class="pdfasnote"><fmt:message key="signupload.noteonsigmark"/></div>
+ <% if (Constants.SIGNATURE_DEVICE_BKU.equals(device)) { %>
+ <div>
+ <!-- =============================================== Start BKU-Erkennung -->
+ <iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>
+ <!-- ================================================ Stop BKU-Erkennung -->
+ </div>
+ <% } else if (Constants.SIGNATURE_DEVICE_MOC.equals(device)) { %>
+ <div>
+ <img src="images/chiperling.jpg" width="57" height="57" alt="<fmt:message key="common.mocca"/>"/>
+ </div>
+ <% } else { %>
+ <div class="pdfasverticalspace"></div>
+ <% } // end if %>
+ <div>
+ <input type="submit" value="<fmt:message key="signupload.button.sign"/>" onclick="return submitForm(false);"/>
+ <input type="submit" value="<fmt:message key="signupload.button.preview"/>" onclick="return submitForm(true);"/>
+ </div>
</form>
</body>
-</html>
\ No newline at end of file +</html>
diff --git a/src/main/webapp/jsp/verifylist.jsp b/src/main/webapp/jsp/verifylist.jsp index fac5755..c04928a 100644 --- a/src/main/webapp/jsp/verifylist.jsp +++ b/src/main/webapp/jsp/verifylist.jsp @@ -7,6 +7,7 @@ <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
+<%@ include file="language.jsp" %>
<%
VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request);
@@ -18,16 +19,16 @@ <html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>PDF-Signaturen</title>
+ <title><fmt:message key="common.title"/></title>
</head>
<body>
- <h1>PDF-Signaturen</h1>
+ <h1><fmt:message key="common.title"/></h1>
<%
if (signature_holders.size() > 1) {
%>
- <h2>Dokument Signaturen prüfen</h2>
+ <h2><fmt:message key="verifylist.heading2.plural"/></h2>
<% } else { %>
- <h2>Dokument Signatur prüfen</h2>
+ <h2><fmt:message key="verifylist.heading2.singular"/></h2>
<%
}
%>
@@ -44,7 +45,7 @@ style="float:left;">
<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
- <input type="submit" value="Nur diese Signatur prüfen" />
+ <input type="submit" value="<fmt:message key="verifylist.button.verifysinglesignature"/>" />
</form>
<form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
accept-charset="UTF-8"
@@ -52,7 +53,7 @@ style="float:left;">
<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="true" />
- <input type="submit" value="Vorschau..." />
+ <input type="submit" value="<fmt:message key="verifylist.button.preview"/>" />
</form>
</div>
<%
@@ -65,9 +66,9 @@ method="get">
<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= FormFields.VALUE_VERIFY_WHICH_ALL %>" />
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
- <input type="submit" value="Alle prüfen" />
+ <input type="submit" value="<fmt:message key="verifylist.button.verifyallsignatures"/>" />
</form>
<div class="pdfasverticalspace"></div>
- <a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zurück</a>
+ <a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
</body>
</html>
diff --git a/src/main/webapp/jsp/verifypreview.jsp b/src/main/webapp/jsp/verifypreview.jsp index 1b0adfa..5b6ae6e 100644 --- a/src/main/webapp/jsp/verifypreview.jsp +++ b/src/main/webapp/jsp/verifypreview.jsp @@ -8,6 +8,7 @@ <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
+<%@ include file="language.jsp" %>
<%
String btlurl = (String)request.getAttribute("btlurl");
@@ -21,7 +22,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen</title>
+ <title><fmt:message key="common.title"/></title>
<script type="text/javascript">
<!--
function initSigValues() {
@@ -31,26 +32,26 @@ </script>
</head>
<body">
-<h1>PDF-Signaturen</h1>
-<h2>Vorschau: Dokument prüfen</h2>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="verifypreview.heading2"/></h2>
<form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
name="submitform"
enctype="multipart/form-data"
accept-charset="UTF-8"
method="post">
<input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= verify_which %>" />
- <div class="pdfasnote"><label>Rekonstruktion der Signaturmarke:</label></div>
+ <div class="pdfasnote"><label><fmt:message key="verifypreview.reconstruction"/>:</label></div>
<div class="pdfasverticalspace"></div>
<textarea class="pdfaspreviewfield" rows="14" name="<%= FormFields.FIELD_RAW_DOCUMENT_TEXT %>"><%= ((TextualSignatureHolder)signature_holder).getSignedText() %></textarea>
<%= VerifyPreviewServlet.renderRequiredKeys(signature_holder.getSignatureObject(), "", false) %>
<br />
<input type="hidden" name="verify" value="false" />
- <input type="submit" value="Werte übernehmen" />
- <input type="submit" value="Werte übernehmen und prüfen" onclick="document.submitform.verify.value='true'" />
+ <input type="submit" value="<fmt:message key="verifypreview.applyvalues"/>" />
+ <input type="submit" value="<fmt:message key="verifypreview.applyvaluesandverify"/>" onclick="document.submitform.verify.value='true'" />
</form>
<div class="pdfasverticalspace"></div>
-<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zurück</a>
-<a href="<%=btlurl%>">zurück zur Liste</a>
+<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp"><fmt:message key="common.back"/></a>
+<a href="<%=btlurl%>"><fmt:message key="common.backtolist"/></a>
<script language="javascript" type="text/javascript">
<!--
initSigValues();
diff --git a/src/main/webapp/jsp/verifyupload.jsp b/src/main/webapp/jsp/verifyupload.jsp index 54823f5..6e2f237 100644 --- a/src/main/webapp/jsp/verifyupload.jsp +++ b/src/main/webapp/jsp/verifyupload.jsp @@ -1,24 +1,27 @@ <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
<%@ page contentType="text/html; charset=UTF-8" %>
+
+<%@ include file="language.jsp" %>
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title>PDF-Signaturen</title>
+ <title><fmt:message key="common.title"/></title>
</head>
<body>
-<h1>PDF-Signaturen</h1>
-<h2>Dokument Signatur prüfen</h2>
-<div class="pdfasnote">Hier bitte den vollständigen Dokumenttext samt Signaturblock eingeben.<br/></div>
+<h1><fmt:message key="common.title"/></h1>
+<h2><fmt:message key="verifyupload.heading2"/></h2>
+<div class="pdfasnote"><fmt:message key="verifyupload.note"/><br/></div>
<form name="submitform" enctype="multipart/form-data" method="post" action="<%= request.getContextPath() %>/Verify" accept-charset="UTF-8">
<textarea class="pdfaspreviewfield" rows="14" name="<%= FormFields.FIELD_UPLOAD %>"></textarea>
<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">
<tr>
- <td nowrap="nowrap"><label>Prüf Applikation:</label></td>
+ <td nowrap="nowrap"><label><fmt:message key="verifyupload.verifydevice"/>:</label></td>
<td><%= FormFields.generateConnectorSelectBox() %></td>
</tr>
<tr>
- <td nowrap="nowrap"><label>Prüf Modus:</label></td>
- <td><span>textuell</span></td>
+ <td nowrap="nowrap"><label><fmt:message key="verifyupload.verifymode"/>:</label></td>
+ <td><span><fmt:message key="common.textual"/></span></td>
</tr>
</table>
@@ -28,11 +31,11 @@ <!-- ================================================ Stop BKU-Erkennung -->
</div>
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
- <input type="submit" value="Alle prüfen" />
- <input type="submit" value="Signaturen auflisten" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
+ <input type="submit" value="<fmt:message key="verifyupload.button.verifyallsignatures"/>" />
+ <input type="submit" value="<fmt:message key="verifyupload.button.listsignatures"/>" onclick="document.submitform.<%= FormFields.FIELD_PREVIEW %>.value='true'" />
</form>
<div class="pdfasverticalspace"></div>
-<a href="<%= request.getContextPath() %>/">zurück</a>
+<a href="<%= request.getContextPath() %>/"><fmt:message key="common.back"/></a>
</body>
</html>
\ No newline at end of file diff --git a/src/main/webapp/sitemesh/buergerkarte/pdf-as-template-de.jsp b/src/main/webapp/sitemesh/buergerkarte/pdf-as-template-de.jsp new file mode 100644 index 0000000..c3838f5 --- /dev/null +++ b/src/main/webapp/sitemesh/buergerkarte/pdf-as-template-de.jsp @@ -0,0 +1,140 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
+<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
+
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><!-- InstanceBegin template="/Templates/pdf.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="description" content="Bürgerkarte" />
+<meta name="keywords" content="bürgerkarte,e-card,pdf signatur" />
+<meta name="robots" content="index,follow" />
+<meta name="language" content="de-at" />
+<meta name="author" content="Tina Fleck" />
+<meta name="geo.region" content="AT-6" />
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>PDF-Signaturen</title>
+<decorator:head/>
+<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />
+<!-- InstanceEndEditable -->
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/css/styles.css" />
+<!-- Template Parameters -->
+
+
+
+
+
+
+
+
+
+
+<!-- InstanceParam name="zusatzspalte" type="boolean" value="true" -->
+<!-- InstanceParam name="contentwidth" type="number" value="700" -->
+
+<!-- InstanceParam name="submenu_1" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_2" type="text" value="entry-active" -->
+<!-- InstanceParam name="submenu_3" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_4" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_5" type="text" value="entry" -->
+
+
+
+
+</head>
+
+<body>
+ <div id="container">
+ <div id="header">
+ <div id="sitename">Bürgerkarte</div>
+ <div id="metamenu"><a href="/de/index.html">Home</a> | <a href="/de/sitemap/index.html">Sitemap</a> | <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/?locale=en">English</a> |<!-- <a href="/switch.php">English</a> | --> <a href="/de/impressum/">Impressum</a></div>
+ <div class="clearfloat"></div>
+ </div>
+
+ <div id="menubar">
+ <div id="menu-top"></div>
+ <div id="menu-middle">
+ <h4>Ich will eine...</h4>
+ <!-- menu_inactive -->
+ <div><a id="menu_11" class="menu_inactive" href="/de/voraussetzungen/index.html">Ich benötige dazu ...</a></div>
+ <div><a id="menu_12" class="menu_inactive" href="/de/aktivieren/online.html">Jetzt aktivieren ...</a></div>
+ <h4>Ich habe eine...</h4>
+ <div><a id="menu_21" class="menu_inactive" href="/de/verwaltung/index.html">Öffentliche Verwaltung</a></div>
+ <div><a id="menu_22" class="menu_inactive" href="/de/privatwirtschaft/index.html">Privatwirtschaft</a></div>
+ <div><a id="menu_23" class="menu_inactive" href="/de/zuhause/index.html">Zu Hause</a></div>
+ <div><a id="menu_25" class="menu_active" href="/de/pdf-signieren/index.html"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signaturen</a></div>
+ <div><a id="menu_24" class="menu_inactive" href="/de/hilfe/wer-hilft-mir.html">Hilfe bei Problemen</a></div>
+ <h4>Was ist sie...</h4>
+ <div><a id="menu_31" class="menu_inactive" href="/de/ueberblick/index.html">Überblick Bürgerkarte</a></div>
+ <div><a id="menu_32" class="menu_inactive" href="/de/datenschutz-sicherheit/index.html">Datenschutz & Sicherheit</a></div>
+ <div><a id="menu_33" class="menu_inactive" href="/de/spezifikation/index.html">Spezifikation</a></div>
+ <!--
+ <div><a id="menu_11" class="menu_inactive" href="/de/begriffslexikon/index.html">Begriffslexikon</a></div>
+ -->
+ <div><img src="images/menu-divider.jpg" alt="" width="210" height="2" /></div>
+
+
+ <div class="search">
+ <form accept-charset="utf-8" action="/regain/search.jsp" method="get" name="search">
+ <table cellpadding="0" cellspacing="0" border="0"><tr><td><label for="suchtext">Suche: <input name="query" type="text" size="20" maxlength="20" alt="search" class="inputfield" /></label></td>
+ <td><input type="image" name="enterdata" src="images/button-search.jpg" alt="Suche starten" title="Suche starten" /></td>
+ </tr></table>
+ </form>
+ </div>
+ </div>
+ <div id="menu-bottom"></div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+ <div id="mainContent-700">
+
+ <div class="submenu" id="_700">
+
+ <!-- InstanceBeginEditable name="optional-entries-700" -->
+ <!-- InstanceEndEditable -->
+ <div class="start"></div>
+ <div class="entry">
+ <a href="/de/pdf-signieren/index.html">Allgemein</a></div>
+ <div class="entry">
+ <a href="/de/pdf-signieren/info.html">Weitere Info</a></div>
+ <div class="entry-active">
+ <a href="<%= request.getContextPath() %>/?locale=de"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signieren</a></div>
+ <div class="entry">
+ <a href="/signature-verification/?locale=de">Signatur überprüfen</a></div>
+ <div class="entry">
+ <a href="/download/pdftools/index.html">Download</a></div>
+ <div class="clear"></div>
+
+ </div>
+
+
+ <!-- Start Content -->
+ <!-- InstanceBeginEditable name="Content-700" -->
+ <div id="content-middle-700">
+ <decorator:body/>
+ </div>
+ <!-- InstanceEndEditable -->
+ <div id="content-bottom-700"></div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+<!-- InstanceEnd --></html>
diff --git a/src/main/webapp/sitemesh/buergerkarte/pdf-as-template.jsp b/src/main/webapp/sitemesh/buergerkarte/pdf-as-template.jsp new file mode 100644 index 0000000..02868f3 --- /dev/null +++ b/src/main/webapp/sitemesh/buergerkarte/pdf-as-template.jsp @@ -0,0 +1,160 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
+<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
+
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><!-- InstanceBegin template="/Templates/en/pdf.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="description" content="citizen card" />
+<meta name="keywords" content="citizen card,e-card,pdf signature" />
+<meta name="robots" content="index,follow" />
+<meta name="language" content="en-us" />
+<meta name="author" content="Tina Fleck" />
+<meta name="geo.region" content="AT-6" />
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>PDF Signature</title>
+<decorator:head/>
+<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="templates" -->
+<!-- InstanceEndEditable -->
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/css/styles.css" />
+<!-- Template Parameters -->
+
+
+
+
+
+
+
+
+
+
+<!-- InstanceParam name="zusatzspalte" type="boolean" value="true" -->
+<!-- InstanceParam name="contentwidth" type="number" value="700" -->
+
+<!-- InstanceParam name="submenu_1" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_2" type="text" value="entry-active" -->
+<!-- InstanceParam name="submenu_3" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_4" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_5" type="text" value="entry" -->
+
+
+
+
+
+<!-- InstanceParam name="test_prefix" type="text" value="" -->
+<!-- InstanceParam name="test_postfix" type="text" value="" -->
+
+<!-- InstanceBeginEditable name="JavaScript" -->
+<!-- Java Script Area -->
+<%
+ String localName = request.getLocalName();
+ if (localName.equals("localhost") || localName.startsWith("brontes.")) {
+%>
+ <link rel="stylesheet" type="text/css" href="http://www.buergerkarte.at/css/styles.css" />
+<%
+ } // end if
+%>
+<!-- InstanceEndEditable -->
+
+</head>
+
+<body>
+ <div id="container">
+ <div id="header">
+ <div id="sitename">Citizen Card</div>
+ <div id="metamenu"><a href="/en/index.html">Home</a> | <a href="/en/sitemap/index.html">Sitemap</a> | <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/?locale=de">German</a> |<!-- <a href="../switch.php">English</a> | --> <a href="/en/impressum">Imprint</a></div>
+ <div class="clearfloat"></div>
+ </div>
+
+ <div id="menubar">
+ <div id="menu-top"></div>
+ <div id="menu-middle">
+ <h4>I want one...</h4>
+ <!-- menu_inactive -->
+ <div><a id="menu_11" class="menu_inactive" href="/en/voraussetzungen/index.html">What you'll need ...</a></div>
+ <div><a id="menu_12" class="menu_inactive" href="/en/aktivieren/online.html">Activate your card ...</a></div>
+ <h4>I have one...</h4>
+ <div><a id="menu_21" class="menu_inactive" href="/en/verwaltung/index.html">Public Administration</a></div>
+ <div><a id="menu_22" class="menu_inactive" href="/en/privatwirtschaft/index.html">Private Sector</a></div>
+ <div><a id="menu_23" class="menu_inactive" href="/en/zuhause/index.html">At Home</a></div>
+ <div><a id="menu_25" class="menu_active" href="/en/pdf-signieren/index.html"><acronym title="Portable Document Format">PDF</acronym> Signatures</a></div>
+ <div><a id="menu_24" class="menu_inactive" href="/en/hilfe/wer-hilft-mir.html">Help</a></div>
+ <h4>What is it...</h4>
+ <div><a id="menu_31" class="menu_inactive" href="/en/ueberblick/index.html">Overview</a></div>
+ <div><a id="menu_32" class="menu_inactive" href="/en/datenschutz-sicherheit/index.html">Data Protection
+& Security</a></div>
+ <div><a id="menu_33" class="menu_inactive" href="/en/spezifikation/index.html">Specifications</a></div>
+ <!--
+ <div><a id="menu_11" class="menu_inactive" href="../de/begriffslexikon/index.html">Begriffslexikon</a></div>
+ -->
+ <div><img src="images/menu-divider.jpg" alt="" width="210" height="2" /></div>
+
+
+ <div class="search">
+ <form accept-charset="utf-8" action="/regain/search.jsp" method="get" name="search">
+ <table cellpadding="0" cellspacing="0" border="0"><tr><td><label for="suchtext">Search:
+ <input name="query" type="text" size="20" maxlength="20" alt="search" class="inputfield" /></label></td>
+ <td><input type="image" name="enterdata" src="images/button-search.jpg" alt="Suche starten" title="Suche starten" /></td>
+ </tr></table>
+ </form>
+ </div>
+ </div>
+ <div id="menu-bottom"></div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+ <div id="mainContent-700">
+
+ <div class="submenu" id="_700">
+
+ <!-- InstanceBeginEditable name="optional-entries-700" -->
+ <!-- InstanceEndEditable -->
+ <div class="start"></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/index.html">General</a></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/info.html">Additional Info</a></div>
+ <div class="entry-active">
+ <a href="<%= request.getContextPath() %>/?locale=en"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signatures</a></div>
+ <div class="entry">
+ <a href="/signature-verification/?locale=en">Signature Verification</a></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/downloads.html">Downloads</a></div>
+ <div class="clear"></div>
+
+ </div>
+
+
+ <!-- Start Content -->
+ <!-- InstanceBeginEditable name="Content-700" -->
+ <div id="content-middle-700">
+ <decorator:body/>
+ </div>
+ <!-- InstanceEndEditable -->
+ <div id="content-bottom-700"></div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+<!-- InstanceEnd --></html>
diff --git a/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template-de.jsp b/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template-de.jsp new file mode 100644 index 0000000..bae6f6c --- /dev/null +++ b/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template-de.jsp @@ -0,0 +1,140 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
+<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
+
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><!-- InstanceBegin template="/Templates/pdf.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="description" content="Bürgerkarte" />
+<meta name="keywords" content="bürgerkarte,e-card,pdf signatur" />
+<meta name="robots" content="index,follow" />
+<meta name="language" content="de-at" />
+<meta name="author" content="Tina Fleck" />
+<meta name="geo.region" content="AT-6" />
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>PDF-Signatur (Test)</title>
+<decorator:head/>
+<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />
+<!-- InstanceEndEditable -->
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/css/styles.css" />
+<!-- Template Parameters -->
+
+
+
+
+
+
+
+
+
+
+<!-- InstanceParam name="zusatzspalte" type="boolean" value="true" -->
+<!-- InstanceParam name="contentwidth" type="number" value="700" -->
+
+<!-- InstanceParam name="submenu_1" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_2" type="text" value="entry-active" -->
+<!-- InstanceParam name="submenu_3" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_4" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_5" type="text" value="entry" -->
+
+
+
+
+</head>
+
+<body>
+ <div id="container">
+ <div id="header">
+ <div id="sitename">Bürgerkarte</div>
+ <div id="metamenu"><a href="/de/index.html">Home</a> | <a href="/de/sitemap/index.html">Sitemap</a> | <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/?locale=en">English</a> |<!-- <a href="/switch.php">English</a> | --> <a href="/de/impressum/">Impressum</a></div>
+ <div class="clearfloat"></div>
+ </div>
+
+ <div id="menubar">
+ <div id="menu-top"></div>
+ <div id="menu-middle">
+ <h4>Ich will eine...</h4>
+ <!-- menu_inactive -->
+ <div><a id="menu_11" class="menu_inactive" href="/de/voraussetzungen/index.html">Ich benötige dazu ...</a></div>
+ <div><a id="menu_12" class="menu_inactive" href="/de/aktivieren/online.html">Jetzt aktivieren ...</a></div>
+ <h4>Ich habe eine...</h4>
+ <div><a id="menu_21" class="menu_inactive" href="/de/verwaltung/index.html">Öffentliche Verwaltung</a></div>
+ <div><a id="menu_22" class="menu_inactive" href="/de/privatwirtschaft/index.html">Privatwirtschaft</a></div>
+ <div><a id="menu_23" class="menu_inactive" href="/de/zuhause/index.html">Zu Hause</a></div>
+ <div><a id="menu_25" class="menu_active" href="/de/pdf-signieren/index.html"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signaturen</a></div>
+ <div><a id="menu_24" class="menu_inactive" href="/de/hilfe/wer-hilft-mir.html">Hilfe bei Problemen</a></div>
+ <h4>Was ist sie...</h4>
+ <div><a id="menu_31" class="menu_inactive" href="/de/ueberblick/index.html">Überblick Bürgerkarte</a></div>
+ <div><a id="menu_32" class="menu_inactive" href="/de/datenschutz-sicherheit/index.html">Datenschutz & Sicherheit</a></div>
+ <div><a id="menu_33" class="menu_inactive" href="/de/spezifikation/index.html">Spezifikation</a></div>
+ <!--
+ <div><a id="menu_11" class="menu_inactive" href="/de/begriffslexikon/index.html">Begriffslexikon</a></div>
+ -->
+ <div><img src="images/menu-divider.jpg" alt="" width="210" height="2" /></div>
+
+
+ <div class="search">
+ <form accept-charset="utf-8" action="/regain/search.jsp" method="get" name="search">
+ <table cellpadding="0" cellspacing="0" border="0"><tr><td><label for="suchtext">Suche: <input name="query" type="text" size="20" maxlength="20" alt="search" class="inputfield" /></label></td>
+ <td><input type="image" name="enterdata" src="images/button-search.jpg" alt="Suche starten" title="Suche starten" /></td>
+ </tr></table>
+ </form>
+ </div>
+ </div>
+ <div id="menu-bottom"></div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+ <div id="mainContent-700">
+
+ <div class="submenu" id="_700">
+
+ <!-- InstanceBeginEditable name="optional-entries-700" -->
+ <!-- InstanceEndEditable -->
+ <div class="start"></div>
+ <div class="entry">
+ <a href="/de/pdf-signieren/index.html">Allgemein</a></div>
+ <div class="entry">
+ <a href="/de/pdf-signieren/info.html">Weitere Info</a></div>
+ <div class="entry-active">
+ <a href="<%= request.getContextPath() %>/?locale=de"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signieren (Test)</a></div>
+ <div class="entry">
+ <a href="/test-signature-verification/?locale=de">Signatur überprüfen (Test)</a></div>
+ <div class="entry">
+ <a href="/download/pdftools/index.html">Download</a></div>
+ <div class="clear"></div>
+
+ </div>
+
+
+ <!-- Start Content -->
+ <!-- InstanceBeginEditable name="Content-700" -->
+ <div id="content-middle-700">
+ <decorator:body/>
+ </div>
+ <!-- InstanceEndEditable -->
+ <div id="content-bottom-700"></div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+<!-- InstanceEnd --></html>
diff --git a/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template.jsp b/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template.jsp new file mode 100644 index 0000000..c480315 --- /dev/null +++ b/src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template.jsp @@ -0,0 +1,160 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
+<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
+
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><!-- InstanceBegin template="/Templates/en/pdf.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="description" content="citizen card" />
+<meta name="keywords" content="citizen card,e-card,pdf signature" />
+<meta name="robots" content="index,follow" />
+<meta name="language" content="en-us" />
+<meta name="author" content="Tina Fleck" />
+<meta name="geo.region" content="AT-6" />
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>PDF Signature (test)</title>
+<decorator:head/>
+<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="templates" -->
+<!-- InstanceEndEditable -->
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/css/styles.css" />
+<!-- Template Parameters -->
+
+
+
+
+
+
+
+
+
+
+<!-- InstanceParam name="zusatzspalte" type="boolean" value="true" -->
+<!-- InstanceParam name="contentwidth" type="number" value="700" -->
+
+<!-- InstanceParam name="submenu_1" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_2" type="text" value="entry-active" -->
+<!-- InstanceParam name="submenu_3" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_4" type="text" value="entry" -->
+<!-- InstanceParam name="submenu_5" type="text" value="entry" -->
+
+
+
+
+
+<!-- InstanceParam name="test_prefix" type="text" value="" -->
+<!-- InstanceParam name="test_postfix" type="text" value="" -->
+
+<!-- InstanceBeginEditable name="JavaScript" -->
+<!-- Java Script Area -->
+<%
+ String localName = request.getLocalName();
+ if (localName.equals("localhost") || localName.startsWith("brontes.")) {
+%>
+ <link rel="stylesheet" type="text/css" href="http://www.buergerkarte.at/css/styles.css" />
+<%
+ } // end if
+%>
+<!-- InstanceEndEditable -->
+
+</head>
+
+<body>
+ <div id="container">
+ <div id="header">
+ <div id="sitename">Citizen Card</div>
+ <div id="metamenu"><a href="/en/index.html">Home</a> | <a href="/en/sitemap/index.html">Sitemap</a> | <a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/?locale=de">German</a> |<!-- <a href="../switch.php">English</a> | --> <a href="/en/impressum">Imprint</a></div>
+ <div class="clearfloat"></div>
+ </div>
+
+ <div id="menubar">
+ <div id="menu-top"></div>
+ <div id="menu-middle">
+ <h4>I want one...</h4>
+ <!-- menu_inactive -->
+ <div><a id="menu_11" class="menu_inactive" href="/en/voraussetzungen/index.html">What you'll need ...</a></div>
+ <div><a id="menu_12" class="menu_inactive" href="/en/aktivieren/online.html">Activate your card ...</a></div>
+ <h4>I have one...</h4>
+ <div><a id="menu_21" class="menu_inactive" href="/en/verwaltung/index.html">Public Administration</a></div>
+ <div><a id="menu_22" class="menu_inactive" href="/en/privatwirtschaft/index.html">Private Sector</a></div>
+ <div><a id="menu_23" class="menu_inactive" href="/en/zuhause/index.html">At Home</a></div>
+ <div><a id="menu_25" class="menu_active" href="/en/pdf-signieren/index.html"><acronym title="Portable Document Format">PDF</acronym> Signatures</a></div>
+ <div><a id="menu_24" class="menu_inactive" href="/en/hilfe/wer-hilft-mir.html">Help</a></div>
+ <h4>What is it...</h4>
+ <div><a id="menu_31" class="menu_inactive" href="/en/ueberblick/index.html">Overview</a></div>
+ <div><a id="menu_32" class="menu_inactive" href="/en/datenschutz-sicherheit/index.html">Data Protection
+& Security</a></div>
+ <div><a id="menu_33" class="menu_inactive" href="/en/spezifikation/index.html">Specifications</a></div>
+ <!--
+ <div><a id="menu_11" class="menu_inactive" href="../de/begriffslexikon/index.html">Begriffslexikon</a></div>
+ -->
+ <div><img src="images/menu-divider.jpg" alt="" width="210" height="2" /></div>
+
+
+ <div class="search">
+ <form accept-charset="utf-8" action="/regain/search.jsp" method="get" name="search">
+ <table cellpadding="0" cellspacing="0" border="0"><tr><td><label for="suchtext">Search:
+ <input name="query" type="text" size="20" maxlength="20" alt="search" class="inputfield" /></label></td>
+ <td><input type="image" name="enterdata" src="images/button-search.jpg" alt="Suche starten" title="Suche starten" /></td>
+ </tr></table>
+ </form>
+ </div>
+ </div>
+ <div id="menu-bottom"></div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+ <div id="mainContent-700">
+
+ <div class="submenu" id="_700">
+
+ <!-- InstanceBeginEditable name="optional-entries-700" -->
+ <!-- InstanceEndEditable -->
+ <div class="start"></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/index.html">General</a></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/info.html">Additional Info</a></div>
+ <div class="entry-active">
+ <a href="<%= request.getContextPath() %>/?locale=en"><acronym title="Portable Document Format" lang="en">PDF</acronym> Signatures (test)</a></div>
+ <div class="entry">
+ <a href="/test-signature-verification/?locale=en">Signature Verification (test)</a></div>
+ <div class="entry">
+ <a href="/en/pdf-signieren/downloads.html">Downloads</a></div>
+ <div class="clear"></div>
+
+ </div>
+
+
+ <!-- Start Content -->
+ <!-- InstanceBeginEditable name="Content-700" -->
+ <div id="content-middle-700">
+ <decorator:body/>
+ </div>
+ <!-- InstanceEndEditable -->
+ <div id="content-bottom-700"></div>
+ </div>
+ </div>
+
+
+
+
+
+</body>
+<!-- InstanceEnd --></html>
diff --git a/src/main/webapp/sitemesh/standalone.jsp b/src/main/webapp/sitemesh/standalone.jsp index 691857f..f87766b 100644 --- a/src/main/webapp/sitemesh/standalone.jsp +++ b/src/main/webapp/sitemesh/standalone.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator"%>
<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
-<html:html xhtml="true">
+<html>
<head>
<decorator:head/>
@@ -14,4 +14,4 @@ <body><decorator:body/></body>
-</html:html>
+</html>
|
