diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
7 files changed, 56 insertions, 27 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 18c755f4b..32e79bb66 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -204,7 +204,7 @@ function oaOnLoad() { AdminTarget(); oaTargetSubSector(); - oaVIDP(); +// oaVIDP(); $(".colorfield").each( function() { diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index e797d05fe..a3541c9a7 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -54,13 +54,6 @@ <button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden"> <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %> </button> - - <button type="button" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_show"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.show", request) %> - </button> - <button type="button" style="display:none" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_hidden"> - <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.hidden", request) %> - </button> </s:if> <button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show"> @@ -81,13 +74,11 @@ <s:include value="snippets/OA/saml1.jsp"></s:include> <s:include value="snippets/OA/pvp2.jsp"> - <s:param name="headBlock">hidden</s:param> + <s:param name="hideBlock">hidden</s:param> </s:include> <s:include value="snippets/OA/openIDConnect.jsp"></s:include> - <s:include value="snippets/OA/vidp.jsp"></s:include> - </div> <s:include value="snippets/OA/formCustomization.jsp"></s:include> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp index db36cb2ec..3e7404dfc 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp @@ -35,7 +35,19 @@ <s:param name="editAction">loadIDP</s:param> </s:include> </div> - + <br> + <br> + <div id="button_area"> + <h3><%=LanguageHelper.getGUIString("webpages.interfederation.new.header", request) %></h3> + <s:form action="newIDP" namespace="/secure" method="POST" > + <s:hidden name="interfederationType" value="-MOAIDP"></s:hidden> + <s:submit key="webpages.interfederation.new.moaid"/> + </s:form> + <s:form action="newIDP" namespace="/secure" method="POST" > + <s:hidden name="interfederationType" value="-VIDP"></s:hidden> + <s:submit key="webpages.interfederation.new.vidp"/> + </s:form> + </div> </s:if> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp index 5dd769757..f0d0671bf 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp @@ -38,14 +38,16 @@ <s:include value="../snippets/OA/interfederation.jsp"></s:include> <s:include value="../snippets/OA/pvp2.jsp"> - <s:param name="headBlock">""</s:param> + <s:param name="hideBlock">""</s:param> </s:include> <s:hidden name="formID" value="%{formID}"></s:hidden> + <s:hidden name="interfederationType" value="%{interfederationType}"></s:hidden> + <div id="button_area"> <s:submit key="webpages.edit.back" action="cancleandbackIDP"/> - <s:submit key="webpages.edit.save" action="saveIDP"/> + <s:submit key="webpages.edit.save" action="saveMOAIDP"/> <s:if test="!isNewOA()"> <s:submit key="webpages.edit.delete" action="deleteIDP"/> </s:if> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp index 5f51d9f86..3a5dd68c9 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp @@ -13,11 +13,11 @@ <script src="../js/jquery.js"></script> </head> - <body> + <body onload="oaOnLoad()"> - <jsp:include page="snippets/header_userinfos.jsp"></jsp:include> + <jsp:include page="../snippets/header_userinfos.jsp"></jsp:include> - <jsp:include page="snippets/main_menu.jsp"></jsp:include> + <jsp:include page="../snippets/main_menu.jsp"></jsp:include> <div id="information_area"> <s:if test="hasActionErrors()"> @@ -27,20 +27,44 @@ </div> </s:if> - <h2><%=LanguageHelper.getGUIString("webpages.interfederation.header", request) %></h2> - <s:if test="authUser.isAdmin()"> - - <div class="oa_config_block"> - <h3><%=LanguageHelper.getGUIString("webpages.interfederation.list.header", request) %></h3> - <jsp:include page="snippets/oas_list.jsp"></jsp:include> - </div> + <div id="list_area"> + <h2><%=LanguageHelper.getGUIString("webpages.interfederation.header", request) %></h2> + + <s:form namespace="/secure" method="POST" enctype="multipart/form-data"> + + <s:include value="../snippets/OA/generalInformation.jsp"></s:include> + <s:include value="../snippets/OA/targetConfiguration.jsp"></s:include> + + <s:include value="../snippets/OA/authentication.jsp"></s:include> + + <s:include value="../snippets/OA/vidp.jsp"> + <s:param name="hideBlock"></s:param> + </s:include> + + <s:include value="../snippets/OA/formCustomization.jsp"></s:include> + + <s:hidden name="formID" value="%{formID}"></s:hidden> + <s:hidden name="interfederationType" value="%{interfederationType}"></s:hidden> + + + <div id="button_area"> + <s:submit key="webpages.edit.back" action="cancleandbackIDP"/> + <s:submit key="webpages.edit.save" action="saveVIDP"/> + <s:if test="!isNewOA()"> + <s:submit key="webpages.edit.delete" action="deleteIDP"/> + </s:if> + </div> + + </s:form> + + </div> </s:if> </div> - <jsp:include page="snippets/footer.jsp"></jsp:include> + <jsp:include page="../snippets/footer.jsp"></jsp:include> </body> </html>
\ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp index f9471816c..398e6d110 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp @@ -3,7 +3,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <html> - <div id="oa_pvp2_area" class="oa_protocol_area ${param.headBlock}"> + <div id="oa_pvp2_area" class="oa_protocol_area ${param.hideBlock}"> <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4> <s:checkbox key="webpages.oaconfig.pvp2.reload" diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp index 0dda520b5..e8f1c86d3 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp @@ -3,7 +3,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <html> - <div id="oa_vidp_area" class="oa_protocol_area"> + <div id="oa_vidp_area" class="oa_protocol_area ${param.hideBlock}"> <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4> <p><s:checkbox name="storkOA.vidpEnabled" |