aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/WEB-INF/log4j.properties22
-rw-r--r--id/ConfigWebTool/src/main/webapp/css/index.css23
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/colorpicker.js22
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/common.js47
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp57
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp30
6 files changed, 192 insertions, 9 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/log4j.properties b/id/ConfigWebTool/src/main/webapp/WEB-INF/log4j.properties
index 3ca86f404..1c5b79e8f 100644
--- a/id/ConfigWebTool/src/main/webapp/WEB-INF/log4j.properties
+++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/log4j.properties
@@ -1,3 +1,25 @@
+###############################################################################
+# Copyright 2014 Federal Chancellery Austria
+# MOA-ID has been developed in a cooperation between BRZ, the Federal
+# Chancellery Austria - ICT staff unit, and Graz University of Technology.
+#
+# Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+# the European Commission - subsequent versions of the EUPL (the "Licence");
+# You may not use this work except in compliance with the Licence.
+# You may obtain a copy of the Licence at:
+# http://www.osor.eu/eupl/
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the Licence is distributed on an "AS IS" basis,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the Licence for the specific language governing permissions and
+# limitations under the Licence.
+#
+# This product combines work with different licenses. See the "NOTICE" text
+# file for details on the various modules and licenses.
+# The "NOTICE" text file is part of the distribution. Any derivative works
+# that you distribute must include a readable copy of the "NOTICE" text file.
+###############################################################################
# Set root category priority to INFO and its only appender to CONSOLE.
log4j.rootCategory=INFO, CONSOLE
#log4j.rootCategory=INFO, CONSOLE, LOGFILE
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 14591f1dc..79f8b4e72 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -1,10 +1,14 @@
@CHARSET "UTF-8";
+body {
+ font-size: 1em;
+}
+
#header_area {
padding-bottom: 10px;
background-color: #6FA5D4;
display: block;
- font-size: 20px;
+ font-size: 1.2em;
/* margin-left: 25px; */
padding-top: 10px;
padding-left: 25px;
@@ -12,7 +16,7 @@
}
#header_area>div {
- font-size: 20px;
+ font-size: 1.2em;
margin-left: 25px;
padding-top: 8px;
}
@@ -69,7 +73,7 @@
.menu_element {
margin-top: 15px;
margin-bottom: 15px;
- font-size: 20px;
+ font-size: 1.2em;
display: block;
/* background-color: red; */
background-color: #6FA5D4;
@@ -96,7 +100,7 @@
}
#message_area label {
- font-size: 18px;
+ font-size: 1.1em;
font-weight: bold;
}
@@ -105,7 +109,7 @@
}
#error_area label{
- font-size: 18px;
+ font-size: 1.1em;
font-weight: bold;
}
@@ -220,6 +224,11 @@
margin-left: 10px;
}
+#moageneral_active_protocol>.wwgrp {
+ float: left;
+ clear: none;
+}
+
#moageneral_legacy_protocol>.wwgrp {
clear: none;
}
@@ -318,7 +327,7 @@ div .wwgrp br {
border-bottom-style: none;
display: table-header-group;
font-weight: bold;
- font-size: 18px;
+ font-size: 1.1em;
}
.listFirst {
@@ -371,7 +380,7 @@ div .wwgrp br {
padding-left: 30px;
position: relative;
top: 15px;
- font-size: 20px;
+ font-size: 1.2em;
text-align: center;
padding-top: 10px;
border-radius: 3px;
diff --git a/id/ConfigWebTool/src/main/webapp/js/colorpicker.js b/id/ConfigWebTool/src/main/webapp/js/colorpicker.js
index 45f56ced7..d54c0d271 100644
--- a/id/ConfigWebTool/src/main/webapp/js/colorpicker.js
+++ b/id/ConfigWebTool/src/main/webapp/js/colorpicker.js
@@ -1,3 +1,25 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
/**
*
* Color picker
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index ff9509895..384e40509 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -1,3 +1,25 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
function oaBusinessService() {
if ($('#OAisbusinessservice').attr('checked') == 'checked') {
@@ -22,6 +44,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");
@@ -177,4 +206,22 @@ function oaOnLoad() {
);
return true;
+}
+function newPeps() {
+ var target = $(document.getElementById("stork_pepslist").getElementsByTagName("tr")).last()[0];
+ var clone = target.cloneNode(true);
+ var lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.cpepslist\[(\d)/)[1]);
+ var nextindex = lastindex + 1;
+ clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.cpepslist\[\d/g, 'name="storkconfig.cpepslist[' + nextindex);
+ clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
+ target.parentNode.appendChild(clone);
+}
+function newStorkAttribute() {
+ var target = $(document.getElementById("stork_attributelist").getElementsByTagName("tr")).last()[0];
+ var clone = target.cloneNode(true);
+ var lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.attributes\[(\d)/)[1]);
+ var nextindex = lastindex + 1;
+ clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.attributes\[\d/g, 'name="storkconfig.attributes[' + nextindex);
+ clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
+ target.parentNode.appendChild(clone);
} \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 05f4a1106..41702cbbb 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -227,8 +227,61 @@
</div>
<div class="oa_config_block">
+ <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+ <s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+ value="#{storkconfig.defaultQaa}"
+ name="storkconfig.defaultQaa"
+ 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>
+ <s:iterator value="storkconfig.cpepslist" status="stat">
+ <tr><td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+ <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></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>
+ </table>
+ <input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
+ <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
+ <table id="stork_attributelist">
+ <tr><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></th><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></th></tr>
+ <s:iterator value="storkconfig.attributes" status="stat">
+ <tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
+ <td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
+ <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+ </s:iterator>
+ </table>
+ <input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' />
+ </div>
+
+ <div class="oa_config_block">
<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.header", request) %></h3>
-
+
+ <div id="moageneral_active_protocol" class="moageneral_protocol_area">
+ <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.allowed.header", request) %></h4>
+ <s:checkbox name="moaconfig.protocolActiveSAML1"
+ value="%{moaconfig.protocolActiveSAML1}"
+ labelposition="left"
+ key="webpages.moaconfig.protocols.legacy.saml1"
+ cssClass="checkbox">
+ </s:checkbox>
+ <s:checkbox name="moaconfig.protocolActivePVP21"
+ value="%{moaconfig.protocolActivePVP21}"
+ labelposition="left"
+ key="webpages.moaconfig.protocols.legacy.pvp2"
+ cssClass="checkbox">
+ </s:checkbox>
+ <s:checkbox name="moaconfig.protocolActiveOAuth"
+ value="%{moaconfig.protocolActiveOAuth}"
+ labelposition="left"
+ key="webpages.moaconfig.protocols.oauth"
+ cssClass="checkbox">
+ </s:checkbox>
+ </div>
+
+ <br>
+
<div id="moageneral_legacy_protocol" class="moageneral_protocol_area">
<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.legacy.header", request) %></h4>
<s:checkbox name="moaconfig.legacy_saml1"
@@ -245,6 +298,8 @@
</s:checkbox>
</div>
+ <br>
+
<div class="moageneral_protocol_area">
<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 97f0d01c2..4e8dfc259 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -303,6 +303,34 @@
</div>
<div class="oa_config_block">
+ <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+
+ <s:checkbox name="storkOA.storkLogonEnabled"
+ value="%{storkOA.storkLogonEnabled}"
+ labelposition="left"
+ key="webpages.oaconfig.stork.usestork"
+ cssClass="checkbox"
+ onclick="oaStork();"
+ id="OAuseSTORKLogon" />
+ <div id="stork_block">
+ <s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+ value="#{storkOA.qaa}"
+ name="storkOA.qaa"
+ key="webpages.moaconfig.stork.qaa"
+ labelposition="left" />
+ <h4>Attributes</h4>
+ <table>
+ <tr><th>verwendet</th><th>Attributname</th><th>mandatory</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>
+ </s:iterator>
+ </table>
+ </div>
+ </div>
+
+ <div class="oa_config_block">
<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
<s:if test="authUser.isAdmin() || saml1OA.isActive()">
@@ -557,7 +585,7 @@
<div id="formCustomPreview">
<iframe scrolling="none"
title="BKUForm Preview"
- height="220"
+ height="260"
width="250">
</iframe>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 19:48:52 +0000