diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-04-03 12:30:30 +0200 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-04-03 12:30:30 +0200 |
| commit | a4a715f1124282e202fb2e56f874a8c1a5e2bd71 (patch) | |
| tree | 2c43e82874507646e1a31d3b5f1077c2f76cc141 /id/ConfigWebTool/src/main/webapp | |
| parent | 996c5877797949948fbb709d8b2dfc420eda8ddd (diff) | |
| parent | f69a970246ff82e7d08c96430b2a281416df4d15 (diff) | |
| download | moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.tar.gz moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.tar.bz2 moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.zip | |
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into vidp_2.1_bs
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
4 files changed, 9 insertions, 6 deletions
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()"> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp index 3f00984f2..e78319181 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp @@ -4,6 +4,6 @@ <html> <div id="footer_area"> - MOA-ID 2.x Konfigurations-Tool + MOA-ID Konfigurations-Tool (Version: <s:property value="ConfigToolVersion"/>) </div> </html>
\ No newline at end of file |