From 80580d72ba7f5af54b77ef1b47c42005e0b5ded8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 3 Apr 2014 10:05:38 +0200
Subject: refactor Struts action classes

---
 id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml | 2 +-
 id/ConfigWebTool/src/main/webapp/css/index.css   | 7 +++++--
 id/ConfigWebTool/src/main/webapp/index.jsp       | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

(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 a1d95b897..3919d3ff3 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.*)|(/changeLanguage.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value>
+			<param-value>^.*((/index.action.*)|(/error.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 597b4fd6c..eb984a896 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -15,7 +15,7 @@ body {
   border-radius: 3px;
 }
 
-#header_area>div {
+#header_area {
 	font-size: 1.2em;
   margin-left: 25px;
   padding-top: 8px;
@@ -23,7 +23,7 @@ body {
 
 #header_area #logoutbutton {
 	  float: right;
-    padding-right: 25px;
+    /*padding-right: 25px;*/
 }
 
 #passwordlogin {
@@ -98,6 +98,9 @@ body {
 #language_area {
 	float: right;
   padding-bottom: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 4px;
 }
 
 #message_area {
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index 2f793f303..fda077d28 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -17,8 +17,8 @@
 		<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>
+				<a href="index.action?request_locale=de" /><img alt="Deutsch" src="./images/de.png"></a>
+				<a href="index.action?request_locale=en" /><img alt="English" src="./images/en.png"></a>
 			</div>
 		
 			<s:if test="hasActionMessages()">
-- 
cgit v1.2.3