From 8d417057d38d56510a1d3d2e39381a1df3dd96ee Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 16 Oct 2013 20:09:40 +0200
Subject: @ConfigWebTool  --add JS ColorPicker to select colors easier  --add
 BKUSelectionFrom preview  --add useMandate checkbox

 --change position of some checkboxes in OA configuration

@MOAID lib
  --change API of BKUFormCustomization utils
---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 205 +++++++++++++--------
 1 file changed, 125 insertions(+), 80 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index f7a722893..e8bb346a6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -7,9 +7,12 @@
 	<head>
 		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
 		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<link rel="stylesheet" media="screen" type="text/css" href="../css/colorpicker.css" />
+		
 		<title><%=LanguageHelper.getGUIString("title", request) %></title>
 		<script type="text/javascript" src="../js/common.js"></script>
 		<script src="../js/jquery.js"></script>
+		<script type="text/javascript" src="../js/colorpicker.js"></script>
 		
 	</head>
 	
@@ -244,12 +247,28 @@
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.mandate.header", request) %></h3>
 						
+						
+						<s:checkbox name="generalOA.useMandates" 
+												value="%{generalOA.useMandates}"
+												labelposition="left"
+												key="webpages.oaconfig.general.mandate.usemandate"
+												cssClass="checkbox">
+						</s:checkbox>	
+						
 						<s:textfield name="generalOA.mandateProfiles" 
 							value="%{generalOA.mandateProfiles}" 
 							labelposition="left"
 							key="webpages.oaconfig.general.mandate.profiles"
 							cssClass="textfield_long">
 						</s:textfield>
+						
+						<s:checkbox name="formOA.onlyMandateAllowed" 
+									value="%{formOA.onlyMandateAllowed}"
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
+									cssClass="checkbox">
+						</s:checkbox>
+						
 					</div>
 
 					<div class="oa_config_block">
@@ -326,13 +345,13 @@
 								key="webpages.oaconfig.saml1.provideAuthBlock"
 								cssClass="checkbox">
 							</s:checkbox>
+							<br>
 							<s:checkbox name="saml1OA.provideIdentityLink" 
 								value="%{saml1OA.provideIdentityLink}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideIdentityLink"
 								cssClass="checkbox">
-							</s:checkbox>
-							<br>
+							</s:checkbox>							
 							<s:checkbox name="saml1OA.provideCertificate" 
 								value="%{saml1OA.provideCertificate}"
 								labelposition="left"
@@ -417,85 +436,111 @@
 						  						
 							<div id="formcustom_area" class="oa_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
