From 7f91f749dbd2e38a692f7fd4923c8dd5dadd57c8 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 6 Jul 2020 21:01:22 +0200 Subject: fix typos and brocken 'use-mandates' checkbox visability --- id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css | 7 +++++-- .../data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js | 6 +++--- ...stractServiceProviderSpecificGUIFormBuilderConfiguration.java | 2 +- .../egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java | 9 +++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css index 86428fa06..e5f33b7f0 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css @@ -44,8 +44,7 @@ margin-bottom: 5%; } - #mandateLogin { - flex-direction: row; + #mandateLogin { padding-bottom: 1%; padding-top: 2%; margin-left: 1%; @@ -56,6 +55,10 @@ .unvisible { display:none; } + + .visible { + flex-direction: row; + } .OA_header { font-size: 2.1em; diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js index 15b82614c..805c078bf 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js @@ -210,7 +210,7 @@ function isIE() { var localBKUForm = document.getElementById("moaidform"); var button = localBKUForm.getElementsByTagName("input")[5]; button.removeAttribute("class");; - button.setAttribute("title","Bürgerkarte mit localer Bürgerkartenumgebung."); + button.setAttribute("title","Bürgerkarte mit lokaler Bürgerkartenumgebung."); var image = document.getElementById("bkuimage"); var srcatt = image.getAttribute("src"); @@ -223,7 +223,7 @@ function isIE() { var localBKUForm = document.getElementById("moaidform"); var button = localBKUForm.getElementsByTagName("input")[5]; button.setAttribute("class","browserInfoButton"); - button.setAttribute("title","Es wurde keine Bürgerkartenumgebung gefunden. Sollte es sich hierbei um einen Fehler handeln können Sie den Prozess durch einen Klick auf den Button denoch fortsetzen."); + button.setAttribute("title","Es wurde keine Bürgerkartenumgebung gefunden. Sollte es sich hierbei um einen Fehler handeln können Sie den Prozess durch einen Klick auf den Button dennoch fortsetzen."); var image = document.getElementById("bkuimage"); var srcatt = image.getAttribute("src"); @@ -288,4 +288,4 @@ function isIE() { } else { return false; } - } */ \ No newline at end of file + } */ diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java index 23b8dcd84..b13e29137 100644 --- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java +++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java @@ -162,7 +162,7 @@ public abstract class AbstractServiceProviderSpecificGUIFormBuilderConfiguration } else { setViewParameter(null, PARAM_COUNTRYLIST, ""); - setViewParameter(null, PARAM_EIDAS_VISIBLE, FormBuildUtils.TEMPLATEVISIBLE); + setViewParameter(null, PARAM_EIDAS_VISIBLE, FormBuildUtils.TEMPLATEUNVISIBLE); } diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java index 8e4e7e5b3..3bba17b30 100644 --- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java +++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java @@ -50,7 +50,8 @@ public class FormBuildUtils { private static String PARAM_MANDATEVISIBLE = "MANDATEVISIBLE"; private static String PARAM_MANDATECHECKED = "MANDATECHECKED"; - public static final String TEMPLATEVISIBLE = " unvisible"; + public static final String TEMPLATEVISIBLE = " visible"; + public static final String TEMPLATEUNVISIBLE = " unvisible"; public static final String TEMPLATEDISABLED = "disabled=\"true\""; public static final String TEMPLATECHECKED = "checked=\"true\""; public static final String TEMPLATE_ARIACHECKED = "aria-checked="; @@ -79,9 +80,9 @@ public class FormBuildUtils { public static void customiceLayoutBKUSelection(Map params, IOAAuthParameters oaParam) { if (oaParam.isShowMandateCheckBox()) - params.put(PARAM_MANDATEVISIBLE, ""); - else params.put(PARAM_MANDATEVISIBLE, TEMPLATEVISIBLE); + else + params.put(PARAM_MANDATEVISIBLE, TEMPLATEUNVISIBLE); if (oaParam.isOnlyMandateAllowed()) { params.put(PARAM_MANDATECHECKED, TEMPLATECHECKED + " " + @@ -117,7 +118,7 @@ public class FormBuildUtils { * @return */ public static void defaultLayoutBKUSelection(Map params) { - params.put(PARAM_MANDATEVISIBLE, TEMPLATEVISIBLE); + params.put(PARAM_MANDATEVISIBLE, TEMPLATEUNVISIBLE); params.put(PARAM_MANDATECHECKED, TEMPLATE_ARIACHECKED + "\"false\""); params.putAll(getDefaultMap()); -- cgit v1.2.3