From ebd7e620fca36b0b545ebcaaaff8d092e1c42e22 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Mon, 22 Feb 2021 10:17:20 +0100 Subject: Fix type in property "gui.countryselection.cancel" --- basicConfig/templates/countrySelection.html | 50 ++++----- .../templates/countrySelection_example.html | 124 ++++++++++----------- 2 files changed, 87 insertions(+), 87 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/countrySelection.html b/basicConfig/templates/countrySelection.html index 7fbc9464..2483030b 100644 --- a/basicConfig/templates/countrySelection.html +++ b/basicConfig/templates/countrySelection.html @@ -2,7 +2,7 @@ + th:with="lang=${#locale.language}" th:lang="${lang}"> @@ -17,17 +17,17 @@ body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } -div.header { +div.header { background-color: #e9ecef; padding-top: 28px; padding-left: 137px; padding-right: 137px; padding-bottom: 12px; } -div.titlebar { +div.titlebar { padding: 0px; } -div.titlebar div { +div.titlebar div { } .hidden { display: none; @@ -40,7 +40,7 @@ ul.nav_oben { } li { display: inline-block; -} +} div.header a { text-decoration: none; color: black; @@ -55,7 +55,7 @@ a { padding-bottom: 20px; } @media only screen and (min-width: 1000px) { - div.header { + div.header { padding-left: 137px; padding-right: 137px; } @@ -69,7 +69,7 @@ a { } } @media only screen and (max-width: 999px) { - div.header { + div.header { padding-left: 1em; padding-right: 1em; } @@ -114,10 +114,10 @@ footer { font-size: 80%; } #countries { - padding-bottom: 40px; + padding-bottom: 40px; } #country { - padding-bottom: 20px; + padding-bottom: 20px; } input[type=submit] { width: inherit; @@ -131,7 +131,7 @@ form { /* Element.closest polyfill - https://developer.mozilla.org/en-US/docs/Web/API/Element/closest License: public domain*/ if (!Element.prototype.matches) - Element.prototype.matches = Element.prototype.msMatchesSelector || + Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector; if (!Element.prototype.closest) @@ -141,7 +141,7 @@ if (!Element.prototype.closest) do { if (el.matches(s)) return el; el = el.parentElement || el.parentNode; - } while (el !== null && el.nodeType === 1); + } while (el !== null && el.nodeType === 1); return null; }; @@ -149,7 +149,7 @@ if (!Element.prototype.closest) function clickCountryFlag(element) { if (!element) return false; - var form = element.closest("form"); + var form = element.closest("form"); if (!form) return false; @@ -188,43 +188,43 @@ function clickCountryFlag(element) {

Wählen Sie Ihr Land / Select your country

- + - +

- -

Wenn Sie Ihr Land in dieser Aufzählung nicht entdecken ...

- +

Wenn Sie Ihr Land in dieser Aufzählung nicht entdecken ...

+

Information zur Anmeldung über Europäische eIDs

- first part - Bundesministerium für Inneres + first part + Bundesministerium für Inneres second part

- +

third part - eIDAS-Verordnung der Europäischen Union + eIDAS-Verordnung der Europäischen Union fourth part

fived part - sixed part + sixed part

diff --git a/basicConfig/templates/countrySelection_example.html b/basicConfig/templates/countrySelection_example.html index 3b7c2d50..2128f14d 100644 --- a/basicConfig/templates/countrySelection_example.html +++ b/basicConfig/templates/countrySelection_example.html @@ -3,12 +3,12 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="fragments/base" th:with="lang=${#locale.language}" th:lang="${lang}"> - + - + eIDAS-Login Länderauswahl @@ -17,194 +17,194 @@

LanguageSelectionBlock

- +

Select your country

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

- - - + -- cgit v1.2.3 From cbf1d0408519d0763a1a87b733c16a1ba5d022ba Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 7 Jul 2021 09:31:43 +0200 Subject: add HTML template for additional eID information --- basicConfig/templates/other_login_method.html | 218 ++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 basicConfig/templates/other_login_method.html (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html new file mode 100644 index 00000000..1e2fb8f3 --- /dev/null +++ b/basicConfig/templates/other_login_method.html @@ -0,0 +1,218 @@ + + + + + + + eIDAS-Login Länderauswahl + + + + + +

+

+

Zentraler eIDAS Knoten der Republik Österreich

+

Betrieben durch das Bundesministerium für Inneres

+

+ +

Zuordnung Ihrer Anmeldeinformationen

+ +

Ihre Anmeldeinformationen konnten nicht eindeutig in das österreichische eID System integriert werden. + Für eine eindeutig Integration sind weitere Informationen erforderlich.

+ + +

+ + + + + + +

+ + + + + + +

Information zur Anmeldung über Europäische eIDs

+

+ first part + Bundesministerium für Inneres + second part +

+ +

+ third part + eIDAS-Verordnung der Europäischen Union + fourth part +

+ +

fived part + + sixed part +

+ +

+ + + -- cgit v1.2.3 From 09af792ce3ed3df430f8d7ae6099f284756147a0 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Mon, 12 Jul 2021 11:00:48 +0200 Subject: Add option to provide alternative eIDAS login for matching process --- basicConfig/templates/other_login_method.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html index 1e2fb8f3..035c359f 100644 --- a/basicConfig/templates/other_login_method.html +++ b/basicConfig/templates/other_login_method.html @@ -167,12 +167,11 @@ form { - - +

-- cgit v1.2.3 From f02787f6186169aef9e5fc131b4c82cded1b615a Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Tue, 16 Nov 2021 15:02:30 +0100 Subject: update 'advanced matching steps' tasks to optimize user handling between 'ID Austria Login', 'alternative eIDAS Login', and 'address search' --- basicConfig/templates/other_login_method.html | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html index 035c359f..fffe3930 100644 --- a/basicConfig/templates/other_login_method.html +++ b/basicConfig/templates/other_login_method.html @@ -160,6 +160,10 @@ form { Für eine eindeutig Integration sind weitere Informationen erforderlich.

+

+ Info

+

+

@@ -178,6 +182,12 @@ form { + +

-- cgit v1.2.3 From 401cd39689d73f1cc865bb3c7cfca40a3f5ac625 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Wed, 1 Dec 2021 14:46:18 +0100 Subject: Add simple page to search for an Austrian Address --- basicConfig/templates/residency.html | 80 ++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 basicConfig/templates/residency.html (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html new file mode 100644 index 00000000..96fa13f8 --- /dev/null +++ b/basicConfig/templates/residency.html @@ -0,0 +1,80 @@ + + + + + + + + + Österreichischer Wohnsitz + + + + +

+

+ LanguageSelectionBlock +

+ +

Search your Austrian Residency

+ +

+

+

Infotext

+

+ +

+ + + +

+ + -- cgit v1.2.3 From e5934d538aabcfc1f3b92472753de729d6ce1cce Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 09:06:55 +0100 Subject: Search with user provided input in ZMR for addresses --- basicConfig/templates/residency.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 96fa13f8..3c3c05d7 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -20,7 +20,8 @@ url: "http://localhost:8080/ms_connector/residency/search", data: $("#inputForm").serialize() }).done(function (data, textStatus, jqXHR) { - $("#inputCity").val(data["city"]); + $("#inputMunicipality").val(data["municipality"]); + $("#inputVillage").val(data["village"]); $("#inputStreet").val(data["street"]); $("#inputNumber").val(data["number"]); $("#textInfo").text(updatedText); @@ -43,11 +44,15 @@

Infotext

-

- City - + Municipality + +

+

+ Village +

Street -- cgit v1.2.3 From 6fff1b53525348d531c96b45c920a8ce72288f60 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 15:03:09 +0100 Subject: Display all results to user after residency search --- basicConfig/templates/residency.html | 122 ++++++++++++++++++++++++++++++----- 1 file changed, 105 insertions(+), 17 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 3c3c05d7..9dc1153d 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -12,24 +12,86 @@ th:attr="src=@{/static/js/jquery-3.6.0.min.js}"> Österreichischer Wohnsitz + @@ -41,38 +103,64 @@

Search your Austrian Residency

-

-

Infotext

-

+

Please enter a Municipality or Village first

- Municipality - + Municipality +

- Village - + Village +

- Street - + Street +

- Number - + Number +

+

+ +

+

+

+

+

+

+

+

+ + + + + + + + + + + + + +

Municipality	Village	Street	Number	Apply

+

+

-- cgit v1.2.3 From ac56869c2a981e40d6cf4637fb8fd46c06207c9d Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 16:05:57 +0100 Subject: Add PLZ to search for adresses in ZMR --- basicConfig/templates/residency.html | 312 ++++++++++++++++++----------------- 1 file changed, 162 insertions(+), 150 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 9dc1153d..b434b9f9 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -5,168 +5,180 @@ th:with="lang=${#locale.language}" th:lang="${lang}"> - - - - - Österreichischer Wohnsitz - + Österreichischer Wohnsitz + - + function clearInput() { + $("#inputForm #inputMunicipality").val(""); + $("#inputForm #inputVillage").val(""); + $("#inputForm #inputStreet").val(""); + $("#inputForm #inputNumber").val(""); + $("#textResult").hide(); + $("#tableResult").hide(); + } + +

-

- LanguageSelectionBlock -

+

+ LanguageSelectionBlock +

-

Search your Austrian Residency

+

Search your Austrian Residency

-

- -

Please enter a Municipality or Village first

-

- Municipality - -

-

- Village - -

-

- Street - -

-

- Number - -

-

- -

-

- -

-

- -

-

-

-

- - -

- -

-

-

+

+

- - - - - - - - - - - - -

Municipality	Village	Street	Number	Apply

-

+

+

+

+

+ + + + + + + + + + + + + + +

Postleitzahl	Municipality	Village	Street	Number	Apply

+

- +

-- cgit v1.2.3 From 8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Tue, 7 Dec 2021 07:51:10 +0100 Subject: Unify HTML templates across test, main, basicConfig --- basicConfig/templates/other_login_method.html | 264 ++++++-------------------- basicConfig/templates/residency.html | 39 +++- 2 files changed, 90 insertions(+), 213 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html index fffe3930..c233c5c4 100644 --- a/basicConfig/templates/other_login_method.html +++ b/basicConfig/templates/other_login_method.html @@ -4,224 +4,74 @@ layout:decorator="fragments/base" th:with="lang=${#locale.language}" th:lang="${lang}"> - - - - eIDAS-Login Länderauswahl - - + + + + eIDAS-Login Other Login Methods -

+

-

-

-
- LanguageSelectionBlock -
-
Startseite BMI

+

+ + Logo BMI

+

+
+ LanguageSelectionBlock +
+
+ Startseite + BMI +

-

-

+

+

-

Zentraler eIDAS Knoten der Republik Österreich

-

Betrieben durch das Bundesministerium für Inneres

+

Zentraler eIDAS Knoten der Republik Österreich

+

Betrieben durch das Bundesministerium für Inneres

-

Zuordnung Ihrer Anmeldeinformationen

- -

Ihre Anmeldeinformationen konnten nicht eindeutig in das österreichische eID System integriert werden. - Für eine eindeutig Integration sind weitere Informationen erforderlich.

- - -

- Info

+

Select an alternative login method

+ +

+ + +

-

- - - - - - - -

- - - - -

Information zur Anmeldung über Europäische eIDs

-

- first part - Bundesministerium für Inneres - second part -

- -

- third part - eIDAS-Verordnung der Europäischen Union - fourth part -

- -

fived part - - sixed part -

- -

- +

+ diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index b434b9f9..8192a068 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -3,7 +3,6 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="fragments/base" th:with="lang=${#locale.language}" th:lang="${lang}"> - @@ -102,17 +101,41 @@ -

-

- LanguageSelectionBlock + +

+

+

Zentraler eIDAS Knoten der Republik Österreich

+

Betrieben durch das Bundesministerium für Inneres

-

Search your Austrian Residency

+

Search your Austrian Residency

+ -- cgit v1.2.3 From 02c69d2a137663f5aeefcb4cfacd1a163e7af5db Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Tue, 7 Dec 2021 08:33:36 +0100 Subject: Rework styling of residency search template --- basicConfig/templates/residency.html | 119 +++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 40 deletions(-) (limited to 'basicConfig/templates') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 8192a068..7a832aea 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -6,8 +6,8 @@ - - Österreichischer Wohnsitz @@ -135,7 +176,8 @@

+ + +

+ +

+

-

+

- +

- + - - + @@ -196,13 +242,6 @@

- -