-													
-								<s:checkbox name="formOA.showMandateLoginButton" 
-									value="%{formOA.showMandateLoginButton}"
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.isMandateLoginCheckboxVisible"
-									cssClass="checkbox">
-								</s:checkbox>						
-								<s:checkbox name="formOA.onlyMandateAllowed" 
-									value="%{formOA.onlyMandateAllowed}"
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
-									cssClass="checkbox">
-								</s:checkbox>
-								
-								<s:textfield name="formOA.backGroundColor" 
-									value="%{formOA.backGroundColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
-									cssClass="textfield_middle">
-								</s:textfield>								
-								<s:textfield name="formOA.frontColor" 
-									value="%{formOA.frontColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.frontcolor"
-									cssClass="textfield_middle">
-								</s:textfield>
-								
-								<s:textfield name="formOA.header_BackGroundColor" 
-									value="%{formOA.header_BackGroundColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.backgroundcolor"
-									cssClass="textfield_middle">
-								</s:textfield>
-								<s:textfield name="formOA.header_FrontColor" 
-									value="%{formOA.header_FrontColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.frontcolor"
-									cssClass="textfield_middle">
-								</s:textfield>
-								<s:textfield name="formOA.header_text" 
-									value="%{formOA.header_text}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.text"
-									cssClass="textfield_middle">
-								</s:textfield>
-								
-								<s:textfield name="formOA.button_BackGroundColor" 
-									value="%{formOA.button_BackGroundColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.button.background"
-									cssClass="textfield_middle">
-								</s:textfield>
-								<s:textfield name="formOA.button_BackGroundColorFocus" 
-									value="%{formOA.button_BackGroundColorFocus}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.button.background.focus"
-									cssClass="textfield_middle">
-								</s:textfield>
-								<s:textfield name="formOA.button_FrontColor" 
-									value="%{formOA.button_FrontColor}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.header.button.front"
-									cssClass="textfield_middle">
-								</s:textfield>
-								
-								<s:select list="formOA.appletRedirectTargetList"
-													key="webpages.oaconfig.general.BKUSelection.redirectTarget"
-													labelposition="left"
-													cssClass="selectfield"
-													value="%{formOA.appletRedirectTarget}"
-													name="formOA.appletRedirectTarget">
-								</s:select>
-								<s:textfield name="formOA.fontType" 
-									value="%{formOA.fontType}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.fonttype"
-									cssClass="textfield_long">
-								</s:textfield>
+																
+								<div id="formCustomValues">													
+									<s:textfield name="formOA.backGroundColor" 
+										value="%{formOA.backGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("MAIN_BACKGOUNDCOLOR")'
+										id="MAIN_BACKGOUNDCOLOR">
+									</s:textfield>								
+									<s:textfield name="formOA.frontColor" 
+										value="%{formOA.frontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.frontcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("MAIN_COLOR")'
+										id="MAIN_COLOR">
+									</s:textfield>
+									
+									<s:textfield name="formOA.header_BackGroundColor" 
+										value="%{formOA.header_BackGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.backgroundcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("HEADER_BACKGROUNDCOLOR")'
+										id="HEADER_BACKGROUNDCOLOR">
+									</s:textfield>
+									<s:textfield name="formOA.header_FrontColor" 
+										value="%{formOA.header_FrontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.frontcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("HEADER_COLOR")'
+										id="HEADER_COLOR">
+									</s:textfield>
+									<s:textfield name="formOA.header_text" 
+										value="%{formOA.header_text}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.text"
+										cssClass="textfield_middle"
+										onchange='updateBKUFormPreview("HEADER_TEXT")'
+										id="HEADER_TEXT">
+									</s:textfield>
+									
+	<%-- 								<s:textfield name="formOA.button_BackGroundColor" 
+										value="%{formOA.button_BackGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.background"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR")'
+										id="BUTTON_BACKGROUNDCOLOR">
+									</s:textfield>
+									<s:textfield name="formOA.button_BackGroundColorFocus" 
+										value="%{formOA.button_BackGroundColorFocus}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.background.focus"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR_FOCUS")'
+										id="BUTTON_BACKGROUNDCOLOR_FOCUS">
+									</s:textfield>
+									<s:textfield name="formOA.button_FrontColor" 
+										value="%{formOA.button_FrontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.front"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_COLOR")'
+										id="BUTTON_COLOR">
+									</s:textfield> --%>
+									
+									<s:select list="formOA.appletRedirectTargetList"
+														key="webpages.oaconfig.general.BKUSelection.redirectTarget"
+														labelposition="left"
+														cssClass="selectfield"
+														value="%{formOA.appletRedirectTarget}"
+														name="formOA.appletRedirectTarget">
+									</s:select>
+									
+									<s:select list="formOA.fontTypeList"
+														key="webpages.oaconfig.general.BKUSelection.fonttype.list"
+														labelposition="left"
+														cssClass="selectfield"
+														value="%{formOA.fontType}"
+														name="formOA.fontTypeListValue"
+														id="fontTypeList"
+														onchange='$("#FONTTYPE").val($("#fontTypeList").val());updateBKUFormPreview("FONTTYPE");'>
+									</s:select>
+									
+									<s:textfield 	name="formOA.fontType" 
+																value="%{formOA.fontType}" 
+																labelposition="left"
+																key="webpages.oaconfig.general.BKUSelection.fonttype"
+																cssClass="textfield_mail"													
+																onchange='updateBKUFormPreview("FONTTYPE")'
+																id="FONTTYPE">
+									</s:textfield>		
+								</div>
 								
+								<div id="formCustomPreview">
+										<iframe scrolling="none" 
+														title="BKUForm Preview"
+														height="220"
+														width="250">
+										</iframe>
+								</div>
+																
 							</div>
 						</s:if>
 							
-- 
cgit v1.2.3

