From dfd1a56545a4099ae1a38fb51d62058b0e252135 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 9 Sep 2013 15:22:52 +0200 Subject: MOA-ID 1.9.95 --change BKU selection templates and SendAssertion Templates to responsive design. Therefore, OA parameter "useIframe" is not required anymore. --- .../moa/id/auth/builder/LoginFormBuilder.java | 3 +- .../id/auth/builder/SendAssertionFormBuilder.java | 3 +- .../moa/id/auth/servlet/MonitoringServlet.java | 1 + .../protocols/pvp2x/binding/ArtifactBinding.java | 3 + .../resources/templates/loginFormFull.html | 269 +++++++++++++++++++++ .../resources/templates/sendAssertionFormFull.html | 56 +---- .../templates/sendAssertionFormIFrame.html | 44 ---- 7 files changed, 279 insertions(+), 100 deletions(-) create mode 100644 id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html delete mode 100644 id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html (limited to 'id/server/idserverlib/src/main') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java index a80fcfa25..ee5afa5dc 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java @@ -20,7 +20,8 @@ public class LoginFormBuilder { private static final String HTMLTEMPLATESDIR = "htmlTemplates/"; private static final String HTMLTEMPLATEFULL = "loginFormFull.html"; - private static final String HTMLTEMPLATEIFRAME = "loginFormIFrame.html"; + private static final String HTMLTEMPLATEIFRAME = "loginFormFull.html"; + //private static final String HTMLTEMPLATEIFRAME = "loginFormIFrame.html"; private static String AUTH_URL = "#AUTH_URL#"; private static String MODUL = "#MODUL#"; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java index 956593237..59cbbe25e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java @@ -20,7 +20,8 @@ public class SendAssertionFormBuilder { private static final String HTMLTEMPLATESDIR = "htmlTemplates/"; private static final String HTMLTEMPLATEFULL = "sendAssertionFormFull.html"; - private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormIFrame.html"; + private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormFull.html"; + //private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormIFrame.html"; private static String URL = "#URL#"; private static String MODUL = "#MODUL#"; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java index 4ba282dc1..4cd471db0 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java @@ -38,6 +38,7 @@ public class MonitoringServlet extends AuthServlet { } else { resp.setStatus(HttpServletResponse.SC_OK); + resp.setContentType("text/html;charset=UTF-8"); Logger.info("Monitoring Servlet finished without errors"); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java index 1d51d91f1..baea32f28 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java @@ -73,6 +73,9 @@ public class ArtifactBinding implements IDecoder, IEncoder { } catch (CredentialsNotAvailableException e) { e.printStackTrace(); throw new SecurityException(e); + + } catch (Exception e) { + throw new SecurityException(e); } } diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html new file mode 100644 index 000000000..c6b98dc85 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html @@ -0,0 +1,269 @@ + + + + + + + + + + + + +
+ +
+ +

Anmeldung an: #OAName#

+ +
+
+

+ Login mit Bürgerkarte +

+
+ +
+ + + + + + + +
i
+
+ +
+ +
+ +
+ +
+ + + +
+
+
+ + + + + + + + +
+

+ Alternativ können Sie eine lokal installierte BKU verwenden. +

+
+ +
+
+

+ Home Country Selection +

+
+

+ + + i +

+
+
+ + + +
+
+
+
+ + diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html index f4377ace4..f977b1d2e 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html @@ -3,47 +3,13 @@ - - - - -
- -
- - - -
- -
-
@@ -65,7 +31,7 @@ - +
@@ -74,7 +40,7 @@ - +
@@ -82,24 +48,6 @@
-
- - -
- - - - diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html deleted file mode 100644 index a30bbfa9a..000000000 --- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - -
-

- Anmeldeinformationen: - -

- -
- Anmeldung an: -

#OAName#

- - - -
-
- - - - - -
-
-
-
- - - - - -
-
- -
-
- - -- cgit v1.2.3