diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 08:03:26 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 08:03:26 +0200 | 
| commit | 976eb0849f4cef5681b7f3b2f1329f528254cad7 (patch) | |
| tree | 7c51d89a45a98c9b7b30fdbe448e6415473483c6 /id/ConfigWebTool/src/main/webapp/jsp/interfederation | |
| parent | 2e4354640986b86aaac16b59bc4836c8bf01cb25 (diff) | |
| download | moa-id-spss-976eb0849f4cef5681b7f3b2f1329f528254cad7.tar.gz moa-id-spss-976eb0849f4cef5681b7f3b2f1329f528254cad7.tar.bz2 moa-id-spss-976eb0849f4cef5681b7f3b2f1329f528254cad7.zip | |
finalize IDP interfederation configuration
Info: STORK VIDP configuration is moved to section interfederation
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/interfederation')
3 files changed, 52 insertions, 14 deletions
| 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 | 
