diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
4 files changed, 51 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp new file mode 100644 index 000000000..97d21bcb4 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp @@ -0,0 +1,33 @@ +<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<html> + <div id="oa_pvp2_area" class="oa_protocol_area"> + <h4><%=LanguageHelper.getGUIString("webpages.inderfederation.moaid.header", request) %></h4> + + <s:checkbox key="webpages.inderfederation.moaid.inboundSSO" + labelposition="left" + cssClass="checkbox" + name="moaIDP.inboundSSO"></s:checkbox> + + <s:checkbox key="webpages.inderfederation.moaid.outboundSSO" + labelposition="left" + cssClass="checkbox" + name="moaIDP.outboundSSO"></s:checkbox> + + <s:checkbox key="webpages.inderfederation.moaid.storeSSOSession" + labelposition="left" + cssClass="checkbox" + name="moaIDP.storeSSOSession"></s:checkbox> + + <s:textfield name="moaIDP.queryURL" + value="%{moaIDP.queryURL}" + labelposition="left" + key="webpages.inderfederation.moaid.attributQueryURL" + cssClass="textfield_long"> + </s:textfield> + + </div> + +</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 cb437309a..f9471816c 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 hidden"> + <div id="oa_pvp2_area" class="oa_protocol_area ${param.headBlock}"> <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/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp index 4d02f4bda..95d6de912 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp @@ -19,6 +19,10 @@ <s:if test="authUser.isAdmin()"> <div class="menu_element"> + <s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/> + <a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a> + </div> + <div class="menu_element"> <s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/> <a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a> </div> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp index 113e822f8..e2af292d7 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -1,4 +1,5 @@ <%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%> +<%@page import="at.gv.egovernment.moa.id.configuration.data.OAListElement.ServiceType"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags" %> @@ -6,6 +7,11 @@ <s:if test="formOAs && formOAs.size > 0"> <div id="list_area"> <div id="listHeader" class="listElement"> + <s:if test="formOAs[0].serviceType != 'OA'"> + <div class="listElInfo"> + <%=LanguageHelper.getGUIString("webpages.listOAs.list.elInfo", request) %> + </div> + </s:if> <div class="listFirst"> <%=LanguageHelper.getGUIString("webpages.listOAs.list.first", request) %> </div> @@ -17,6 +23,11 @@ <s:iterator var="OAelement" value="formOAs"> <div class="listElement" onclick="editOA(<s:property value='dataBaseID'/>);"> + <s:if test="serviceType != 'OA'"> + <div class="listElInfo"> + <s:property value="serviceType"/> + </div> + </s:if> <div class="listFirst"> <s:property value="oaIdentifier"/> </div> @@ -28,7 +39,8 @@ </s:iterator> </div> - <s:form method="POST" id="selectOAForm" action="loadOA" namespace="/secure"> + <s:set var="myUrl">${param.editAction}</s:set> + <s:form method="POST" id="selectOAForm" action="%{#myUrl}" namespace="/secure"> <s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden> </s:form> </s:if> |