From 1bb655bbb372f069e907c6ddcc40a43ca1f36e09 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 19 Dec 2013 11:01:44 +0100
Subject: OA qaa and attributes gui

---
 .../src/main/resources/applicationResources.properties   |  4 +++-
 id/ConfigWebTool/src/main/webapp/js/common.js            |  7 +++++++
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp   | 16 ++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index 2dacf14a2..0ac4b2cbc 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -229,6 +229,8 @@ webpages.moaconfig.stork.newpeps=Neuen PEPS konfigurieren
 webpages.moaconfig.stork.removepeps=l\u00F6schen
 webpages.moaconfig.stork.requestedattributes.default=Standardattribute, die von STORK angefordert werden 
 webpages.moaconfig.stork.qaa.default=Standard QAA-Level ausw\u00E4hlen
+webpages.moaconfig.stork.requestedattributes=Attribute, die von STORK angefordert werden 
+webpages.moaconfig.stork.qaa=Mindest-QAA-Level f\u00FCr diese OA ausw\u00E4hlen
 
 webpages.oaconfig.protocols.saml1.header=SAML1 Konfiguration
 webpages.oaconfig.saml1.isActice=SAML1 aktivieren
@@ -401,4 +403,4 @@ validation.general.form.button.color.back.focus=Die Hintergrundfarbe f\\u00FCr F
 validation.general.form.button.color.back=Die Hintergrundfarbe der BKU-Auswahlbuttons enth\\u00E4lt keinen g\\u00FCltigen Hexadezimalwert. (z.B. \\\#FFFFFF)
 validation.general.form.button.color.front=Die Vordergrundfarbe der BKU-Auswahlbuttons enth\\u00E4lt keinen g\\u00FCltigen Hexadezimalwert. (z.B. \\\#FFFFFF)
 validation.general.form.appletredirecttarget=Der RedirectTarget beinhaltet einen ung\\u00FCltiten Wert.
-validation.general.form.fonttype=Der BKU-Auswahl Schrifttyp enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
\ No newline at end of file
+validation.general.form.fonttype=Der BKU-Auswahl Schrifttyp enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index e6fcdf977..b07b31205 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -22,6 +22,13 @@ function oaSSOService() {
 		
 	}
 }
+function oaStork() {
+	if ($('#OAuseSTORKLogon').attr('checked') == 'checked') {
+		$('#stork_block').css('display', "block");
+	} else {
+		$('#stork_block').css('display', "none");
+	}
+}
 function oaSAML1() {
 	if ($('#oa_saml1_area').css('display') == "block") {
 		$('#oa_saml1_area').css('display', "none");
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 3234c6a86..d12a47b9e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -310,8 +310,20 @@
 							labelposition="left"
 							key="webpages.oaconfig.stork.usestork"
 							cssClass="checkbox"
-							id="OAuseSTORKLogon">
-						</s:checkbox>
+							onclick="oaStork();"
+							id="OAuseSTORKLogon" />
+						<div id="stork_block">
+							<s:textfield name="storkOA.attributes"
+								value="%{storkOA.attributes}"
+								labelposition="left"
+								key="webpages.moaconfig.stork.requestedattributes"
+								cssClass="textfield_long"/>
+							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+								value="#{storkOA.qaa}"
+								name="storkOA.qaa"
+								key="webpages.moaconfig.stork.qaa"
+								labelposition="left" />
+						</div>
 					</div>
 
 					<div class="oa_config_block">
-- 
cgit v1.2.3