From 4b932484d66ef161bb547a419fdc32f04677fe57 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 7 Apr 2016 10:44:11 +0200
Subject: fix some possible problems with STORK configuration in config-GUI

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index ac2c8de5a..45ea159e4 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -288,7 +288,12 @@
 								<s:iterator value="storkconfig.cpepslist" status="stat">
 								  <tr>
 								  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
-								  	<td><s:property value="%{countryCode}" /></td>
+								  	<s:if test="%{countryCode == 'CC'}">
+									  	<td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								  	</s:if>
+								  	<s:else>
+								  		<td><s:property value="%{countryCode}" /></td>
+								  	</s:else>
 								    <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
 								    <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td>								    
 								    <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td>
-- 
cgit v1.2.3


From 21dd0d9a01a77e00565af20d55b52daaf1b3af32 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 23 Jun 2016 10:16:30 +0200
Subject: update configuration GUI for eIDAS nodes

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 45ea159e4..254418415 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -284,7 +284,7 @@
 								labelposition="left" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
               <table id="stork_pepslist">
-								<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLSignatures</td></tr>
+								<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLEncryption</td></tr>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
 								  <tr>
 								  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
-- 
cgit v1.2.3