aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2020-01-09 10:23:46 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2020-01-09 10:23:46 +0100
commitd34f9161257e803e13618749a7b78df333b0f937 (patch)
treeb23f234418c7745d0865ba63a78b90f72ccd7438 /id/ConfigWebTool/src/main
parentb5db99a8a8d11a0aaf91d1d5d7a7c33c7c29157b (diff)
downloadmoa-id-spss-d34f9161257e803e13618749a7b78df333b0f937.tar.gz
moa-id-spss-d34f9161257e803e13618749a7b78df333b0f937.tar.bz2
moa-id-spss-d34f9161257e803e13618749a7b78df333b0f937.zip
reactivate foreign-bPKs and additional bPKs in MOA-ID mode
Diffstat (limited to 'id/ConfigWebTool/src/main')
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_de.properties2
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties2
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp13
3 files changed, 11 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index a52efa28d..3b053d665 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -266,6 +266,8 @@ webpages.oaconfig.general.isHideBPKAuthBlock=bPK/wbPK im AuthBlock ausblenden
webpages.oaconfig.general.neweid.header=E-ID Proxy-Mode
webpages.oaconfig.general.neweid.activate=E-ID Proxy-Mode aktivieren
+
+webpages.oaconfig.general.foreign.header=Weitere bPKs/fremd-bPKs im MOA-ID Mode
webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
webpages.oaconfig.general.additionalbpks.sectors=Sektoren f\u00FCr weitere bPKs (CSV)
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 0109c3b02..550a9df78 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -272,6 +272,8 @@ webpages.oaconfig.general.isHideBPKAuthBlock=Hide bPK/wbPK from AuthBlock
webpages.oaconfig.general.neweid.header=E-ID Proxy Mode
webpages.oaconfig.general.neweid.activate=Activate E-ID Proxy Mode
+
+webpages.oaconfig.general.foreign.header=Additional bPKs/foreign-bPKs in case of MOA-ID mode
webpages.oaconfig.general.foreign.sectors=Sectors for foreign pseudonyms (CSV)
webpages.oaconfig.general.additionalbpks.sectors=Sectors for additional pseudonyms (CSV)
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index dc093fc36..ef62ef0e6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -113,7 +113,7 @@
</s:if>
- <div id="oa_config_foreignbPKArea" class="oa_config_block">
+ <div id="oa_config_EID_proxy_mode" class="oa_config_block">
<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
<s:checkbox name="targetConfig.eidDemoActive"
@@ -121,10 +121,12 @@
labelposition="left"
key="webpages.oaconfig.general.neweid.activate"
cssClass="checkbox">
- </s:checkbox>
-
- <s:if test="authOA.isMoaidMode()">
- <!--
+ </s:checkbox>
+ </div>
+
+ <div id="oa_config_foreignbPKArea" class="oa_config_block">
+ <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+ <s:if test="authOA.isMoaidMode()">
<s:textarea name="targetConfig.foreignbPKTargets"
value="%{targetConfig.foreignbPKTargets}"
labelposition="left"
@@ -144,7 +146,6 @@
requiredLabel="true"
style="height:120px;">
</s:textarea>
- -->
</s:if>
</div>