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/css/index.css111
-rw-r--r--id/ConfigWebTool/src/main/webapp/index.jsp2
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/common.js4
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp60
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp22
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp4
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp54
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp17
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp35
9 files changed, 246 insertions, 63 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index be85418af..c0b95abba 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -47,18 +47,42 @@
#information_area {
float: left;
padding-left: 25px;
+ padding-top: 25px;
+}
+
+#message_area {
+ color: green;
+}
+
+#message_area label {
+ font-size: 18px;
+ font-weight: bold;
+}
+
+#error_area {
+ color: red;
+}
+
+#error_area label{
+ font-size: 18px;
+ font-weight: bold;
+}
+
+#search_area {
+
}
#button_area {
margin-top: 25px;
margin-bottom: 50px;
- margin-left: 20%;
+ clear: both;
+ padding-left: 70px;
}
#button_area input {
- float: left;
- margin-left: 100px;
- width: 250px;
+ float: left;
+ margin-left: 40px;
+ width: 225px;
}
#button_saml1_hidden {
@@ -83,37 +107,70 @@
.oa_config_block {
padding-left: 15px;
+ clear: both;
}
-.oa_config_block label{
+/* .oa_config_block label{
float: left;
padding-right: 10px;
padding-top: 3px;
text-align: right;
width: 250px;
-}
+} */
.oa_config_block label.radio{
text-align: left;
width: 170px;
}
-.oa_config_block input{
+/* .oa_config_block input{
float: left;
padding-bottom: 5px;
padding-top: 5px;
text-align: left;
-}
+} */
.oa_config_block input.radio{
margin-top: 6px;
}
.oa_config_block h3 {
- clear: both;
padding-top: 25px;
}
+#loadOA_webpages_oaconfig_pvp2_certifcate_info{
+ width: 100%;
+}
+
+.wwlbl {
+ float: left;
+ padding-right: 10px;
+ padding-top: 3px;
+ text-align: right;
+ width: 250px;
+}
+
+.wwctrl {
+ float: left;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ text-align: left;
+}
+
+.wwgrp {
+ clear:both;
+}
+
+#oa_saml1_area .wwgrp {
+ float: left;
+ clear: none;
+ margin-right: 50px;
+}
+
+div .wwgrp br {
+ display: none;
+}
+
.textfield_short {
width: 30px;
@@ -139,6 +196,42 @@
margin-left: 100px;
}
+#list_area {
+ width: 100%;
+}
+
+.listElement {
+ cursor: pointer;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding-top: 5px;
+ padding-right: 10px;
+ border-bottom: 1px;
+ border-color: red;
+ border-bottom-style: solid;
+ clear: both;
+}
+
+#listHeader {
+ cursor: default;
+ border-bottom-style: none;
+ display: table-header-group;
+ font-weight: bold;
+ font-size: 18px;
+}
+
+.listFirst {
+ position: relative;
+ width: 450px;
+ float: left;
+
+}
+
+.listSecond {
+ position: relative;
+ float: left;
+}
+
#footer_area {
background-color: green;
clear: both;
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index fe39837d1..44d3bef5a 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -17,7 +17,7 @@
<div id="information_area">
<p><%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %></p>
<br/>
- <a href="main.action">Login</a>
+ <a href="secure/main.action">Login</a>
</div>
</body>
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index ca4a7839d..431824c2a 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -1,5 +1,5 @@
function oaBusinessService() {
- if ($('#loadOA_generalOA_businessService').attr('checked') == 'checked') {
+ if ($('#OAisbusinessservice').attr('checked') == 'checked') {
$('#oa_config_businessservice').css('display', "block");
$('#oa_config_publicservice').css('display', "none");
@@ -12,7 +12,7 @@ function oaBusinessService() {
}
}
function oaSSOService() {
- if ($('#loadOA_ssoOA_useSSO').attr('checked') == 'checked') {
+ if ($('#OAuseSSO').attr('checked') == 'checked') {
$('#sso_bock').css('display', "block");
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 442420f36..4d9642130 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -6,10 +6,10 @@
<html>
<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" type="text/css" href="../css/index.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/common.js"></script>
+ <script src="../js/jquery.js"></script>
</head>
@@ -30,18 +30,27 @@
<div id="list_area">
<h2><%=LanguageHelper.getGUIString("webpages.oaconfig.header", request) %></h2>
- <s:form namespace="/" method="POST" enctype="multipart/form-data">
+ <s:form namespace="/secure" method="POST" enctype="multipart/form-data">
<div class="oa_config_block">
+
+ <s:if test="authUser.isAdmin()">
+ <s:checkbox name="generalOA.Active"
+ value="%{generalOA.Active}"
+ labelposition="left"
+ key="webpages.oaconfig.general.isActive"
+ cssClass="checkbox">
+ </s:checkbox>
+ </s:if>
+
<s:textfield name="generalOA.identifier"
value="%{generalOA.identifier}"
labelposition="left"
key="webpages.oaconfig.general.identification"
cssClass="textfield_long">
</s:textfield>
-
-
+
<s:textfield name="generalOA.friendlyName"
value="%{generalOA.friendlyName}"
labelposition="left"
@@ -54,7 +63,8 @@
labelposition="left"
key="webpages.oaconfig.general.isbusinessservice"
cssClass="checkbox"
- onclick="oaBusinessService();">
+ onclick="oaBusinessService();"
+ id="OAisbusinessservice">
</s:checkbox>
</div>
@@ -78,8 +88,7 @@
key="webpages.oaconfig.general.target"
cssClass="textfield_short">
</s:textfield>
- <br>
- <br>
+
<s:textfield name="generalOA.targetFriendlyName"
value="%{generalOA.targetFriendlyName}"
labelposition="left"
@@ -155,10 +164,10 @@
labelposition="left"
key="webpages.oaconfig.sso.usesso"
cssClass="checkbox"
- onclick="oaSSOService();">
+ onclick="oaSSOService();"
+ id="OAuseSSO">
</s:checkbox>
- <br>
- <br>
+
<div id="sso_bock">
<s:if test="authUser.isAdmin()">
<s:checkbox name="ssoOA.showAuthDataFrame"
@@ -169,8 +178,7 @@
onclick="oaBusinessService();">
</s:checkbox>
</s:if>
- <br>
- <br>
+
<s:textfield name="ssoOA.singleLogOutURL"
value="%{ssoOA.singleLogOutURL}"
labelposition="left"
@@ -216,6 +224,7 @@
key="webpages.oaconfig.saml1.provideIdentityLink"
cssClass="checkbox">
</s:checkbox>
+ <br>
<s:checkbox name="saml1OA.provideCertificate"
value="%{saml1OA.provideCertificate}"
labelposition="left"
@@ -257,10 +266,9 @@
</s:textfield>
<s:label key="webpages.oaconfig.pvp2.certifcate.info" value="%{pvp2OA.certificateDN}"/>
- <br>
- <br>
+
<div id="pvp2_certificate_upload">
- <s:label key="webpages.oaconfig.pvp2.certifcate"/><s:file name="pvp2OA.fileUpload"></s:file>
+ <s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
</div>
</div>
</div>
@@ -275,16 +283,14 @@
key="webpages.oaconfig.general.aditional.iframe"
cssClass="checkbox">
</s:checkbox>
- <br>
- <br>
+
<s:checkbox name="generalOA.useUTC"
value="%{generalOA.useUTC}"
labelposition="left"
key="webpages.oaconfig.general.aditional.useUTC"
cssClass="checkbox">
</s:checkbox>
- <br>
- <br>
+
<%-- <s:checkbox name="generalOA.calculateHPI"
value="%{generalOA.calculateHPI}"
labelposition="left"
@@ -301,14 +307,18 @@
</div>
- <s:hidden name="generalOA.dbID"
- value="%{generalOA.dbID}"></s:hidden>
+<%-- <s:hidden name="generalOA.dbID"
+ value="%{generalOA.dbID}"></s:hidden> --%>
<div id="button_area">
- <s:submit key="webpages.edit.back" action="cancleandback"/>
+ <s:submit key="webpages.edit.back" action="cancleandbackOA"/>
+
+ <s:submit key="webpages.edit.save" action="saveOA"/>
- <s:submit key="webpages.edit.save" action="saveGeneral"/>
+ <s:if test="!isNewOA()">
+ <s:submit key="webpages.edit.delete" action="deleteOA"/>
+ </s:if>
</div>
</s:form>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
index 0de9f9c83..11953ec86 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
@@ -7,10 +7,10 @@
<html>
<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" type="text/css" href="../css/index.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/common.js"></script>
+ <script src="../js/jquery.js"></script>
</head>
<body>
@@ -26,20 +26,8 @@
<s:actionerror/>
</div>
</s:if>
-
- <div id="list_area">
- <s:iterator var="OAelement" value="formOAs">
-
- <div class="listElement" onclick="editOA(<s:property value='dataBaseID'/>);">
- <s:property value="oaIdentifier"/>&nbsp;&nbsp;<s:property value="oaFriendlyName"/>&nbsp;&nbsp;<s:property value="isActive"/>
- </div>
-
- </s:iterator>
- </div>
-
- <s:form namespace="/" method="GET" id="selectOAForm" action="loadOA">
- <s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden>
- </s:form>
+
+ <jsp:include page="snippets/oas_list.jsp"></jsp:include>
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
index cbad67e25..c3a4921e9 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
@@ -7,7 +7,7 @@
<html>
<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" type="text/css" href="../css/index.css">
<title><%=LanguageHelper.getGUIString("title", request) %></title>
</head>
@@ -20,7 +20,7 @@
<div id="information_area">
<s:if test="hasActionMessages()">
- <div id="error_area">
+ <div id="message_area">
<label><%=LanguageHelper.getGUIString("message.title", request) %></label>
<s:actionmessage/>
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp
new file mode 100644
index 000000000..38dee8c70
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp
@@ -0,0 +1,54 @@
+<%@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" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+ <link rel="stylesheet" type="text/css" href="../css/index.css">
+ <title><%=LanguageHelper.getGUIString("title", request) %></title>
+ <script type="text/javascript" src="../js/common.js"></script>
+ <script src="../js/jquery.js"></script>
+ </head>
+
+ <body>
+
+ <jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+
+ <jsp:include page="snippets/main_menu.jsp"></jsp:include>
+
+ <div id="information_area">
+ <s:if test="hasActionErrors()">
+ <div id="error_area">
+ <label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+ <s:actionerror/>
+ </div>
+ </s:if>
+
+ <div id="search_area">
+ <h2><%=LanguageHelper.getGUIString("webpages.searchoa.header", request) %></h2>
+
+ <s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+
+ <s:textfield name="friendlyname"
+ value="%{friendlyname}"
+ labelposition="left"
+ key="webpages.searchoa.search.friendlyname"
+ cssClass="textfield_long">
+ </s:textfield>
+
+ <s:submit key="webpages.searchoa.butten.search" action="searchOA"/>
+
+ </s:form>
+ </div>
+
+ <jsp:include page="snippets/oas_list.jsp"></jsp:include>
+
+ </div>
+
+ <jsp:include page="snippets/footer.jsp"></jsp:include>
+
+ </body>
+</html> \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 99447f4ca..06bb1130c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -5,19 +5,22 @@
<html>
<div id="menu_area">
<div class="menu_element">
- <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.insert", request) %></a>
+ <s:url action="newOA.action" var="newOA" namespace="/secure"/>
+ <a href="<s:property value="#newOA" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.insert", request) %></a>
</div>
<div class="menu_element">
- <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.search", request) %></a>
+ <s:url action="searchOAInit.action" var="searchOAs" namespace="/secure"/>
+ <a href="<s:property value="#searchOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.search", request) %></a>
</div>
<div class="menu_element">
- <s:url action="listallapplications.action" var="listAllOAs"/>
+ <s:url action="listallapplications.action" var="listAllOAs" namespace="/secure"/>
<a href="<s:property value="#listAllOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.display", request) %></a>
</div>
<s:if test="authUser.isAdmin()">
<div class="menu_element">
- <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>
+ <s:url action="loadGeneralConfig.action" var="generalConfig" namespace="/secure"/>
+ <a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>
</div>
<div class="menu_element">
<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.importexport", request) %></a>
@@ -27,9 +30,9 @@
</div>
</s:if>
- <div class="menu_element">
- <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a>
- </div>
+ <div class="menu_element">
+ <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a>
+ </div>
</div>
</html> \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
new file mode 100644
index 000000000..2e1b0365f
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
@@ -0,0 +1,35 @@
+<%@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>
+ <s:if test="formOAs && formOAs.size > 0">
+ <div id="list_area">
+ <div id="listHeader" class="listElement">
+ <div class="listFirst">
+ <%=LanguageHelper.getGUIString("webpages.listOAs.list.first", request) %>
+ </div>
+ <div class="listSecond">
+ <%=LanguageHelper.getGUIString("webpages.listOAs.list.second", request) %>
+ </div>
+ </div>
+
+ <s:iterator var="OAelement" value="formOAs">
+
+ <div class="listElement" onclick="editOA(<s:property value='dataBaseID'/>);">
+ <div class="listFirst">
+ <s:property value="oaIdentifier"/>
+ </div>
+ <div class="listSecond">
+ <s:property value="oaFriendlyName"/>
+ </div>
+ </div>
+
+ </s:iterator>
+ </div>
+
+ <s:form namespace="/" method="GET" id="selectOAForm" action="loadOA" namespace="/secure">
+ <s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden>
+ </s:form>
+ </s:if>
+</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 19:11:42 +0000