From 36ccf377f54a4fa5290044ede87f4396ea7222df Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Mon, 12 Oct 2015 08:56:48 +0200 Subject: modify web-config --- .../main/webapp/jsp/snippets/_header_userinfos.jsp | 27 ++++++++ .../src/main/webapp/jsp/snippets/footer.jsp | 3 +- .../main/webapp/jsp/snippets/header_userinfos.jsp | 71 +++++++++++++++------- 3 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp new file mode 100644 index 000000000..6ba70da54 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp @@ -0,0 +1,27 @@ +<%@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.header.info", request) %> + + + + + ,    + + <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> + +
+ Deutsch + English +
+ + + "><%=LanguageHelper.getGUIString("webpages.index.logout", request) %> + + +
+ \ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp index e78319181..4d2c67105 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp @@ -4,6 +4,7 @@ + \ No newline at end of file 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 6ba70da54..b44f2e752 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -1,27 +1,52 @@ -<%@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" %> +<%@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.header.info", request) %> - - - - - ,    - - <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> - -
- Deutsch - English -
- - - "><%=LanguageHelper.getGUIString("webpages.index.logout", request) %> - +
+ + + + + +
+ + + + + + + + + + + + + + ">Deutsch +
- \ No newline at end of file + + +
+ -- cgit v1.2.3 From 16bb1e9b6d7bcad60335ab5b3ce84c7a950c525b Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Mon, 12 Oct 2015 11:52:44 +0200 Subject: added css and js files to all jsps --- id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp | 4 ++-- id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp | 6 ++++-- id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp | 1 + id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp index 4d2c67105..bcad99a5d 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp @@ -2,9 +2,9 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags" %> - +
- \ No newline at end of file + \ No newline at end of file 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 b44f2e752..4d740fd06 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -10,7 +10,9 @@ - +
+

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

+
@@ -36,7 +38,7 @@ English - "><%=LanguageHelper.getGUIString(" + ">Logout <%=LanguageHelper.getGUIString(" src="./../images/logout.png">
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 e2af292d7..e97dddd8f 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -6,6 +6,7 @@
+

<%=LanguageHelper.getGUIString("webpages.listOAs.list.title", request) %>

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp index 7d28a9236..555f7cd36 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp @@ -40,7 +40,8 @@
-- cgit v1.2.3 From b71fe922ed87b24c9f023319c23dc9f17bc3283d Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Wed, 14 Oct 2015 12:51:28 +0200 Subject: modified login page --- .../main/webapp/jsp/snippets/_header_userinfos.jsp | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp deleted file mode 100644 index 6ba70da54..000000000 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp +++ /dev/null @@ -1,27 +0,0 @@ -<%@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.header.info", request) %> - - - - - ,    - - <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> - -
- Deutsch - English -
- - - "><%=LanguageHelper.getGUIString("webpages.index.logout", request) %> - - -
- \ No newline at end of file -- cgit v1.2.3 From 0e55c7882ce4ed4fcb28e60c94dea6b325462ba5 Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Thu, 15 Oct 2015 08:53:08 +0200 Subject: webgui fixing for smaller screens --- id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp index a004a03a3..294d638f8 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp @@ -14,38 +14,42 @@ cssClass="checkbox"> + +
-
+ - + +
+
-
+