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