From 453bd7f12223fe4e58049bb8f2f40d80d80bccd7 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Tue, 7 Feb 2012 16:15:24 +0000 Subject: =?UTF-8?q?*=20Alte=20MOCCA=20Signaturen=20wieder=20pr=C3=BCfbar?= =?UTF-8?q?=20(Parsererror=20fehlendes=20Target=20Attribut=20in=20Qualifyi?= =?UTF-8?q?ngProperties=20wird=20ignoriert)=20*=20Update=20MOA=20Template?= =?UTF-8?q?=20f=C3=BCr=20B=C3=BCrgerkartenauswahl=20(No-Script-Variante,?= =?UTF-8?q?=20Update=20Bilder=20und=20Text)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1235 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../main/webapp/BKAuswahl-MOA-Template-Howto.pdf | Bin 191887 -> 193669 bytes id/server/auth/src/main/webapp/css/mandates.css | 57 -- id/server/auth/src/main/webapp/css/styles.css | 741 --------------------- .../auth/src/main/webapp/css/styles_opera.css | 11 - id/server/auth/src/main/webapp/iframeHandyBKU.html | 12 +- .../auth/src/main/webapp/iframeOnlineBKU.html | 6 +- .../auth/src/main/webapp/img/bk_aktivieren.jpg | Bin 0 -> 30471 bytes .../auth/src/main/webapp/img/ecard_aktivieren.jpg | Bin 3767 -> 0 bytes .../auth/src/main/webapp/img/egov_schrift.gif | Bin 1843 -> 0 bytes id/server/auth/src/main/webapp/img/info.gif | Bin 892 -> 0 bytes id/server/auth/src/main/webapp/img/infobutton.gif | Bin 868 -> 0 bytes .../src/main/webapp/img/mobilsig_aktivieren.jpg | Bin 3758 -> 0 bytes id/server/auth/src/main/webapp/img/rufezeichen.gif | Bin 844 -> 0 bytes id/server/auth/src/main/webapp/img/stern.gif | Bin 856 -> 0 bytes id/server/auth/src/main/webapp/index.html | 100 ++- id/server/auth/src/main/webapp/info_bk.html | 38 +- id/server/auth/src/main/webapp/javascript/fa.js | 8 - .../auth/src/main/webapp/javascript/formallg.js | 315 --------- .../auth/src/main/webapp/template_handyBKU.html | 7 +- .../auth/src/main/webapp/template_localBKU.html | 5 +- .../auth/src/main/webapp/template_onlineBKU.html | 5 +- .../AuthenticationBlockAssertionBuilder.java | 4 +- .../CreateXMLSignatureResponseValidator.java | 2 +- .../moa/id/util/ParamValidatorUtils.java | 2 + 24 files changed, 112 insertions(+), 1201 deletions(-) delete mode 100644 id/server/auth/src/main/webapp/css/mandates.css delete mode 100644 id/server/auth/src/main/webapp/css/styles.css delete mode 100644 id/server/auth/src/main/webapp/css/styles_opera.css create mode 100644 id/server/auth/src/main/webapp/img/bk_aktivieren.jpg delete mode 100644 id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg delete mode 100644 id/server/auth/src/main/webapp/img/egov_schrift.gif delete mode 100644 id/server/auth/src/main/webapp/img/info.gif delete mode 100644 id/server/auth/src/main/webapp/img/infobutton.gif delete mode 100644 id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg delete mode 100644 id/server/auth/src/main/webapp/img/rufezeichen.gif delete mode 100644 id/server/auth/src/main/webapp/img/stern.gif delete mode 100644 id/server/auth/src/main/webapp/javascript/fa.js delete mode 100644 id/server/auth/src/main/webapp/javascript/formallg.js (limited to 'id') diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf index 77c32e35e..857fcc1dd 100644 Binary files a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ diff --git a/id/server/auth/src/main/webapp/css/mandates.css b/id/server/auth/src/main/webapp/css/mandates.css deleted file mode 100644 index 7b6e550f0..000000000 --- a/id/server/auth/src/main/webapp/css/mandates.css +++ /dev/null @@ -1,57 +0,0 @@ -/* CSS Document */ - -.hleft { - float: left; - width: 50%; -} - -.hright { - float: left; - width: 49%; -} - -.htitle { - padding-top: 15px; - clear: both; -} - -.leiste1 { - background-color: #FF0000; - color: #FFFFFF; - font-weight: bold; - width: 15%; - float: left; - clear: left; - height: 20px; - padding-top: 5px; - padding-bottom: 5px; - FONT-SIZE: 0.9em; -} - -.leiste2 { - background-color: #CCCCCC; - color: #000000; - float: left; - height: 20px; - width: 33%; - padding-top: 5px; - padding-bottom: 5px; -} - -a.info { - color: #000000; - text-decoration: underline; -} - - -.leiste3 { - background-color: #CCCCCC; - color: #000000; - height: 20px; - float: left; - width: 17%; - padding-top: 5px; - padding-bottom: 5px; - FONT-SIZE: 0.8em; - -} diff --git a/id/server/auth/src/main/webapp/css/styles.css b/id/server/auth/src/main/webapp/css/styles.css deleted file mode 100644 index d91b993d1..000000000 --- a/id/server/auth/src/main/webapp/css/styles.css +++ /dev/null @@ -1,741 +0,0 @@ -/* -|| Groesse der Seite auf A4 setzen -|| Rand auf jeweils 10% der Seite setzen -*/ - -@page { - size: 21cm 29.7cm; - margin: 10%; -} - -/* -|| Font und Farben, die fuer das gesamte Dokument gueltig sind. -*/ - -body { - font-family: arial, helvetica, sans-serif; - background-color: white; - color: black; -} - -/* -|| Eingabefelder verwenden eine Monospace-Font (s. Laenderstyleguide 5.1) -*/ - -input, textarea, select { - font-family: monospace; -} - -/* -|| Schriftgroesse fuer Formulartitel -*/ - -h1 { - font-size: 1.3em; -} - -/* -|| Definitionen fuer die Kategorien (faerbiger Balken) -*/ - -h2 { - width: 98%; - background-color: #A02D2D; - color: white; - font-weight: bold; - font-size: 1em; - padding: 0.3em; - border-width: thin; - margin-bottom: 1em; -} - -/* -|| Subkategorie (zB Adresse innerhalb von Stammgewerbeberechtigung) -*/ - -h3 { - padding: 5px; - margin-bottom: 1px; - font-size: 0.8em; -} - -/* -|| Informationstext zu einer Kategorie -*/ - -h4 { - margin-bottom: 0.5em; - font-size: 0.8em; -} - -fieldset { - border: none; -} - -} - -legend { - display: none; -} - - -/* -|| Informationstext im Info-Kaestchen -*/ - -.infotext { - padding: 0.8em; - float: left; - background-color: #EEEEEE; - color: black; - font-size: 0.8em; -} - -/* -|| Info-Link im Info-Kaestchen -*/ - -.infobutton { - float: left; - width: 2em; - background-color: red; - text-align: center; - font-size: 1.5em; - color: white; - font-weight: bold; - padding: 0.4em; - border-width: 0.25em; - border-style: outset; - border-style: -moz-bg-outset; -} - -/* -|| Info-Link soll weiss sein -*/ - -.infobutton a:link { - background-color: red; - color: white; - text-decoration: none; - -} - -/* -|| Info-Link soll weiss sein, auch wenn Link schon einmal angeklickt wurde -*/ - -.infobutton a:visited { - background-color: red; - color: white; -} - -/* -|| Info-Link-Text soll weiss sein, auch wenn man mit der Maus drueberfaehrt -*/ - -.infobutton a:hover { - background-color: red; - color: white; -} - -/* -|| Begrenzung fuer das Info-Kaestchen -*/ - -.boundinginfobox { - width: 99%; - background-color: #EEEEEE; - color: black; - border-width: thin; -} - -/* -|| Begrenzung fuer Eingabefeldbereiche -*/ - -.boundingbox { - width: 99%; - background-color: #EEEEEE; - color: black; - border-width: thin; - margin-bottom: 1em; -} - -/* -|| Begrenzung, die Leittexte und Formulardaten im statischen Formular -|| zusammenhaelt, sodass es bei einem Seitenumbruch beim Ausdruck -|| nicht zu Verschiebungen kommt -*/ -.printboundingbox { - width: 99%; -} - -/* -|| Bereich fuer die Leittexte -*/ - -.labelarea { - text-align: right; - width: 17%; - float: left; - padding: 5px; - font-size: 0.8em; - vertical-align: middle; -} - -/* -|| Bereich fuer sehr lange Leittexte -*/ - -.labelareawidened { - text-align: right; - width: 50%; - float: left; - padding: 5px; - font-size: 0.8em; - vertical-align: middle; -} - -/* -|| Leittextbereich ohne Angabe einer Breite (z.B. bei Stiege und Tuer; sonst generell (.labelarea) 17% der Gesamtbreite) -*/ - -.labelareanowidth { - float: left; - padding: 5px; - font-size: 0.8em; - vertical-align: middle; -} - -/* -|| Legendenbereich (Icons) -*/ - -.legendarea { - width: 30px; - text-align: left; - float: left; - padding-left: 4px; - padding-top: 5px; - vertical-align: middle; -} - -/* -|| Legendenbereich fuer den Stern (in Kombination mit einem Rufzeichen) -*/ - -.legendareastar { - width: 13px; - float: left; - padding-left: 4px; - padding-top: 5px; - vertical-align: middle; -} - -/* -|| Legendenbereich fuer das Info-Icon -*/ - -.legendareainfo { - width: 17px; - float: left; - padding-top: 5px; - vertical-align: middle; -} - -/* -|| Bereich fuer ein einzelnes Eingabefeld -*/ - -.inputfieldarea { - float: left; - padding: 4px; -} - -/* -|| Bereich fuer das erste Eingabefeld, wenn zwei in einer Zeile -|| = Eingabefeldbereich, dessen Breite auf 26% begrenzt ist (.inputfieldarea hat keine Begrenzung) -*/ - -.inputfieldareafortwo { - width: 26%; - float: left; - padding: 4px; -} - - -/* -|| e-Goverment Schriftzug im Logo -*/ - -.egovlogo { - text-align: center; - background-color: white; - color: #008B8B; - font-weight: bold; - font-style: italic; - font-size: 1.7em; -} - -/* -|| help.gv.at-Schriftzug im Logo -*/ - -.egovtext { - text-align: center; - background-color: white; - color: black; - font-weight: bold; - font-size: 1.2em; -} - -/* -|| Bereich fuer den Titel des Formulars links vom Logo -*/ - -.titlebox { - float: left; - width: 65%; - margin-bottom: 1em; -} - -/* -|| Bereich fuer das Logo -*/ - -.logobox { - float: right; - margin-bottom: 1em; -} - -/* -|| Allgemeiner Informationstext zu einem Formular (zwischen Formulartitel -|| und Info-Kaestchen -*/ - -.introtext { - font-weight: bold; - margin-bottom: 1em; -} - -/* -|| Link "Zum Formularanfang" -*/ - -.formtop { - float: right; -} - -/* -|| Bereich fuer die Steuerungs-Buttons (Senden, Abbrechen, etc.) -*/ - -.buttonarea { - margin-top: 0.5em; - text-align: center; -} - -/* -|| Aussehen der Steuerungs-Buttons -*/ - -.button { - font-family: arial, helvetica, sans-serif; - font-size: 1em; -} - -/* -|| Formularkennung/Fusszeile des Formulars -*/ - -.formid { - float: left; - font-style: italic; - font-size: 0.8em; - background-color: #008B8B; - color: white; - padding: 0.5em; -} - -/* -|| Behoerdenanschrift -*/ - -.organizationaddress { - font-style: italic; - margin-top: 1em; - margin-bottom: 1em; -} - -/* -|| Behoerdenanschrift mit Logo -*/ - -.organizationaddresslogo { - font-style: italic; - margin-top: 1em; - margin-bottom: 1em; - float: left; -} - -/* -|| Beilagen-Tabelle -*/ - -.attachmenttable { - width: 99%; - background-color: #EEEEEE; - color: black; - border-width: thin; - border-collapse: collapse; - margin-bottom: 1em; -} - -/* -|| Spaltenueberschrift "lfd Nr" -*/ - -.attachmenttitlenumber { - border-bottom: thin solid black; - border-right: thin solid black; - padding: 0.3em; - font-size: 0.8em; -} - -/* -|| Spaltenueberschrift "Beilage" -*/ - -.attachmenttitlename { - border-bottom: thin solid black; - border-right: thin solid black; - padding: 0.5em; - text-align: left; - font-size: 0.8em; -} - - -/* -|| Spaltenueberschriften "nachgereicht" und "angefuegt" -*/ - -.attachmenttitleselection { - padding: 0.3em; - text-align: center; - border-left: thin solid black; - border-bottom: thin solid black; - font-size: 0.8em; -} - -/* -|| Spaltenueberschrift "Datei" -*/ - -.attachmenttitlefile { - padding: 0.3em; - text-align: left; - border-bottom: thin solid black; - font-size: 0.8em; -} - -/* -|| Zellen der Spalte "lfd Nr" -*/ - -.attachmentnumber { - text-align: center; - border-left: thin solid #EEEEEE; - border-right: thin solid black; - padding: 0.3em; - font-size: 0.8em; -} - -/* -|| Zellen der Spalte "Beilage" -*/ - -.attachmentname { - text-align: left; - border-left: thin solid black; - border-right: thin solid black; - padding: 0.5em; - font-size: 0.8em; -} - -/* -|| Zellen der Spalte "Datei" -*/ - -.attachmentfile { - text-align: left; - border-right: thin solid #EEEEEE; - padding: 0.3em; -} - -/* -|| Zellen der Spalte "angefuegt" -*/ - -.attachmentselectiononline { - text-align: center; - padding: 0.3em; - border-left: solid black thin; -} - -/* -|| Zellen der Spalte "nachgereicht" -*/ - -.attachmentselectionpost { - text-align: center; - border-left: solid black thin; - padding: 0.3em; -} - -/* -|| unsichtbarer Bereich -*/ - -.hide { - visibility: hidden; - display: none; -} - -/* -|| sichtbarer Bereich -*/ - -.show { - visibility: visible; - display: block; -} - -/* -|| readonly-Felder -*/ - -.deactive { - background-color: #D3D3D3; - color: gray; -} - -/* -|| Fehlertexte (bei fehlerhaften Eingaben) -*/ - -.errortext { - color: red; - background-color: white; - font-size: 1em; - border: solid red 2px; - padding: 0.5em; - width: 97%; -} - -.errortext a:visited , .errortext a:link, .errortext a:hover { - color: red; -} - -/* -|| simuliertes Readonly-Eingabefeld, das in Wirklichkeit -|| Text mit einem Rahmen ist -*/ - -.readonlybutton { - width: 20em; - background-color: #D3D3D3; - color: gray; - border-color: gray; - border-width: thin; - border-style: inset; - font-family: monospace; -} - -/* -|| Vertikale Ausrichtung des Info-Icons im Beilagenbereich -*/ - -.imagevertalign { - vertical-align: middle; -} - -/* -|| Unterbindet Rahmen bei Bildern mit hinterlegtem Link -*/ - -a img { - border: none; -} - -/* -|| MOA-Ergebnis-Tabelle -*/ - -.MOA-SP-ergebnis-tabelle { - width: 100%; - border: thin solid black; - border-collapse: collapse; - margin-bottom: 1em; -} - -/* -|| MOA-Ergebnis-Tabellenemelemente -*/ - -.MOA-SP-ergebnis-zelle, .MOA-SP-ergebnis-header { - border: thin solid black; - text-align: left; - padding: 0.3em; - background-color: #EEEEEE; -} - -/* -|| MOA-Ergebnis-Tabelle Fehlermeldungen -*/ - -.moa-sp-error { - color: red; - font-weight: bold; -} - -/* -|| Signaturblock-Tabelle -*/ - -.sigblock-tabelle { - width: 100%; - border: thin solid black; - border-collapse: collapse; - margin-bottom: 1em; -} - -/* -|| Signaturblock-Tabellenelemente -*/ - -.sigblock-zelle, .sigblock-header { - border: thin solid black; - text-align: left; - padding: 0.3em; - background-color: #EEEEEE; -} - -/* -|| Formular mit mehreren Seiten, Angabe der aktuellen Seite -*/ - -.steps { - text-align: right; - font-weight: bold; - padding: 0.3em; - margin-right: 0.3em; - font-style: italic; -} - -/* -|| Bereich fuer Formularliste -*/ - -.labelareaform { - text-align: left; - width: 50%; - float: left; - padding: 5px; - font-size: 0.8em; - font-weight: bold; - vertical-align: middle; -} - -/* -|| Bereich fuer Bestellung und Details bei Formularbestellungen -*/ - -.labelareaorderdetail { - text-align: center; - width: 17%; - float: left; - padding: 5px; - font-size: 0.8em; - vertical-align: middle; - font-weight: bold; -} - -/* -|| Farbe der Verfahrens-Tabellenzeilen mit geradem Index -*/ - -.evenformrow { - background-color: #EEEEEE; -} - -/* -|| Farbe der Verfahrens-Tabellenzeilen mit ungeradem Index -*/ - -.oddformrow { - background-color: lightgrey; -} - -/* -|| Sicherheitsabfrage in der Verfahrensverwaltung -*/ - -.checktext { - color: red; - padding: 0.5em; - border: solid 2px red; - margin: 1em; -} - -/* -|| Buttons der Eingangsstelle -*/ - -.eingang_button { - line-height: 2em; - border-width: 2px; - border-color: grey; - padding: 4px; - background-color: lightgrey; - border-style: outset; - border-style: -moz-bg-outset; -} - -/* -|| Buttonlinks der Eingangsstelle -*/ - -.eingang_button_link { - color: black; - text-decoration: none; -} - -/* -|| Für den Farbenwechsel bei den Beilagen-Tabellen -*/ - -table.attachmenttable tr.s -{ - background-color: lightgrey; -} - -/* -|| Farbe der Titelzeile bei den Beilagen-Tabellen -*/ - -table.attachmenttable thead -{ - background-color: #aaaaaa; -} - -/* -|| Aktuell fokussiertes Eingabefeld visuell hervorheben (Styleguide Anforderung) -*/ - -input:focus, input.field:focus, select:focus, textarea:focus { - border: 2px solid black; -} - -select:focus { - background-color: #FFFFFE; -} \ No newline at end of file diff --git a/id/server/auth/src/main/webapp/css/styles_opera.css b/id/server/auth/src/main/webapp/css/styles_opera.css deleted file mode 100644 index a2ea527bf..000000000 --- a/id/server/auth/src/main/webapp/css/styles_opera.css +++ /dev/null @@ -1,11 +0,0 @@ -/* -|| In Opera funktioniert das Aus- und Einblenden von HTML-Bloecken -|| mittels JavaScript-Zugriff auf DOM-Objekte nicht, daher muss -|| die Definition der Klasse .hide in diesem Browser durch eine -|| "sichtbare" Definition ueberlagert werden -*/ - -.hide { - visibility: visible; - display: block; -} \ No newline at end of file diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html index f07b73265..0f6e1e282 100644 --- a/id/server/auth/src/main/webapp/iframeHandyBKU.html +++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html @@ -45,17 +45,13 @@ - - - Bitte warten... - -
+ + Bitte warten... + -
- - +
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html index 4873245be..a039005e0 100644 --- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html +++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html @@ -48,14 +48,12 @@ - Bitte warten... - + Bitte warten...
-
- +
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg b/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg new file mode 100644 index 000000000..a6436dc72 Binary files /dev/null and b/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg differ diff --git a/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg b/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg deleted file mode 100644 index 2e8e87f86..000000000 Binary files a/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/egov_schrift.gif b/id/server/auth/src/main/webapp/img/egov_schrift.gif deleted file mode 100644 index aea64ef5e..000000000 Binary files a/id/server/auth/src/main/webapp/img/egov_schrift.gif and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/info.gif b/id/server/auth/src/main/webapp/img/info.gif deleted file mode 100644 index f9e1bb00f..000000000 Binary files a/id/server/auth/src/main/webapp/img/info.gif and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/infobutton.gif b/id/server/auth/src/main/webapp/img/infobutton.gif deleted file mode 100644 index 31e236e34..000000000 Binary files a/id/server/auth/src/main/webapp/img/infobutton.gif and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg b/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg deleted file mode 100644 index be1799b7a..000000000 Binary files a/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/rufezeichen.gif b/id/server/auth/src/main/webapp/img/rufezeichen.gif deleted file mode 100644 index fbad8d758..000000000 Binary files a/id/server/auth/src/main/webapp/img/rufezeichen.gif and /dev/null differ diff --git a/id/server/auth/src/main/webapp/img/stern.gif b/id/server/auth/src/main/webapp/img/stern.gif deleted file mode 100644 index 77c53d1c3..000000000 Binary files a/id/server/auth/src/main/webapp/img/stern.gif and /dev/null differ diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 6e60ae433..533f2830a 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -95,15 +95,9 @@

MOA-Template zur Bürgerkartenauswahl (Musterseite)

- - -
+ -
+
Logo
@@ -113,21 +107,70 @@ Login mit Bürgerkarte
- -
- -
- -
- -
+ + + + +
@@ -138,7 +181,7 @@
- +
@@ -154,9 +197,11 @@