Add new language selection

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java

6 files changed, 16 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
index 3919d3ff3..a1d95b897 100644
--- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
+++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
 		</init-param>
 		<init-param>
 			<param-name>allowed</param-name>
-			<param-value>^.*((/index.action.*)|(/error.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value>
+			<param-value>^.*((/index.action.*)|(/error.action.*)|(/changeLanguage.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 4f497faaa..597b4fd6c 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -95,6 +95,11 @@ body {
 	padding-top: 25px;
 }
 
+#language_area {
+	float: right;
+  padding-bottom: 10px;
+}
+
 #message_area {
 		color: green;
 }
diff --git a/id/ConfigWebTool/src/main/webapp/images/de.png b/id/ConfigWebTool/src/main/webapp/images/de.png
new file mode 100644
index 000000000..58ef09c7a
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/images/de.png
diff --git a/id/ConfigWebTool/src/main/webapp/images/en.png b/id/ConfigWebTool/src/main/webapp/images/en.png
new file mode 100644
index 000000000..06e18ed84
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/images/en.png
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index 4c78699fc..2f793f303 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -16,6 +16,11 @@
 				
 		<div id="information_area">
 		
+			<div id="language_area">
+				<a href="changeLanguage.action?request_locale=de" /><img alt="Deutsch" src="./images/de.png"></a>
+				<a href="changeLanguage.action?request_locale=en" /><img alt="English" src="./images/en.png"></a>
+			</div>
+		
 			<s:if test="hasActionMessages()">
    			<div id="message_area">
    				<label><%=LanguageHelper.getGUIString("message.title", request) %></label>
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 e9192b46e..6ba70da54 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
@@ -14,6 +14,11 @@
 			</s:else>  
 		 	<%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.getFormatedLastLogin()"/>
 		 	
+		 	<div id="language_area">
+				<a href="changeLanguage.action?request_locale=de" /><img alt="Deutsch" src="./../images/de.png"></a>
+				<a href="changeLanguage.action?request_locale=en" /><img alt="English" src="./../images/en.png"></a>
+			</div>
+		 	
 		 	<s:url action="logout" var="logoutURL" namespace="/"/>
 			<a id="logoutbutton" href="<s:property value="#logoutURL" />"><%=LanguageHelper.getGUIString("webpages.index.logout", request) %></a>
 <!-- 		</div> -->