use old ConfigTool

6 files changed, 47 insertions, 23 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 1aeda519f..03f8a6b50 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -116,14 +116,6 @@
 								cssClass="textfield_long">
 							</s:textfield>
 
-							<s:radio list="moaconfig.chainigmodelist"
-								name="moaconfig.defaultchainigmode"
-								value="%{moaconfig.defaultchainigmode}"
-								labelposition="left"
-								key="webpages.moaconfig.certificates.chainingmode"
-								cssClass="radio">
-							</s:radio>		
-
 						</div>
 						
 						<div class="oa_config_block">
@@ -187,12 +179,12 @@
 								cssClass="textfield_long">
 							</s:textfield>
 							
-							<s:textfield name="moaconfig.moaspssURL" 
+<%-- 							<s:textfield name="moaconfig.moaspssURL" 
 								value="%{moaconfig.moaspssURL}" 
 								labelposition="left"
 								key="webpages.moaconfig.moasp.url"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 							
 						</div>
 						
@@ -248,14 +240,16 @@
 								key="webpages.moaconfig.stork.qaa.default"
 								labelposition="left" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
-                            <table id="stork_pepslist">
-								<tr><th>Country Shortcode</th><th>PEPS URL</th><th>Supports XMLSignatures</th>
+              <table id="stork_pepslist">
+								<tr><th>Country Shortcode</th><th>PEPS URL</th><th>Supports XMLSignatures</th></tr>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
-								  <tr><td><s:hidden name="storkconfig.cpepslist[%{#stat.index}].hjid" property="%{hjid}"/>
-								  	      <s:property value="%{countryCode}" /></td>
-								      <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 type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								  <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>
+								    <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 type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td>
+								  </tr>
 								</s:iterator>
                      						<s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}">
                                     <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_short"/></td>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index c56ad4847..c98b400f7 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -84,6 +84,8 @@
 					</div>
 
 					<s:include value="snippets/OA/formCustomization.jsp"></s:include>
+
+					<s:include value="snippets/OA/revisionslog.jsp"></s:include>
 										
 					<s:hidden name="formID" 
 							value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp
index 38dee8c70..a2617a0e9 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp
@@ -44,7 +44,9 @@
 				</s:form>
 			</div>
 			
-			<jsp:include page="snippets/oas_list.jsp"></jsp:include>
+			<s:include value="snippets/oas_list.jsp">
+				<s:param name="editAction">loadOA</s:param>
+			</s:include>
 			
 		</div>
 		
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 398e6d110..7e40fc60b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
@@ -6,10 +6,10 @@
 						<div id="oa_pvp2_area" class="oa_protocol_area ${param.hideBlock}">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
 						
-							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
+<%-- 							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
 														labelposition="left"														
 														cssClass="checkbox"
-														name="pvp2OA.reLoad"></s:checkbox>
+														name="pvp2OA.reLoad"></s:checkbox> --%>
 						
 						  <s:textfield name="pvp2OA.metaDataURL" 
 								value="%{pvp2OA.metaDataURL}" 
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/revisionslog.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/revisionslog.jsp
new file mode 100644
index 000000000..fd6e71642
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/revisionslog.jsp
@@ -0,0 +1,23 @@
+<%@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 class="oa_config_block">		
+		<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.revisionsLog.header", request) %></h3>
+						
+		<s:checkbox 	key="webpages.oaconfig.revisionsLog.active"
+									labelposition="left"														
+									cssClass="checkbox"
+									name="revisionsLogOA.active"></s:checkbox>
+															
+		<s:textfield name="revisionsLogOA.eventCodes" 
+		 						 value="%{revisionsLogOA.eventCodes}" 
+								 labelposition="left"
+								 key="webpages.oaconfig.revisionsLog.eventCodes"
+								 cssClass="textfield_long">
+		</s:textfield>
+						
+	</div>
+				
+</html> 
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
index f1853dbeb..78fdf8921 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
@@ -27,9 +27,12 @@
 								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.name", request) %></th>
 								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.mandatory", request) %></th></tr>
 								<s:iterator value="storkOA.helperAttributes" status="stat">
-									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /></td>
-										<td><s:property value="%{name}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
-										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td></tr>
+									<tr>
+										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /></td>
+										<td><s:property value="%{name}" /></td>										
+										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
+										<td style="display:none;"><s:textfield name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
+									</tr>
 								</s:iterator>
 							</table>
 						</div>