From 2c63ca5a3d8b7fe4583e96abe33cde589ade9d54 Mon Sep 17 00:00:00 2001 From: Alexander Marsalek Date: Thu, 16 Oct 2014 15:07:14 +0200 Subject: config -newpeps() fix --- id/ConfigWebTool/src/main/webapp/js/common.js | 3 ++- id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index f7ef2c415..24702807f 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -232,8 +232,9 @@ function newPeps() { var nextindex = lastindex + 1; clone.innerHTML = clone.innerHTML.replace(/[A-Z]{2}/, '
'); + clone.innerHTML = clone.innerHTML.replace(//, '
'); clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.cpepslist\[\d/g, 'name="storkconfig.cpepslist[' + nextindex); + clone.innerHTML = clone.innerHTML.replace(/name="wwgrp_loadGeneralConfig_storkconfig_cpepslist_\d/g, 'name="wwgrp_loadGeneralConfig_storkconfig_cpepslist_' + nextindex); clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2'); target.parentNode.appendChild(clone); } diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index bf5625419..1aeda519f 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -260,6 +260,7 @@ + " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> -- cgit v1.2.3 From 79867a72c06e4230428d3755509f1bf7b50f9914 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 22 Oct 2014 14:43:55 +0200 Subject: add PVP gateway configuration into configWebTool --- .../main/webapp/jsp/interfederation/pvpgateway.jsp | 61 ++++++++++++++++++++++ .../src/main/webapp/jsp/snippets/OA/pvpgateway.jsp | 18 +++++++ 2 files changed, 79 insertions(+) create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvpgateway.jsp (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp new file mode 100644 index 000000000..ee86c4b91 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp @@ -0,0 +1,61 @@ +<%@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" %> + + + + + + + <%=LanguageHelper.getGUIString("title", request) %> + + + + + + + + + + +
+ +
+ + +
+
+ + +
+

<%=LanguageHelper.getGUIString("webpages.interfederation.header", request) %>

+ + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ +
+ + + + + \ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvpgateway.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvpgateway.jsp new file mode 100644 index 000000000..8acd725c7 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvpgateway.jsp @@ -0,0 +1,18 @@ +<%@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" %> + + +
+

<%=LanguageHelper.getGUIString("webpages.inderfederation.moaid.header", request) %>

+ + + + +
+ + \ No newline at end of file -- cgit v1.2.3 From 479f2dc2f37b0bcdc9317e6d740d1e173b34bbb4 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 24 Oct 2014 13:42:13 +0200 Subject: update configtool for STORK-PVP gateway configuration --- .../src/main/webapp/jsp/interfederation/idplist.jsp | 6 +++++- .../src/main/webapp/jsp/snippets/OA/interfederation.jsp | 10 ++++++++++ .../src/main/webapp/jsp/snippets/OA/pvpgateway.jsp | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp index 3e7404dfc..ef666b357 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp @@ -46,7 +46,11 @@ - + + + + + diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp index 97d21bcb4..b104e0fa7 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp @@ -20,6 +20,16 @@ labelposition="left" cssClass="checkbox" name="moaIDP.storeSSOSession"> + + + +

<%=LanguageHelper.getGUIString("webpages.inderfederation.moaid.header", request) %>

- -- cgit v1.2.3 From bda377810ebe5467439d2098d683788ba4e7e602 Mon Sep 17 00:00:00 2001 From: Alexander Marsalek Date: Fri, 24 Oct 2014 15:39:56 +0200 Subject: newPeps() fix --- id/ConfigWebTool/src/main/webapp/js/common.js | 35 ++++++++++++++++++++------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 24702807f..9f19e88a2 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -223,19 +223,36 @@ function oaOnLoad() { function newPeps() { var target = $(document.getElementById("stork_pepslist").getElementsByTagName("tr")).last()[0]; var clone = target.cloneNode(true); + var lastindex; try { - var lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.cpepslist\[(\d)/)[1]); + lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.cpepslist\[(\d*)\]/)[1]); } catch (err) { - - var lastindex = 1; + lastindex = 1; } var nextindex = lastindex + 1; - - clone.innerHTML = clone.innerHTML.replace(/[A-Z]{2}/, '
'); - clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.cpepslist\[\d/g, 'name="storkconfig.cpepslist[' + nextindex); - clone.innerHTML = clone.innerHTML.replace(/name="wwgrp_loadGeneralConfig_storkconfig_cpepslist_\d/g, 'name="wwgrp_loadGeneralConfig_storkconfig_cpepslist_' + nextindex); - clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2'); + clone.innerHTML = '\ + \ +
\ +
\ +
\ +
\ + \ + \ +
\ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ +
\ +
\ + \ + \ + \ + '; target.parentNode.appendChild(clone); } function newStorkAttribute() { -- cgit v1.2.3 From def91ef4b2e19c18aa1f17de391fe08f165292a8 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 30 Oct 2014 14:40:28 +0100 Subject: fix problems with non-admin user --- id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp index 954bf9b8b..0cd861884 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp @@ -38,7 +38,9 @@

<%=LanguageHelper.getGUIString("webpages.openadminrequests.oas.header", request) %>

- + + loadOA +
-- cgit v1.2.3