From 2337072ac18b66e523818702ba6dce6b462472b1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 8 Aug 2013 15:50:28 +0200 Subject: MOA-ID Configuration Tool Beta --- id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml | 12 +- id/ConfigWebTool/src/main/webapp/css/index.css | 29 ++++- id/ConfigWebTool/src/main/webapp/index.jsp | 35 ++++- id/ConfigWebTool/src/main/webapp/js/common.js | 4 + id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp | 142 +++++++++++++++++++++ .../src/main/webapp/jsp/importexport.jsp | 76 +++++++++++ id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp | 2 +- .../main/webapp/jsp/snippets/header_userinfos.jsp | 9 +- .../src/main/webapp/jsp/snippets/main_menu.jsp | 22 ++-- .../src/main/webapp/jsp/snippets/oas_list.jsp | 2 +- .../src/main/webapp/jsp/snippets/user_list.jsp | 42 ++++++ .../src/main/webapp/jsp/usermanagement.jsp | 50 ++++++++ 12 files changed, 403 insertions(+), 22 deletions(-) create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp (limited to 'id/ConfigWebTool/src/main/webapp') diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml index c8ba8ab8a..7b27b0c4d 100644 --- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml +++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml @@ -8,23 +8,23 @@ at.gv.egovernment.moa.id.configuration.filter.AuthenticationFilter loginPage - index.action + ./index.action errorPage - error.action + ./error.action sessionLostPage - / + ./authenticate.action - + authenticatedPage - main.action + ./secure/main.action allowed - ^.*((/index.action)|(/error.action)|(/jsp/.*)|(/css/.*)|(/images/.*)|(/js/.*))$ + ^.*((/index.action)|(/error.action)|(/authenticate.action)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/images/.*)|(/js/.*))$ diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index 5edddd506..49e9f41d1 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -6,12 +6,17 @@ display: block; } -#header_area>p { +#header_area>div { font-size: 20px; margin-left: 25px; padding-top: 8px; } +#header_area #logoutbutton { + float: right; + padding-right: 25px; +} + #menu_area { margin-top: 25px; border-color: black; @@ -245,6 +250,28 @@ div .wwgrp br { float: left; } +.userListFirst { + position: relative; + width: 200px; + float: left; + +} + +.userListSecond { + position: relative; + float: left; + width: 200px; +} + +.userListThird { + position: relative; + float: left; +} + +.disabled { + +} + #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 44d3bef5a..4e49eac75 100644 --- a/id/ConfigWebTool/src/main/webapp/index.jsp +++ b/id/ConfigWebTool/src/main/webapp/index.jsp @@ -14,10 +14,41 @@

<%=LanguageHelper.getGUIString("webpages.index.header", request) %>

+
+ +
+ + +
+ +

<%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %>

-
- Login + +
+ + + + + + + + + + + + +
+
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 431824c2a..5271a4006 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -48,6 +48,10 @@ function editOA(oaid){ $('#selectOAForm_OAID').val(oaid); $('#selectOAForm').submit(); } +function userOA(userid){ + $('#selectUserForm_OAID').val(userid); + $('#selectUserForm').submit(); +} function oaOnLoad() { oaBusinessService(); oaSSOService(); diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp new file mode 100644 index 000000000..a332fb425 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp @@ -0,0 +1,142 @@ +<%@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" %> + + + + + + + <%=LanguageHelper.getGUIString("title", request) %> + + + + + + + + + + +
+ +
+ + +
+ + +
+ + + +
+

<%=LanguageHelper.getGUIString("webpages.edituser.header", request) %>

+ + + + + + + + + + +
+ +
+

<%=LanguageHelper.getGUIString("webpages.edituser.access.header", request) %>

+ + + + + + + + + + + + + + +
+ + +
+

<%=LanguageHelper.getGUIString("webpages.edituser.role.header", request) %>

+ + + + +
+ + + + +
+ + + + + + + + +
+ +
+
+ + + + + \ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp new file mode 100644 index 000000000..b28bc5f57 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp @@ -0,0 +1,76 @@ +<%@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" %> + + + + + + + <%=LanguageHelper.getGUIString("title", request) %> + + + + + + + + + + +
+ +
+ + +
+ + +
+

<%=LanguageHelper.getGUIString("webpages.inportexport.header", request) %>

+ + + + +

<%=LanguageHelper.getGUIString("webpages.inportexport.descripten", request) %>

+ + + + +
+

<%=LanguageHelper.getGUIString("webpages.inportexport.legacyimport.header", request) %>

+ + +
+ <%-- --%> + +
+
+ + + + + + +
+

<%=LanguageHelper.getGUIString("webpages.inportexport.import.header", request) %>

+ + +
+ + +
+ +
+ + + +
+ +
+ + + + + \ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp index c3a4921e9..b700970cc 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp @@ -26,7 +26,7 @@
-

das ist ein Test Text

+

Im Menü auf der rechten Seite können Sie die einzelnen Operationen wählen.

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp index a10b6e202..56fcf9681 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -4,9 +4,14 @@
-

<%=LanguageHelper.getGUIString("webpages.header.info", request) %> +

<%=LanguageHelper.getGUIString("webpages.header.info", request) %> ,    <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> -

+ + + "><%=LanguageHelper.getGUIString("webpages.index.logout", request) %> +
+ +
\ 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 06bb1130c..26b12cdcb 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp @@ -5,34 +5,38 @@ \ 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 index 2e1b0365f..113e822f8 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -28,7 +28,7 @@ - + diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp new file mode 100644 index 000000000..c5b67cbac --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp @@ -0,0 +1,42 @@ +<%@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" %> + + + +

<%=LanguageHelper.getGUIString("webpages.listUsers.list.header", request) %>

+
+
+
+ <%=LanguageHelper.getGUIString("webpages.listUsers.list.first", request) %> +
+
+ <%=LanguageHelper.getGUIString("webpages.listUsers.list.second", request) %> +
+
+ <%=LanguageHelper.getGUIString("webpages.listUsers.list.third", request) %> +
+
+ + + +
+
+ +
+
+ +
+
+ +
+
+ + +
+ + + + + + \ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp new file mode 100644 index 000000000..a29780cff --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp @@ -0,0 +1,50 @@ +<%@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" %> + + + + + + + <%=LanguageHelper.getGUIString("title", request) %> + + + + + + + + + + +
+ +
+ + +
+ + +

<%=LanguageHelper.getGUIString("webpages.usermanagement.header", request) %>

+ + + + + +
+ +
+ +
+ +
+ + +
+ + + + + \ No newline at end of file -- cgit v1.2.3