diff options
Diffstat (limited to 'basicConfig')
| -rw-r--r-- | basicConfig/default_config.properties | 7 | ||||
| -rw-r--r-- | basicConfig/properties/messages_de.properties | 89 | ||||
| -rw-r--r-- | basicConfig/properties/messages_en.properties | 88 | ||||
| -rw-r--r-- | basicConfig/templates/countrySelection_example.html | 241 | ||||
| -rw-r--r-- | basicConfig/templates/eidas_node_forward.html | 36 | ||||
| -rw-r--r-- | basicConfig/templates/error_message.html | 42 | ||||
| -rw-r--r-- | basicConfig/templates/language_selection.html | 15 | 
7 files changed, 393 insertions, 125 deletions
| diff --git a/basicConfig/default_config.properties b/basicConfig/default_config.properties index 3a1af5ec..2ad1e24d 100644 --- a/basicConfig/default_config.properties +++ b/basicConfig/default_config.properties @@ -15,6 +15,13 @@ eidas.ms.revisionlog.logIPAddressOfUser=true  ##Directory for static Web content  eidas.ms.webcontent.static.directory=webcontent/ +eidas.ms.webcontent.templates=templates/ +eidas.ms.webcontent.properties=properties/messages + +## extended validation of pending-request Id's +eidas.ms.core.pendingrequestid.maxlifetime=300 +eidas.ms.core.pendingrequestid.digist.algorithm=HmacSHA256 +eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret  ## eIDAS Ref. Implementation connector ###  eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector diff --git a/basicConfig/properties/messages_de.properties b/basicConfig/properties/messages_de.properties new file mode 100644 index 00000000..945e66fd --- /dev/null +++ b/basicConfig/properties/messages_de.properties @@ -0,0 +1,89 @@ +####### GUI elements #### +gui.general.language.selection.title=Sprachauswahl +gui.general.language.selection.de=Deutsch +gui.general.language.selection.en=English + +##Errorpage template +gui.errorpage.msg.title=Es ist ein Fehler aufgetreten +gui.errorpage.msg.information=Der Anmeldevorgang wurde aufgrund eines Fehlers beendet: +gui.errorpage.msg.errorcode=Fehlercode   : +gui.errorpage.msg.errormsg=Fehlermeldung: +gui.errorpage.msg.stacktrace=Stacktrace: + +##Country-Selection page +gui.countryselection.title=eIDAS-Login Länderauswahl +gui.countryselection.logo.bmi.alt=Logo BMI +gui.countryselection.link.bmi=Startseite BMI +gui.countryselection.header1=Bundesministerium für Inneres +gui.countryselection.header2=Zentraler eIDAS Knoten der Republik Österreich +gui.countryselection.header3=Betrieben durch das Bundesministerium für Inneres +gui.countryselection.header.selection=Wählen Sie Ihr Land +gui.countryselection.cancle=Abbrechen +gui.countryselection.notsupportedinfo=Wenn Sie Ihr Land in dieser Aufzählung nicht entdecken, dann wird Ihre elektronische Identität (eID) leider noch nicht unterstützt. + +gui.countryselection.country.be=Belgien +gui.countryselection.country.be.logo.alt=Belgische-eID +gui.countryselection.country.hr=Kroatien +gui.countryselection.country.hr.logo.alt=Kroatische-eID +gui.countryselection.country.cy=Zypern +gui.countryselection.country.cy.logo.alt=Zypriotische-eID +gui.countryselection.country.cz=Tschechische Republik +gui.countryselection.country.cz.logo.alt=Tschechische Republik-eID +gui.countryselection.country.ee=Estland +gui.countryselection.country.ee.logo.alt=Estländische-eID +gui.countryselection.country.de=Deutschland +gui.countryselection.country.de.logo.alt=Deutsche-eID +gui.countryselection.country.is=Island +gui.countryselection.country.is.logo.alt=Isländische-eID +gui.countryselection.country.it=Italien +gui.countryselection.country.it.logo.alt=Italienische-eID +gui.countryselection.country.lt=Litauen +gui.countryselection.country.lt.logo.alt=Litauische-eID +gui.countryselection.country.lv=Lettland +gui.countryselection.country.lv.logo.alt=Lettländische-eID +gui.countryselection.country.nl=Niederlande +gui.countryselection.country.nl.logo.alt=Niederländische-eID +gui.countryselection.country.pl=Polen +gui.countryselection.country.pl.logo.alt=Polnische-eID +gui.countryselection.country.pt=Portugal +gui.countryselection.country.pt.logo.alt=Portugisische-eID +gui.countryselection.country.si=Slovenien +gui.countryselection.country.si.logo.alt=Slovenische-eID +gui.countryselection.country.es=Spanien +gui.countryselection.country.es.logo.alt=Spanische-eID + +gui.countryselection.country.bg=Bulgarien +gui.countryselection.country.bg.logo.alt=Bulgarische-eID +gui.countryselection.country.dk=Dänemark +gui.countryselection.country.dk.logo.alt=Dänische-eID +gui.countryselection.country.fi=Finnland +gui.countryselection.country.fi.logo.alt=Finische-eID +gui.countryselection.country.fr=Frankreich +gui.countryselection.country.fr.logo.alt=Französiche-eID +gui.countryselection.country.gr=Grichenland +gui.countryselection.country.gr.logo.alt=Grichische-eID +gui.countryselection.country.hu=Ungarn +gui.countryselection.country.hu.logo.alt=Ungarische-eID +gui.countryselection.country.ir=Irland +gui.countryselection.country.ir.logo.alt=Irische-eID +gui.countryselection.country.lu=Luxenburg +gui.countryselection.country.lu.logo.alt=Luxenburgische-eID +gui.countryselection.country.mt=Malta +gui.countryselection.country.mt.logo.alt=Malta-eID +gui.countryselection.country.ro=Romänien +gui.countryselection.country.ro.logo.alt=Romänische-eID +gui.countryselection.country.sk=Slovakei +gui.countryselection.country.sk.logo.alt=Slovakische-eID +gui.countryselection.country.sw=Schweden +gui.countryselection.country.sw.logo.alt=Schwedische-eID +gui.countryselection.country.uk=Großbritanien +gui.countryselection.country.uk.logo.alt=Britische-eID + +gui.countryselection.country.testcountry=Testland +gui.countryselection.country.testcountry.logo.alt=Testland-eID + +gui.countryselection.mode.prod=Produktion +gui.countryselection.mode.qs=Qualitätsicherung +gui.countryselection.mode.test=Test +gui.countryselection.mode.dev=Development + diff --git a/basicConfig/properties/messages_en.properties b/basicConfig/properties/messages_en.properties new file mode 100644 index 00000000..0d312c75 --- /dev/null +++ b/basicConfig/properties/messages_en.properties @@ -0,0 +1,88 @@ +####### GUI elements #### +gui.general.language.selection.title=Language selection +gui.general.language.selection.de=Deutsch +gui.general.language.selection.en=English + +##Errorpage template +gui.errorpage.msg.title=Authentication error arise +gui.errorpage.msg.information=The authentication stops on account of a process error: +gui.errorpage.msg.errorcode=Error    Code: +gui.errorpage.msg.errormsg=Error Message: +gui.errorpage.msg.stacktrace=Stacktrace: + +##Country-Selection page +gui.countryselection.title=eIDAS-Login Countryselection +gui.countryselection.logo.bmi.alt=Logo BMI +gui.countryselection.link.bmi=Mainpage BMI +gui.countryselection.header1=Federal Ministry of Internal Affairs +gui.countryselection.header2=Austrian Central eIDAS Node +gui.countryselection.header3=Operated by Federal Ministry of Internal Affairs +gui.countryselection.header.selection=Select your country +gui.countryselection.cancle=Cancel +gui.countryselection.notsupportedinfo=If you cannot find your country in this list then your electronic identity (eID) is not yet supported. + +gui.countryselection.country.be=Belgium +gui.countryselection.country.be.logo.alt=Belgium-eID +gui.countryselection.country.hr=Croatia +gui.countryselection.country.hr.logo.alt=Croatia-eID +gui.countryselection.country.cy=Cyprus +gui.countryselection.country.cy.logo.alt=Cyprus-eID +gui.countryselection.country.cz=Czech Republic +gui.countryselection.country.cz.logo.alt=Czech Republic-eID +gui.countryselection.country.ee=Estonia +gui.countryselection.country.ee.logo.alt=Estonia-eID +gui.countryselection.country.de=Germany +gui.countryselection.country.de.logo.alt=German-eID +gui.countryselection.country.is=Iceland +gui.countryselection.country.is.logo.alt=Iceland-eID +gui.countryselection.country.it=Italy +gui.countryselection.country.it.logo.alt=Italy-eID +gui.countryselection.country.lt=Lithuania +gui.countryselection.country.lt.logo.alt=Lithuania-eID +gui.countryselection.country.lv=Latvia +gui.countryselection.country.lv.logo.alt=Latvia-eID +gui.countryselection.country.nl=Netherlands +gui.countryselection.country.nl.logo.alt=Netherlands-eID +gui.countryselection.country.pl=Poland +gui.countryselection.country.pl.logo.alt=Poland-eID +gui.countryselection.country.pt=Portugal +gui.countryselection.country.pt.logo.alt=Portugal-eID +gui.countryselection.country.si=Slovenia +gui.countryselection.country.si.logo.alt=Slovenia-eID +gui.countryselection.country.es=SSpain +gui.countryselection.country.es.logo.alt=Spain-eID + +gui.countryselection.country.bg=Bulgaria +gui.countryselection.country.bg.logo.alt=Bulgaria-eID +gui.countryselection.country.dk=Denmark +gui.countryselection.country.dk.logo.alt=Denmark-eID +gui.countryselection.country.fi=Finland +gui.countryselection.country.fi.logo.alt=Finland-eID +gui.countryselection.country.fr=France +gui.countryselection.country.fr.logo.alt=France-eID +gui.countryselection.country.gr=Greece +gui.countryselection.country.gr.logo.alt=Greece-eID +gui.countryselection.country.hu=Hungary +gui.countryselection.country.hu.logo.alt=Hungary-eID +gui.countryselection.country.ir=Ireland +gui.countryselection.country.ir.logo.alt=Ireland-eID +gui.countryselection.country.lu=Luxembourg +gui.countryselection.country.lu.logo.alt=Luxembourg-eID +gui.countryselection.country.mt=Malta +gui.countryselection.country.mt.logo.alt=Malta-eID +gui.countryselection.country.ro=Romania +gui.countryselection.country.ro.logo.alt=Romania-eID +gui.countryselection.country.sk=Slovakia +gui.countryselection.country.sk.logo.alt=Slovakia-eID +gui.countryselection.country.sw=Sweden +gui.countryselection.country.sw.logo.alt=Sweden-eID +gui.countryselection.country.uk=United Kingdom +gui.countryselection.country.uk.logo.alt=United Kingdom-eID + +gui.countryselection.country.testcountry=TestCountry +gui.countryselection.country.testcountry.logo.alt=Testcountry-eID + +gui.countryselection.mode.prod=Production +gui.countryselection.mode.qs=QS +gui.countryselection.mode.test=Test +gui.countryselection.mode.dev=Development
\ No newline at end of file diff --git a/basicConfig/templates/countrySelection_example.html b/basicConfig/templates/countrySelection_example.html index d28c1fb6..3b7c2d50 100644 --- a/basicConfig/templates/countrySelection_example.html +++ b/basicConfig/templates/countrySelection_example.html @@ -1,175 +1,208 @@  <!DOCTYPE html> -<html> +<html xmlns:th="http://www.thymeleaf.org" +      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" +      layout:decorator="fragments/base" +      th:with="lang=${#locale.language}" th:lang="${lang}"> +        <head>    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">    <meta name="viewport" content="width=device-width, initial-scale=1"> -  <link rel="stylesheet" href="$contextPath/static/css/css_country.css"/> -  <script type="text/javascript" src="$contextPath/static/js/js_country.js"></script> -  <title>eIDAS-Login Länderauswahl</title> -   -<title>eIDAS-Login</title> +  <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/> +  <script type="text/javascript" src="$contextPath/static/js/js_country.js" th:attr="src=@{/static/js/js_country.js}"></script>   +  <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>  </head> +  <body>      <div id="page"> -        <h2> Select your country </h2> +      <div class="languageselection" th:include="language_selection :: selectlanguage"> +          LanguageSelectionBlock +      </div> +     +        <h2 th:text="#{gui.countryselection.header.selection}"> Select your country </h2>          <div id="country"> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID"/></a> -                <input type="submit" value="Germany" role="button" id="button"> -                <input type="hidden" name="selectedCountry" value="DE"> -                <input type="hidden" name="pendingid" value="$pendingReqID"> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID" +                        th:attr="src=@{/img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a> +                <input type="submit" role="button" value="Deutschland / Germany" th:attr="value=#{gui.countryselection.country.de}" /> +                <input type="hidden" name="selectedCountry" value="DE">               +                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />                  <select id="testEnvironment" name="selectedEnvironment">  -                       <option value="prod">Production</option>  -                       <option value="qs">QS</option> -                       <option value="test">Testing</option> -                       <option value="dev">Development</option> +                       <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>  +                       <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option> +                       <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option> +                       <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>                  </select>              </form> -             -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"/></a></a> -                <input type="submit" value="Belgium">  +                        +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU_gray.png" alt="Belgium-eID" +                        th:attr="src=@{img/countries/Belgium-EU_gray.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a> +                <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">               </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Bulgaria-EU_gray.png"="Bulgaria-eID"/></a> -                <input type="submit" value="Bulgaria" disabled>  +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Bulgaria-EU_gray.png" alt="Bulgaria-eID" +                        th:attr="src=@{/img/countries/Bulgaria-EU_gray.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a> +                <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" disabled>               </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU_gray.png"="Croatia-eID"/></a> -                <input type="submit" value="Croatia">  +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU_gray.png" alt="Croatia-eID" +                        th:attr="src=@{/img/countries/Croatia-EU_gray.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a> +                <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">               </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Cyprus-EU_gray.png"="Cyprus-eID"/></a>  -                <input type="submit" value="Cyprus" disabled>  +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID" +                        th:attr="src=@{/img/countries/Cyprus-EU_gray.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>  +                <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}" disabled>               </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU_gray.png"="CzechRepublic-eID"/></a> -                <input type="submit" value="CzechRepublic">  +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU_gray.png" alt="CzechRepublic-eID" +                        th:attr="src=@{/img/countries/CzechRepublic-EU_gray.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a> +                <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">               </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Denmark-EU_gray.png"="Denmark-eID"/></a> -                <input type="submit" value="Denmark" disabled>     +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Denmark-EU_gray.png" alt="Denmark-eID" +                        th:attr="src=@{/img/countries/Denmark-EU_gray.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a> +                <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}" disabled>                  </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU_gray.png"="Estonia-eID"/></a> -                <input type="submit" value="Estonia"> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU_gray.png" alt="Estonia-eID" +                        th:attr="src=@{/img/countries/Estonia-EU_gray.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a> +                <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Finland-EU_gray.png"="Finland-eID"/></a> -                <input type="submit" value="Finland" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Finland-EU_gray.png" alt="Finland-eID" +                        th:attr="src=@{/img/countries/Finland-EU_gray.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a> +                <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/France-EU_gray.png"="France-eID"/></a> -                <input type="submit" value="France" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/France-EU_gray.png" alt="France-eID" +                        th:attr="src=@{/img/countries/France-EU_gray.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a> +                <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Greece-EU_gray.png"="Greece-eID"/></a>  -                <input type="submit" value="Greece" disabled>     +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Greece-EU_gray.png" alt="Greece-eID" +                        th:attr="src=@{/img/countries/Greece-EU_gray.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>  +                <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}" disabled>                  </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Hungary-EU_gray.png"="Hungary-eID"/></a>  -                <input type="submit" value="Hungary" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Hungary-EU_gray.png" alt="Hungary-eID" +                        th:attr="src=@{/img/countries/Hungary-EU_gray.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>  +                <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Ireland-EU_gray.png"="Ireland-eID"/></a> -                <input type="submit" value="Ireland" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Ireland-EU_gray.png" alt="Ireland-eID" +                        th:attr="src=@{/img/countries/Ireland-EU_gray.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a> +                <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU_gray.png"="Italy-eID"/></a> -                <input type="submit" value="Italy"> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU_gray.png" alt="Italy-eID" +                        th:attr="src=@{/img/countries/Italy-EU_gray.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a> +                <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">                  <select id="testEnvironment" name="selectedEnvironment">  -                       <option value="prod">Production</option>  -                       <option value="qs">QS</option> -                       <option value="test">Testing</option> -                       <option value="dev">Development</option> +                       <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>  +                       <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option> +                       <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option> +                       <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>                  </select>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Latvia-EU_gray.png"="Latvia-eID"/></a> -                <input type="submit" value="Latvia" disabled>    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Latvia-EU_gray.png" alt="Latvia-eID" +                        th:attr="src=@{/img/countries/Latvia-EU_gray.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a> +                <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}" disabled>                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Luxembourg-EU_gray.png"="Luxembourg-eID"/></a> -                <input type="submit" value="Luxembourg" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Luxembourg-EU_gray.png" alt="Luxembourg-eID" +                        th:attr="src=@{/img/countries/Luxembourg-EU_gray.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a> +                <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Malta-EU_gray.png"="Malta-eID"/></a> -                <input type="submit" value="Malta" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Malta-EU_gray.png" alt="Malta-eID" +                        th:attr="src=@{/img/countries/Malta-EU_gray.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a> +                <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}" disabled>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU_gray.png"="Poland-eID"/></a> -                <input type="submit" value="Poland"> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU_gray.png" alt="Poland-eID" +                        th:attr="src=@{/img/countries/Poland-EU_gray.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a> +                <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU_gray.png"="Portugal-eID"/></a>  -                <input type="submit" value="Portugal">    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU_gray.png" alt="Portugal-eID" +                        th:attr="src=@{/img/countries/Portugal-EU_gray.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>  +                <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Romania-EU_gray.png"="Romania-eID"/></a>  -                <input type="submit" value="Romania" disabled>    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Romania-EU_gray.png" alt="Romania-eID" +                        th:attr="src=@{/img/countries/Romania-EU_gray.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>  +                <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}" disabled>                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Slovakia-EU_gray.png"="Slovakia-eID"/></a> -                <input type="submit" value="Slovakia" disabled>    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Slovakia-EU_gray.png" alt="Slovakia-eID" +                        th:attr="src=@{/img/countries/Slovakia-EU_gray.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a> +                <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}" disabled>                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU_gray.png"="Slovenia-eID"/></a> -                <input type="submit" value="Slovenia">    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID" +                        th:attr="src=@{/img/countries/Slovenia-EU_gray.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a> +                <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU_gray.png"="Spain-eID"/></a> -                <input type="submit" value="Spain">    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU_gray.png" alt="Spain-eID" +                        th:attr="src=@{/img/countries/Spain-EU_gray.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a> +                <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">                     <select id="testEnvironment" name="selectedEnvironment">  -                       <option value="prod">Production</option>  -                       <option value="qs">QS</option> -                       <option value="test">Testing</option> -                       <option value="dev">Development</option> +                       <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>  +                       <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option> +                       <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option> +                       <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>                  </select>              </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/Sweden-EU_gray.png"="Sweden-eID"/></a> -                <input type="submit" value="Sweden" disabled>    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/Sweden-EU_gray.png" alt="Sweden-eID" +                        th:attr="src=@{/img/countries/Sweden-EU_gray.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a> +                <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}" disabled>                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_gray.jpg"="TheNetherlands-eID"/></a>  -                <input type="submit" value="Netherlands">    +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_gray.jpg" alt="TheNetherlands-eID" +                        th:attr="src=@{/img/countries/TheNetherlands-EU_gray.jpg},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>  +                <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">                 </form> -            <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <a><img disabled class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU_gray.png"="UnitedKingdom-eID"/></a> -                <input type="submit" value="United Kingdom" disabled> +            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> +                <a><img disabled class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU_gray.png" alt="UnitedKingdom-eID" +                        th:attr="src=@{/img/countries/UnitedKingdom-EU_gray.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a> +                <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}" disabled>              </form>          </div> -        <form class="block" method="post" action="$contextPath$submitEndpoint">  -                <input type="submit" value="Abbrechen/Cancel"> -                <input type="hidden" name="stopAuthProcess" value="true"> -                <input type="hidden" name="pendingid" value="$pendingReqID"> +        <form   class="block" method="post"  action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">  +          <input  type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel" th:attr="value=#{gui.countryselection.cancle}">                                     +          <input  type="hidden" name="stopAuthProcess" value="true" > +          <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}">          </form>      </div> diff --git a/basicConfig/templates/eidas_node_forward.html b/basicConfig/templates/eidas_node_forward.html new file mode 100644 index 00000000..186937d7 --- /dev/null +++ b/basicConfig/templates/eidas_node_forward.html @@ -0,0 +1,36 @@ +<!DOCTYPE html> +<html xmlns:th="http://www.thymeleaf.org" +      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" +      layout:decorator="fragments/base" +      th:with="lang=${#locale.language}" th:lang="${lang}"> +<head> +  <script src="$contextPath/autocommit.js" +          th:attr="src=@{/autocommit.js}"></script> +</head> +<body> +	<noscript> +		<p> +			<strong>Note:</strong> Since your browser does not support +			JavaScript, you must press the Continue button once to proceed. +		</p> +	</noscript> + +	<div id="alert">Your login is being processed. Thank you for +		waiting.</div> + +	<form 	action="${endPoint}" method="post" target="_parent" +			th:attr="action=@{${endPoint}}"> +		<div> +			<input type="hidden" name="${tokenName}" value="${tokenValue}" +			 	   th:attr="value=${tokenValue},name=${tokenName}" /> +		</div> +		<noscript> +			<div> +				<p>Your browser does not support JavaScript. Click the button to continuing the process .</p> +				<input type="submit" value="Continue" /> +			</div> +		</noscript> +	</form> + +</body> +</html>
\ No newline at end of file diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html index fc9b75a1..86f9d29d 100644 --- a/basicConfig/templates/error_message.html +++ b/basicConfig/templates/error_message.html @@ -1,36 +1,36 @@ -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<head> +<!DOCTYPE HTML> +<html xmlns:th="http://www.thymeleaf.org" +      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" +      layout:decorator="fragments/base" +      th:with="lang=${#locale.language}" th:lang="${lang}"> +          <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> -  <link rel="stylesheet" href="$contextPath/css/css_error.css" /> +  <link rel="stylesheet" href="$contextPath/css/css_error.css"  th:href="@{/css/css_error.css}" /> -  <title>An error arise ...  </title> +  <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>  </head>  <body>    <div id="page">  		<div id="page1" class="case selected-case" role="main">  			<h2 class="OA_header" role="heading">Authentication error arise</h2> -			<!--div id="main"--> -				<!--div id="leftcontent" class="hell" role="application"--> -           -           -           +	          	        <div class="hell" role="application" > -            <p>The authentication stops on account of a process error:</p> -            <br/> -		        <p><b>Error    Code:</b> $errorCode</p>  -		        <p><b>Error Message:</b >$errorMsg</p> +            <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2> +             +              <div id="alert_area" class="hell" role="application" > +                <p th:text="#{gui.errorpage.msg.information}">Error Information</p> +                  <br/> +		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>  +                  <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg   :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p> +	            </div>	 +                                                                                                      <!-- errorMsg -->	  	        </div>	 +	        <div th:if="${stacktrace}"> +            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>  +	        </div> -	        #if($stacktrace) -	         <div> -		        <p><b>Stacktrace:</b> $stacktrace</p>  -	         </div>	 -	        #end -           -				<!--/div---> -			<!--/div-->  		</div>  	</div>  </body> diff --git a/basicConfig/templates/language_selection.html b/basicConfig/templates/language_selection.html new file mode 100644 index 00000000..a268eb17 --- /dev/null +++ b/basicConfig/templates/language_selection.html @@ -0,0 +1,15 @@ +<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-4.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" +      xmlns:th="http://www.thymeleaf.org"> + +  <body> +   +    <div th:fragment="selectlanguage"> +        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='de')}" th:text="#{gui.general.language.selection.de}">Spache1</a> +        <span>    </span> +        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='en')}" th:text="#{gui.general.language.selection.en}">Spache2</a> +    </div> +   +  </body> +   +</html>
\ No newline at end of file | 
