diff options
author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2015-10-15 09:57:40 +0200 |
---|---|---|
committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2015-10-15 09:57:40 +0200 |
commit | aed2f6f6511d9fd027b24f3810f057f5182c3d60 (patch) | |
tree | 4194b2f7d68325da0c1c571780c27cd1cf07ea4f /id/ConfigWebTool/src/main/webapp/index.jsp | |
parent | 9033146d29c45a9f9a781e0ff450981c27045c3d (diff) | |
parent | 0e55c7882ce4ed4fcb28e60c94dea6b325462ba5 (diff) | |
download | moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.tar.gz moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.tar.bz2 moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.zip |
Merge branch 'web-config' into moa-id-3.0.0-snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/index.jsp')
-rw-r--r-- | id/ConfigWebTool/src/main/webapp/index.jsp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp index fda077d28..f6fd16ab4 100644 --- a/id/ConfigWebTool/src/main/webapp/index.jsp +++ b/id/ConfigWebTool/src/main/webapp/index.jsp @@ -7,19 +7,23 @@ <html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> + <link rel="stylesheet" type="text/css" href="css/bootstrap.css"> <link rel="stylesheet" type="text/css" href="css/index.css"> <title><%=LanguageHelper.getGUIString("title", request) %></title> </head> <body> - <h1><%=LanguageHelper.getGUIString("webpages.index.header", request) %></h1> + <div id="header_area"> + <div id ="left_area"> + <h2><%=LanguageHelper.getGUIString("header.title", request) %></h2> + + </div> + + </div> <div id="information_area"> - <div id="language_area"> - <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()"> <div id="message_area"> @@ -36,8 +40,7 @@ </s:if> <div id="information_area"> - <p><%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %></p> - + <h4><%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %></h4> <div class="oa_config_block"> <s:form id="passwordlogin" namespace="/" method="POST" enctype="multipart/form-data"> @@ -57,17 +60,23 @@ maxlength="16"> </s:password> - <s:submit key="webpages.index.login" action="authenticate"/> + + <s:submit class="button_fit" key="webpages.index.login" action="authenticate"/> </s:form> - + <br/> <s:if test="isPvp2LoginActiv()"> <div id="bkulogin"> - <a id="bkuloginbutton" href="servlet/pvp2login"><%=LanguageHelper.getGUIString("webpages.index.login.pvp2", request) %></a> + <a href="servlet/pvp2login"> + <button class="button_fit"><%=LanguageHelper.getGUIString("webpages.index.login.pvp2", request) %></button> + </a> </div> - </s:if> + </s:if> </div> - + <div> + <a href="index.action?request_locale=de" /><img style="width:25px" alt="Deutsch" src="./images/de.png"></a> + <a href="index.action?request_locale=en" /><img style="width:25px" alt="English" src="./images/en.png"></a> + </div> </div> </body> |