diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-04-06 10:22:31 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-04-06 10:22:31 +0200 |
| commit | aebaed0e889413491b5769babf39a200bd312992 (patch) | |
| tree | ed6f6e115272ef918e16eda464cc8c3ba6b1fe0f /id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | |
| parent | f88e1049d4e22d4d4a168a30a997a479564aa7ff (diff) | |
| parent | e82fd34793ae92e755f6b203fbcad53ee3d9581e (diff) | |
| download | moa-id-spss-aebaed0e889413491b5769babf39a200bd312992.tar.gz moa-id-spss-aebaed0e889413491b5769babf39a200bd312992.tar.bz2 moa-id-spss-aebaed0e889413491b5769babf39a200bd312992.zip | |
Merge branch 'current_development' into development_preview
# Conflicts:
# id/history.txt
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 22 |
1 files changed, 15 insertions, 7 deletions
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..1f7adea01 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp @@ -113,18 +113,27 @@ </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.eidProxyActive" + value="%{targetConfig.eidProxyActive}" + labelposition="left" + key="webpages.oaconfig.general.neweid.proxy.activate" + cssClass="checkbox"> + </s:checkbox> + <s:checkbox name="targetConfig.eidDemoActive" value="%{targetConfig.eidDemoActive}" labelposition="left" - key="webpages.oaconfig.general.neweid.activate" + key="webpages.oaconfig.general.neweid.demo.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.foreign.header", request) %></h3> + <s:if test="authOA.isMoaidMode()"> <s:textarea name="targetConfig.foreignbPKTargets" value="%{targetConfig.foreignbPKTargets}" labelposition="left" @@ -144,7 +153,6 @@ requiredLabel="true" style="height:120px;"> </s:textarea> - --> </s:if> </div> |