diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-04-06 10:23:53 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-04-06 10:23:53 +0200 |
| commit | a056118bbfabb53dc2856ff07d068cd57ddc8be3 (patch) | |
| tree | e8972ade3b0137e8a61e10d9717a512787c16ba5 /id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | |
| parent | 7fa91731a8b852e9a8a4ea1a152a5aa74523d47e (diff) | |
| parent | aebaed0e889413491b5769babf39a200bd312992 (diff) | |
| download | moa-id-spss-a056118bbfabb53dc2856ff07d068cd57ddc8be3.tar.gz moa-id-spss-a056118bbfabb53dc2856ff07d068cd57ddc8be3.tar.bz2 moa-id-spss-a056118bbfabb53dc2856ff07d068cd57ddc8be3.zip | |
Merge branch 'development_preview'
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index cc4220d0e..feab86593 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -46,12 +46,14 @@ <s:include value="snippets/OA/authentication.jsp"></s:include> - <s:include value="snippets/OA/bPKDecryption.jsp"></s:include> + <s:if test="authOA.isMoaidMode()"> + <s:include value="snippets/OA/bPKDecryption.jsp"></s:include> - <s:include value="snippets/OA/sso.jsp"></s:include> + <s:include value="snippets/OA/sso.jsp"></s:include> - <s:include value="snippets/OA/stork.jsp"></s:include> - + <s:include value="snippets/OA/stork.jsp"></s:include> + </s:if> + <div class="oa_config_block"> <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3> @@ -64,35 +66,40 @@ </button> </s:if> - <button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %> - </button> - <button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %> - </button> - - <button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %> - </button> - <button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %> - </button> - + <s:if test="authOA.isMoaidMode()"> + <button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show"> + <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %> + </button> + <button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden"> + <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %> + </button> + + <button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show"> + <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %> + </button> + <button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden"> + <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %> + </button> + </s:if> <s:include value="snippets/OA/saml1.jsp"></s:include> - <s:include value="snippets/OA/pvp2.jsp"> - <s:param name="hideBlock">hidden</s:param> - </s:include> + <s:if test="authOA.isMoaidMode()"> + <s:include value="snippets/OA/pvp2.jsp"> + <s:param name="hideBlock">hidden</s:param> + </s:include> - <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + </s:if> </div> - <s:include value="snippets/OA/formCustomization.jsp"></s:include> + <s:if test="authOA.isMoaidMode()"> + <s:include value="snippets/OA/formCustomization.jsp"></s:include> - <s:include value="snippets/OA/revisionslog.jsp"></s:include> + <s:include value="snippets/OA/revisionslog.jsp"></s:include> + </s:if> <s:hidden name="formID" value="%{formID}"></s:hidden> |