update ConfigTool to support more than one ELGA mandate-service

4 files changed, 59 insertions, 4 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 6b4d310ef..80ccf93be 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -408,6 +408,16 @@ div .wwgrp br {
    text-decoration:none;
 }
 
+.selectfield_long {
+	width: 600px;
+	float: left;
+	margin-right: 5px;
+	background: transparent;
+   overflow: hidden;
+   border: 1px solid #ccc;
+   text-decoration:none;
+}
+
 .checkbox{
 	margin-top: 7px;
 	margin-left:0px;
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index f17ee3623..3d5528ad5 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -292,5 +292,15 @@ function setPublicURLPrefixTestBox(checkbox) {
 function generalConfigLoadEvent() {
 	var value = $("#loadGeneralConfig_moaconfig_publicURLPrefix").val();
 	$("#loadGeneralConfig_moaconfig_publicURLPrefix").val(value.replace(/,/g,",\n"));
+	
+	var elga = $("#loadGeneralConfig_moaconfig_elgaMandateServiceURL").val();
+	$("#loadGeneralConfig_moaconfig_elgaMandateServiceURL").val(elga.replace(/,/g,",\n"));
+	
+	var mis = $("#loadGeneralConfig_moaconfig_mandateURL").val();
+	$("#loadGeneralConfig_moaconfig_mandateURL").val(mis.replace(/,/g,",\n"));
+	
+	var szrgw = $("#loadGeneralConfig_moaconfig_szrgwURL").val();
+	$("#loadGeneralConfig_moaconfig_szrgwURL").val(szrgw.replace(/,/g,",\n"));
+	
 	return true;	
 }
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index c54e386a2..446b2e110 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -233,18 +233,24 @@
 						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.services.header", request) %></h3>
-							<s:textfield name="moaconfig.mandateURL" 
+							<s:textarea name="moaconfig.mandateURL" 
 								value="%{moaconfig.mandateURL}" 
 								labelposition="left"
 								key="webpages.moaconfig.services.mandates"
 								cssClass="textfield_long">
-							</s:textfield>
-							<s:textfield name="moaconfig.szrgwURL" 
+							</s:textarea>
+							<s:textarea name="moaconfig.szrgwURL" 
 								value="%{moaconfig.szrgwURL}" 
 								labelposition="left"
 								key="webpages.moaconfig.services.szrgw"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textarea>
+							<s:textarea name="moaconfig.elgaMandateServiceURL" 
+								value="%{moaconfig.elgaMandateServiceURL}" 
+								labelposition="left"
+								key="webpages.moaconfig.services.elgamandateservice"
+								cssClass="textfield_long">
+							</s:textarea>
 						</div>
 						
 						<div class="oa_config_block" >
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index f0b5c816a..ff2b091c6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -127,6 +127,35 @@
 									cssClass="checkbox">
 						</s:checkbox>
 						
+					  <s:select list="authOA.misServicesList"
+											key="webpages.oaconfig.general.mandate.misservice.selected"
+											labelposition="left"
+											cssClass="selectfield_long"
+											value="%{authOA.misServiceSelected}"
+											name="authOA.misServiceSelected">
+						</s:select>
+						
+						<s:select list="authOA.elgaServicesList"
+											key="webpages.oaconfig.general.mandate.elgaservice.selected"
+											labelposition="left"
+											cssClass="selectfield_long"
+											value="%{authOA.elgaServiceSelected}"
+											name="authOA.elgaServiceSelected">
+						</s:select>
+						
 					</div>						
 				
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.szrgw.header", request) %></h3>
+						
+						<s:select list="authOA.szrgwServicesList"
+											key="webpages.oaconfig.general.szrgw.selected"
+											labelposition="left"
+											cssClass="selectfield_long"
+											value="%{authOA.szrgwServiceSelected}"
+											name="authOA.szrgwServiceSelected">
+						</s:select>
+						
+					</div>	
+				
 </html>
\ No newline at end of file