From b339f0098307d10723a79ad98e9fabe35f6b02f6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 May 2014 16:17:23 +0200
Subject: refectore OnlineApplication formData

---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 20a5ad1ea..95a93eecc 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -186,36 +186,36 @@
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
 							
-							<s:textfield name="generalOA.bkuOnlineURL" 
-								value="%{generalOA.bkuOnlineURL}" 
+							<s:textfield name="authOA.bkuOnlineURL" 
+								value="%{authOA.bkuOnlineURL}" 
 								labelposition="left"
 								key="webpages.oaconfig.general.bku.online"
 								cssClass="textfield_long">
 							</s:textfield>
 	
-							<s:textfield name="generalOA.bkuHandyURL" 
-								value="%{generalOA.bkuHandyURL}" 
+							<s:textfield name="authOA.bkuHandyURL" 
+								value="%{authOA.bkuHandyURL}" 
 								labelposition="left"
 								key="webpages.oaconfig.general.bku.handy"
 								cssClass="textfield_long">
 							</s:textfield>
 	
-							<s:textfield name="generalOA.bkuLocalURL" 
-								value="%{generalOA.bkuLocalURL}" 
+							<s:textfield name="authOA.bkuLocalURL" 
+								value="%{authOA.bkuLocalURL}" 
 								labelposition="left"
 								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
 							
-							<s:radio list="generalOA.keyBoxIdentifierList"
-								name="generalOA.keyBoxIdentifier"
-								value="%{generalOA.keyBoxIdentifier}"
+							<s:radio list="authOA.keyBoxIdentifierList"
+								name="authOA.keyBoxIdentifier"
+								value="%{authOA.keyBoxIdentifier}"
 								labelposition="left"
 								key="webpages.oaconfig.general.bku.keyboxidentifier"
 								cssClass="radio">
 							</s:radio>						
-							<s:checkbox name="generalOA.legacy" 
-								value="%{generalOA.legacy}"
+							<s:checkbox name="authOA.legacy" 
+								value="%{authOA.legacy}"
 								labelposition="left"
 								key="webpages.oaconfig.general.bku.legacy"
 								cssClass="checkbox"
@@ -223,20 +223,20 @@
 								id="OAislegacy">
 							</s:checkbox>
 							<div id="oa_config_sltemplates">
-								<s:textfield name="generalOA.SLTemplateURL1" 
-									value="%{generalOA.SLTemplateURL1}" 
+								<s:textfield name="authOA.SLTemplateURL1" 
+									value="%{authOA.SLTemplateURL1}" 
 									labelposition="left"
 									key="webpages.oaconfig.general.bku.sltemplate.first"
 									cssClass="textfield_long">
 								</s:textfield>
-								<s:textfield name="generalOA.SLTemplateURL2" 
-									value="%{generalOA.SLTemplateURL2}" 
+								<s:textfield name="authOA.SLTemplateURL2" 
+									value="%{authOA.SLTemplateURL2}" 
 									labelposition="left"
 									key="webpages.oaconfig.general.bku.sltemplate.second"
 									cssClass="textfield_long">
 								</s:textfield>
-								<s:textfield name="generalOA.SLTemplateURL3" 
-									value="%{generalOA.SLTemplateURL3}" 
+								<s:textfield name="authOA.SLTemplateURL3" 
+									value="%{authOA.SLTemplateURL3}" 
 									labelposition="left"
 									key="webpages.oaconfig.general.bku.sltemplate.third"
 									cssClass="textfield_long">
@@ -245,42 +245,42 @@
 							
 							<div class="oa_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
-								<s:iterator value="%{generalOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
+								<s:iterator value="%{formOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
 									<div class="floatClass">
 										<s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
 										<s:checkbox key="webpages.oaconfig.general.bku.delete"
 																labelposition="left"														
 																cssClass="checkbox"
-																name="generalOA.deleteBKUTemplate"></s:checkbox>
+																name="formOA.deleteBKUTemplate"></s:checkbox>
 									</div>
 									<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+										<s:file name="formOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
 									</div>
 								</s:iterator>
-								<s:if test="generalOA.bkuSelectionFileUploadFileName.size() == 0">
+								<s:if test="formOA.bkuSelectionFileUploadFileName.size() == 0">
 										<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+										<s:file name="formOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
 									</div>
 								</s:if>
 							</div>
 							<div class="oa_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
-								<s:iterator value="%{generalOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
+								<s:iterator value="%{formOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
 									<div class="floatClass">
 										<s:label 	key="webpages.oaconfig.general.bku.sendassertion.filename" 
 															value="%{fileNameBKU}"/>
 										<s:checkbox key="webpages.oaconfig.general.bku.delete"
 																labelposition="left"														
 																cssClass="checkbox"
-																name="generalOA.deleteSendAssertionTemplate"></s:checkbox>
+																name="formOA.deleteSendAssertionTemplate"></s:checkbox>
 									</div>
 									<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+										<s:file name="formOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
 									</div>
 								</s:iterator>
-								<s:if test="generalOA.sendAssertionFileUploadFileName.size() == 0">
+								<s:if test="formOA.sendAssertionFileUploadFileName.size() == 0">
 										<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+										<s:file name="formOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
 									</div>
 								</s:if>
 							</div>
@@ -292,15 +292,15 @@
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.mandate.header", request) %></h3>
 						
 						
-						<s:checkbox name="generalOA.useMandates" 
-												value="%{generalOA.useMandates}"
+						<s:checkbox name="authOA.useMandates" 
+												value="%{authOA.useMandates}"
 												labelposition="left"
 												key="webpages.oaconfig.general.mandate.usemandate"
 												cssClass="checkbox">
 						</s:checkbox>	
 						
-						<s:textfield name="generalOA.mandateProfiles" 
-							value="%{generalOA.mandateProfiles}" 
+						<s:textfield name="authOA.mandateProfiles" 
+							value="%{authOA.mandateProfiles}" 
 							labelposition="left"
 							key="webpages.oaconfig.general.mandate.profiles"
 							cssClass="textfield_long">
@@ -553,16 +553,16 @@
 							cssClass="textfield_long">
 						</s:checkbox> --%>
 						
-						<s:checkbox name="generalOA.HideBPKAuthBlock" 
-							value="%{generalOA.HideBPKAuthBlock}"
+						<s:checkbox name="formOA.HideBPKAuthBlock" 
+							value="%{formOA.HideBPKAuthBlock}"
 							labelposition="left"
 							key="webpages.oaconfig.general.isHideBPKAuthBlock"
 							cssClass="checkbox">
 						</s:checkbox>
 						
 						<s:if test="authUser.isAdmin()">						
-							<s:textarea name="generalOA.aditionalAuthBlockText" 
-								value="%{generalOA.aditionalAuthBlockText}" 
+							<s:textarea name="formOA.aditionalAuthBlockText" 
+								value="%{formOA.aditionalAuthBlockText}" 
 								labelposition="left"
 								key="webpages.oaconfig.general.aditional.authblocktext"
 								cssClass="textfield_large">
-- 
cgit v1.2.3