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 --- .../src/main/webapp/jsp/editMOAConfig.jsp | 27 ++++---- .../src/main/webapp/jsp/editOAGeneral.jsp | 13 +++- .../main/webapp/jsp/snippets/_header_userinfos.jsp | 27 ++++++++ .../src/main/webapp/jsp/snippets/footer.jsp | 3 +- .../main/webapp/jsp/snippets/header_userinfos.jsp | 71 +++++++++++++++------- 5 files changed, 102 insertions(+), 39 deletions(-) create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp (limited to 'id/ConfigWebTool/src/main/webapp/jsp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index e6f07f847..5e34cc204 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -6,10 +6,13 @@ + <%=LanguageHelper.getGUIString("title", request) %> + + @@ -263,27 +266,27 @@ - " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> + " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> - " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> + " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> - " onclick='newPeps();' /> + " onclick='newPeps();' />

<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %>

- +
<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %>
" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/>
" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/>
- " onclick='newStorkAttribute();' /> + " onclick='newStorkAttribute();' />
@@ -293,19 +296,19 @@

<%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.allowed.header", request) %>

@@ -317,13 +320,13 @@

<%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.legacy.header", request) %>

@@ -359,7 +362,7 @@ key="webpages.moaconfig.protocols.pvp2.IssuerName" cssClass="textfield_long"> - +
<%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.org.header", request) %>
- +
<%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.contact.header", request) %>
+ + + + <%=LanguageHelper.getGUIString("title", request) %> + + @@ -71,7 +77,7 @@ - + @@ -79,7 +85,8 @@ hidden - + +
@@ -89,7 +96,7 @@ - +
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/editMOAConfig.jsp | 4 ++-- id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp | 2 +- id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp | 12 ++++++++---- .../src/main/webapp/jsp/interfederation/idplist.jsp | 3 ++- .../src/main/webapp/jsp/interfederation/moa_idp.jsp | 1 + .../src/main/webapp/jsp/interfederation/pvpgateway.jsp | 1 + .../src/main/webapp/jsp/interfederation/vidp.jsp | 1 + id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp | 1 + id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp | 1 + id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp | 2 +- id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp | 1 + id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp | 5 +++-- id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp | 4 ++-- .../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 ++- id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp | 1 + 17 files changed, 33 insertions(+), 16 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/jsp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 5e34cc204..8d3e80527 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -266,14 +266,14 @@ - " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> + " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> - " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> + " onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/> " onclick='newPeps();' /> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp index 994389de3..dffa7bd1b 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp @@ -8,7 +8,7 @@ <%=LanguageHelper.getGUIString("title", request) %> - + diff --git a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp index c619e64b1..d1f95dee8 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp @@ -7,10 +7,13 @@ + <%=LanguageHelper.getGUIString("title", request) %> + + @@ -40,7 +43,7 @@

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

- + @@ -51,18 +54,19 @@
- +

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

- +
- + +
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp index ef666b357..a7de4a8e0 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> @@ -46,7 +47,7 @@ - + diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp index f0d0671bf..45d340908 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp index ee86c4b91..6677b2b8a 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp index 0cc3b11dd..bf4dc9e72 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp index bad50262d..d562f1e7c 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp index c9f1e00f6..34f228952 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp index 9995f9f31..934296b3a 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp @@ -8,7 +8,7 @@ <%=LanguageHelper.getGUIString("title", request) %> - + diff --git a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp index 0cd861884..deb757885 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp index a2617a0e9..8d1c5adf9 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> @@ -38,8 +39,8 @@ key="webpages.searchoa.search.friendlyname" cssClass="textfield_long"> - - + +
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) %>

+
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 @@
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp index 1d5d4ac12..41222cff6 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp @@ -7,6 +7,7 @@ + <%=LanguageHelper.getGUIString("title", request) %> -- 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') 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/editMOAConfig.jsp | 6 +++--- id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/jsp') diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 8d3e80527..bc8c57ec2 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -259,7 +259,7 @@ labelposition="left" />

<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %>

- + @@ -279,11 +279,11 @@ " onclick='newPeps();' />

<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %>

Country ShortcodePEPS URLSupports XMLSignatures
Country ShortcodePEPS URLSupports XMLSignatures
- + - +
<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %>
<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %>
" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/>
" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/>
" onclick='newStorkAttribute();' /> 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"> + +
-
+ - + +
+
-
+