aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp
diff options
context:
space:
mode:
authorChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2015-10-14 12:51:28 +0200
committerChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2015-10-14 12:51:28 +0200
commitb71fe922ed87b24c9f023319c23dc9f17bc3283d (patch)
treee4c1cb6b02deeb1ee8a520b28d0d0e95f17dc846 /id/ConfigWebTool/src/main/webapp
parent16bb1e9b6d7bcad60335ab5b3ce84c7a950c525b (diff)
downloadmoa-id-spss-b71fe922ed87b24c9f023319c23dc9f17bc3283d.tar.gz
moa-id-spss-b71fe922ed87b24c9f023319c23dc9f17bc3283d.tar.bz2
moa-id-spss-b71fe922ed87b24c9f023319c23dc9f17bc3283d.zip
modified login page
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/css/index.css28
-rw-r--r--id/ConfigWebTool/src/main/webapp/index.jsp33
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp27
3 files changed, 26 insertions, 62 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index ae5f2537a..6e07a76ec 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -61,27 +61,9 @@ h5{
}
#bkulogin {
- float: left;
- margin-left: 50px;
-}
-
-#bkuloginbutton {
- background:-moz-linear-gradient(bottom,#b3b3b3,#f1f1f1); /* Firefox */
- background:-webkit-gradient(linear,left top,left bottom,from(#b3b3b3),to(#f1f1f1)); /* Chrome, Safari */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3',endColorstr='#f1f1f1');
-
- display: block;
- padding-top: 10px;
- padding-bottom: 10px;
- text-align: center;
- width: 200px;
- /* background-color: gold; */
- border-radius: 10px;
- box-shadow: 8px 8px 8px #666;
- border-style: solid;
- border-color: black;
- border-width: 2px;
-
+ float: right;
+ margin-left: 0px;
+ padding-top:5px;
}
#menu_area {
@@ -102,7 +84,7 @@ h5{
height: 30px;
border-radius: 0px;
padding-top: 5px;
- padding-left:20px;
+ padding-left:30px;
margin-left:0px;
}
@@ -441,7 +423,7 @@ div .wwgrp br {
color:#ffffff;
font-family:Arial;
font-size:15px;
- padding:5px 23px;
+ padding:5px 10px;
text-decoration:none;
}
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>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp
deleted file mode 100644
index 6ba70da54..000000000
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@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" %>
-
-<html>
- <div id="header_area">
-<!-- <div> -->
- <%=LanguageHelper.getGUIString("webpages.header.info", request) %>
- <s:if test="authUser.isMandateUser()">
- <s:property value="authUser.institute"/>
- </s:if>
- <s:else>
- <s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>,&nbsp;&nbsp;&nbsp;
- </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> -->
-
- </div>
-</html> \ No newline at end of file