diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
19 files changed, 99 insertions, 33 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index 8c0b567f1..ae5f2537a 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -45,9 +45,10 @@ h5{ background-color: #EEEEEE; display: block; font-size: 1.2em; - height: 40px; + height: 50px; padding-top:5px; padding-left:20px; + padding-top: 10px; } @@ -87,8 +88,8 @@ h5{ margin-top: 25px; width: 300px; margin-left: 0px; - position: relative; - padding-left: 0px ; + position: absolute; + padding-left: 0px; padding-top: 3px; float: left; } @@ -126,12 +127,27 @@ h5{ #right_area { float: right; + width:auto; padding-bottom: 10px; padding-left: 10px; padding-right: 30px; padding-top: 4px; } +#left_area { + float: left; + width:auto; + padding-left: 10px; + padding-right: 30px; + padding-top: 0px; + margin-top:-5px; +} + +#left_area h2{ + padding-top:0px; + margin-top:0px; +} + #nameField{ float: right; padding-bottom: 10px; @@ -173,7 +189,8 @@ h5{ float: left; margin-left: 0px; margin-right:20px; - width: 280px; + margin-bottom:10px; + width: 290px; background-color:#2dabf9; border:none; @@ -197,7 +214,7 @@ h5{ float: left; margin-left: 0px; margin-right:20px; - width: 280px; + width: 290px; background-color:#2dabf9; border:none; @@ -309,7 +326,7 @@ h5{ .oa_config_block h3 { - padding-top: 25px; + padding-top: 10px; } .oa_config_block h4 { @@ -386,7 +403,10 @@ div .wwgrp br { .textfield_long { width: 600px; - +} + +.textfield_300px{ + width: 300px; } .textfield_large{ @@ -413,7 +433,7 @@ div .wwgrp br { .oa_buttons{ float: left; margin-right: 20px; - width:280px; + width:290px; background-color:#2dabf9; border:none; display:inline-block; @@ -445,7 +465,7 @@ div .wwgrp br { padding-top: 5px; padding-right: 10px; border-bottom: 1px; - border-color: red; + border-color: #ddd; border-bottom-style: solid; clear: both; } @@ -454,8 +474,9 @@ div .wwgrp br { cursor: default; border-bottom-style: none; display: table-header-group; - font-weight: bold; - font-size: 1.1em; + font-weight: normal; + font-size: 1.3em; + margin-top: 50px; } .listElInfo { @@ -574,6 +595,7 @@ div .wwgrp br { text-decoration: none; font-size:1.2em; color: #303030; + margin-right: 15px; } #toggleMenu:hover ~ #drop_down_menu{ @@ -595,11 +617,13 @@ div .wwgrp br { #logout_button{ position:absolute; - right: 20px; + right: 10px; bottom:20px; + text-decoration:none; + color:white; } -.general_conf_buttons{ +.button_narrow{ float: left; margin-right: 10px; width:100px; @@ -612,13 +636,38 @@ div .wwgrp br { font-size:15px; padding:2px 5px; text-decoration:none; - + margin-bottom: 3px; } -.general_conf_buttons:hover { +.button_narrow:hover { background-color:#0688fa; } -.general_conf_buttons:active { +.button_narrow:active { position:relative; top:1px; } + +.button_fit{ + + margin-right: 0px; + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:2px 10px; + text-decoration:none; + margin-bottom: 3px; +} + +.button_fit:hover { + background-color:#0688fa; +} +.button_fit:active { + position:relative; + top:1px; +} + + diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 9f19e88a2..1927c2dc7 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -251,7 +251,7 @@ function newPeps() { </div>\ </td>\ <td>\ - <input type="button" value="löschen" onclick="this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);"></td>\ + <input type="button" class="general_conf_buttons" value="Löschen" onclick="this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);"></td>\ </tr>'; target.parentNode.appendChild(clone); } diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 5e34cc204..8d3e80527 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -266,14 +266,14 @@ <td><s:property value="%{countryCode}" /></td> <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td> <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td> - <td><input class="general_conf_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td> + <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td> </tr> </s:iterator> <s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}"> <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_short"/></td> <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" cssClass="textfield_long"/></td> <td><s:checkbox name="storkconfig.cpepslist[0].supportsXMLSignature" value="true" /></td> - <td><input class="general_conf_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> + <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> </s:if> </table> <input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' /> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp index 994389de3..dffa7bd1b 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp @@ -8,7 +8,7 @@ <head> <title><%=LanguageHelper.getGUIString("title", request) %></title> <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"> <script type="text/javascript" src="../js/common.js"></script> <script src="../js/jquery.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp index c619e64b1..d1f95dee8 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp @@ -7,10 +7,13 @@ <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> <script type="text/javascript" src="../js/common.js"></script> <script src="../js/jquery.js"></script> + <script src="../js/bootstrap-input.js"></script> + <script>$(document).ready(function(){$('input[type=file]').bootstrapFileInput();});</script> </head> <body> @@ -40,7 +43,7 @@ <div class="oa_config_block"> <h3><%=LanguageHelper.getGUIString("webpages.inportexport.legacyimport.header", request) %></h3> - <s:file name="fileUpload" key="webpages.inportexport.legacyimport.upload" cssClass="textfield_long"></s:file> + <s:file name="fileUpload" key="webpages.inportexport.legacyimport.upload" cssClass="textfield_300px"></s:file> <s:hidden name="formID" value="%{formID}"></s:hidden> @@ -51,18 +54,19 @@ </div> </s:form> - + <s:form namespace="/secure" method="POST" enctype="multipart/form-data"> <div class="oa_config_block"> <h3><%=LanguageHelper.getGUIString("webpages.inportexport.import.header", request) %></h3> - <s:file name="fileUpload" key="webpages.inportexport.import.upload" cssClass="textfield_long"></s:file> + <s:file name="fileUpload" key="webpages.inportexport.import.upload" cssClass="textfield_300px"></s:file> <s:hidden name="formID" value="%{formID}"></s:hidden> <div id="button_area"> - <s:submit key="webpages.edit.import" action="importConfig"/> + <s:submit key="webpages.edit.import" action="importConfig"/> + <s:submit key="webpages.edit.export" action="exportConfig"/> </div> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp index ef666b357..a7de4a8e0 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> @@ -46,7 +47,7 @@ <s:form action="newIDP" namespace="/secure" method="POST" > <s:hidden name="interfederationType" value="-VIDP"></s:hidden> <s:submit key="webpages.interfederation.new.vidp"/> - </s:form> + </s:form> <s:form action="newIDP" namespace="/secure" method="POST" > <s:hidden name="interfederationType" value="-IDPGATEWAY"></s:hidden> <s:submit key="webpages.interfederation.new.gateway"/> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp index f0d0671bf..45d340908 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp index ee86c4b91..6677b2b8a 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/pvpgateway.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp index 0cc3b11dd..bf4dc9e72 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp @@ -7,6 +7,7 @@ <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"> <link rel="stylesheet" media="screen" type="text/css" href="../css/colorpicker.css" /> <title><%=LanguageHelper.getGUIString("title", request) %></title> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp index bad50262d..d562f1e7c 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp index c9f1e00f6..34f228952 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp @@ -7,6 +7,7 @@ <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> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp index 9995f9f31..934296b3a 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp @@ -8,7 +8,7 @@ <head> <title><%=LanguageHelper.getGUIString("title", request) %></title> <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"> <script type="text/javascript" src="./js/common.js"></script> <script src="./js/jquery.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp index 0cd861884..deb757885 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp index a2617a0e9..8d1c5adf9 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/searchOAs.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> @@ -38,8 +39,8 @@ key="webpages.searchoa.search.friendlyname" cssClass="textfield_long"> </s:textfield> - - <s:submit key="webpages.searchoa.butten.search" action="searchOA"/> + + <s:submit key="webpages.searchoa.butten.search" action="searchOA" cssClass="button_fit"/> </s:form> </div> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp index 4d2c67105..bcad99a5d 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp @@ -2,9 +2,9 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags" %> -<html> +<!-- html> <div id="footer_area"> <!-- MOA-ID Konfigurations-Tool (Version: <s:property value="ConfigToolVersion"/>)--> </div> -</html>
\ No newline at end of file +</html-->
\ No newline at end of file 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 b44f2e752..4d740fd06 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -10,7 +10,9 @@ - + <div id ="left_area"> + <h2><%=LanguageHelper.getGUIString("header.title", request) %></h2> + </div> <div id="right_area"> <a id="toggleMenu"> @@ -36,7 +38,7 @@ <a id="flag_en" href="changeLanguage.action?request_locale=en" ><img alt="English" src="./../images/en.png"></a> <s:url action="logout" var="logoutURL" namespace="/" /> - <a id="logout_button" href="<s:property value="#logoutURL" />"><img alt="<%=LanguageHelper.getGUIString("webpages.index.logout", request) %>" + <a id="logout_button" href="<s:property value="#logoutURL" />">Logout <img alt="<%=LanguageHelper.getGUIString("webpages.index.logout", request) %>" src="./../images/logout.png"></a> </div> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp index e2af292d7..e97dddd8f 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -6,6 +6,7 @@ <html> <s:if test="formOAs && formOAs.size > 0"> <div id="list_area"> + <h2><%=LanguageHelper.getGUIString("webpages.listOAs.list.title", request) %></h2> <div id="listHeader" class="listElement"> <s:if test="formOAs[0].serviceType != 'OA'"> <div class="listElInfo"> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp index 7d28a9236..555f7cd36 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp @@ -40,7 +40,8 @@ </s:textfield> <input type="button" onclick="sendVerificationMail();" - value='<%=LanguageHelper.getGUIString("webpages.edituser.verify.mail.button", request) %>' + value='<%=LanguageHelper.getGUIString("webpages.edituser.verify.mail.button", request) %>' + class='button_fit' /> </div> </s:if> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp index 1d5d4ac12..41222cff6 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp @@ -7,6 +7,7 @@ <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> <script type="text/javascript" src="../js/common.js"></script> |