6 files changed, 82 insertions, 29 deletions
diff --git a/id/templates/.classpath b/id/templates/.classpath
new file mode 100644
index 000000000..5d93de69c
--- /dev/null
+++ b/id/templates/.classpath
@@ -0,0 +1,4 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
+\ No newline at end of file
diff --git a/id/templates/.project b/id/templates/.project
new file mode 100644
index 000000000..f0a8631ce
--- /dev/null
+++ b/id/templates/.project
@@ -0,0 +1,14 @@
+<projectDescription>
+  <name>moa-id-templates</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+      <arguments/>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
+\ No newline at end of file
diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c959c9def
--- /dev/null
+++ b/id/templates/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Aug 22 09:50:02 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.compliance=1.3
diff --git a/id/templates/pom.xml b/id/templates/pom.xml
index bbcd53262..ea6ac7c4f 100644
--- a/id/templates/pom.xml
+++ b/id/templates/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>1.4.2beta1</version>
+        <version>1.4.2beta2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id-templates</artifactId>
     <packaging>war</packaging>
-    <version>1.4.2beta1</version>
+    <version>1.4.2beta2</version>
     <name>MOA ID Sample Templates</name>
 
     <properties>
diff --git a/id/templates/src/main/webapp/SampleInputProcessorSignTemplate.html b/id/templates/src/main/webapp/SampleInputProcessorSignTemplate.html
new file mode 100644
index 000000000..c9b0a37b3
--- /dev/null
+++ b/id/templates/src/main/webapp/SampleInputProcessorSignTemplate.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>MOA ID - Identifizierter Zugang mit B&uuml;rgerkarte</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta name="Author" content="Max Mustermann">
+  <meta name="keywords" content="MOA-ID">
+  <link rel="stylesheet" type="text/css" href="/moaid-templates/css/main.css">
+  <link rel="stylesheet" type="text/css" href="/moaid-templates/css/display.css" media="screen,projection,tv,handheld">
+  <script language="javascript" type="text/javascript">
+    //<!--
+    function autoSubmit() {
+      document.VerifyAuthBlockForm.submitButton.disabled=true;
+      document.VerifyAuthBlockForm.submit();
+    } //-->
+  </script>
+</head>
+
+<body onLoad="autoSubmit()">
+<img src="/moaid-templates/SampleLogo.gif" alt='Organisation XY'>
+<h1 align="center">Sicherer Zugang zur Online-Anwendung mit B&uuml;rgerkarte</h1>
+<p></p>
+
+Der identifizierte Zugang erfolgt &uuml;ber die Module f&uuml;r Online Applikationen (MOA) unter Verwendung einer B&uuml;rgerkarte und deren Signaturfunktion.
+
+<p></p>
+<p>Sie werden in ku&uuml;rze zur Signatur der Anmeldedaten aufgefordert. Wenn sie diese
+signieren, so werden sie zur Online-Anwendung weitergeleitet und angemeldet.</p>
+
+<form name="VerifyAuthBlockForm" action="<BKU>" method="post" enctype="application/x-www-form-urlencoded">
+  <div align="center">
+    <input type="hidden" name="XMLRequest" value="<XMLRequest>"/>
+    <input type="hidden" name="DataURL" value="<DataURL>"/>
+    <input type="hidden" name="PushInfobox" value="<PushInfobox>"/>
+    <input type="submit" value="Signieren der Anmeldedaten" id="submitButton"/>
+  </div>
+</form>
+
+<div align="right"><a href="http://validator.w3.org/check?uri=http://localhost:8080/moaid-templates/SampleTemplate.html"><img border="0"
+          src="/moaid-templates/valid-html401.gif"
+          alt="Valid HTML 4.01!" height="31" width="88"></a> </div>
+<p align="right">&nbsp; </p>
+
+</body>
+</html>
diff --git a/id/templates/src/main/webapp/SampleTemplate.html b/id/templates/src/main/webapp/SampleTemplate.html
index e9756a036..824c7153c 100644
--- a/id/templates/src/main/webapp/SampleTemplate.html
+++ b/id/templates/src/main/webapp/SampleTemplate.html
@@ -2,11 +2,11 @@
 <html>
 <head>
 <title>MOA ID - Identifizierter Zugang mit B&uuml;rgerkarte</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="Author" content="Max Mustermann">
-	<meta name="keywords" content="MOA-ID">
-    <link rel="stylesheet" type="text/css" href="/moaid-templates/css/main.css">
-    <link rel="stylesheet" type="text/css" href="/moaid-templates/css/display.css" media="screen,projection,tv,handheld">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta name="Author" content="Max Mustermann">
+  <meta name="keywords" content="MOA-ID">
+  <link rel="stylesheet" type="text/css" href="/moaid-templates/css/main.css">
+  <link rel="stylesheet" type="text/css" href="/moaid-templates/css/display.css" media="screen,projection,tv,handheld">
 </head>
 
 <body>
@@ -24,33 +24,18 @@ signieren, so werden sie zur Online-Anwendung weitergeleitet und angemeldet.</p>
 
 <form name="CustomizedForm" action="<BKU>" method="post">
   <div align="center">
-    <input type="hidden"
-        name="XMLRequest"
-        value="<XMLRequest>"/>
-    <input type="hidden"
-        name="DataURL"
-        value="<DataURL>"/>
-    <input type="hidden"
-        name="PushInfobox"
-        value="<PushInfobox>"/>
+    <input type="hidden" name="XMLRequest" value="<XMLRequest>"/>
+    <input type="hidden" name="DataURL" value="<DataURL>"/>
+    <input type="hidden" name="PushInfobox" value="<PushInfobox>"/>
     <input type="submit" value="Anmeldung mit B&uuml;rgerkarte" name="submit"/>
   </div>
 </form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
-  <input type="hidden"
-        name="XMLRequest"
-        value="<CertInfoXMLRequest>"/>
-    <input type="hidden"
-        name="DataURL"
-        value="<CertInfoDataURL>"/>
-
-
+<form name="CustomizedInfoForm" action="<BKU>" method="post">
+  <input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>"/>
+  <input type="hidden" name="DataURL" value="<CertInfoDataURL>"/>
 <br/>
 <p></p>
-
- <input type="hidden" value="Weitere Info"/>
+  <input type="hidden" value="Weitere Info"/>
 </form>
 
 <div align="right"><a href="http://validator.w3.org/check?uri=http://localhost:8080/moaid-templates/SampleTemplate.html"><img border="0"