diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp')
5 files changed, 102 insertions, 39 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index e6f07f847..5e34cc204 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -6,10 +6,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> @@ -263,27 +266,27 @@ <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 type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></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> </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 type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> + <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> </s:if> </table> - <input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' /> + <input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' /> <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4> <table id="stork_attributelist"> <tr><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></th><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></th></tr> <s:iterator value="storkconfig.attributes" status="stat"> <tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td> <td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td> - <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> + <td><input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> </s:iterator> </table> - <input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' /> + <input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' /> </div> <div class="oa_config_block"> @@ -293,19 +296,19 @@ <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.allowed.header", request) %></h4> <s:checkbox name="moaconfig.protocolActiveSAML1" value="%{moaconfig.protocolActiveSAML1}" - labelposition="left" + labelposition="right" key="webpages.moaconfig.protocols.legacy.saml1" cssClass="checkbox"> </s:checkbox> <s:checkbox name="moaconfig.protocolActivePVP21" value="%{moaconfig.protocolActivePVP21}" - labelposition="left" + labelposition="right" key="webpages.moaconfig.protocols.legacy.pvp2" cssClass="checkbox"> </s:checkbox> <s:checkbox name="moaconfig.protocolActiveOAuth" value="%{moaconfig.protocolActiveOAuth}" - labelposition="left" + labelposition="right" key="webpages.moaconfig.protocols.oauth" cssClass="checkbox"> </s:checkbox> @@ -317,13 +320,13 @@ <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.legacy.header", request) %></h4> <s:checkbox name="moaconfig.legacy_saml1" value="%{moaconfig.legacy_saml1}" - labelposition="left" + labelposition="right" key="webpages.moaconfig.protocols.legacy.saml1" cssClass="checkbox"> </s:checkbox> <s:checkbox name="moaconfig.legacy_pvp2" value="%{moaconfig.legacy_pvp2}" - labelposition="left" + labelposition="right" key="webpages.moaconfig.protocols.legacy.pvp2" cssClass="checkbox"> </s:checkbox> @@ -359,7 +362,7 @@ key="webpages.moaconfig.protocols.pvp2.IssuerName" cssClass="textfield_long"> </s:textfield> - + <br/> <h5><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.org.header", request) %></h5> <s:textfield name="moaconfig.pvp2OrgName" value="%{moaconfig.pvp2OrgName}" @@ -379,7 +382,7 @@ key="webpages.moaconfig.protocols.pvp2.org.url" cssClass="textfield_long"> </s:textfield> - + <br/> <h5><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.contact.header", request) %></h5> <s:textfield name="moaconfig.pvp2Contact.surname" value="%{moaconfig.pvp2Contact.surname}" diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index c98b400f7..cc4220d0e 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -6,13 +6,19 @@ <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> <script type="text/javascript" src="../js/common.js"></script> <script src="../js/jquery.js"></script> <script type="text/javascript" src="../js/colorpicker.js"></script> + <script src="../js/bootstrap-input.js"></script> + <script>$(document).ready(function(){$('input[type=file]').bootstrapFileInput();});</script> </head> <body onload="oaOnLoad()"> @@ -71,7 +77,7 @@ <button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden"> <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %> </button> - + <s:include value="snippets/OA/saml1.jsp"></s:include> @@ -79,7 +85,8 @@ <s:param name="hideBlock">hidden</s:param> </s:include> - <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + </div> @@ -89,7 +96,7 @@ <s:hidden name="formID" value="%{formID}"></s:hidden> - + <br/> <div id="button_area"> <s:submit key="webpages.edit.back" action="cancleandbackOA"/> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp new file mode 100644 index 000000000..6ba70da54 --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/_header_userinfos.jsp @@ -0,0 +1,27 @@ +<%@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"/>, + </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 diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp index e78319181..4d2c67105 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp @@ -4,6 +4,7 @@ <html> <div id="footer_area"> - MOA-ID Konfigurations-Tool (Version: <s:property value="ConfigToolVersion"/>) + <!-- MOA-ID Konfigurations-Tool (Version: <s:property value="ConfigToolVersion"/>)--> </div> + </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 6ba70da54..b44f2e752 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -1,27 +1,52 @@ -<%@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" %> +<%@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"/>, - </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 id="header_area"> + <!-- <div> --> + + + + + <div id="right_area"> + <a id="toggleMenu"> + <s:if test="authUser.isMandateUser()"> + <s:property value="authUser.institute" /> + </s:if> + <s:else> + <s:property value="authUser.givenName" /> + <s:property value="authUser.familyName" /> + </s:else> + </a> + <div id="drop_down_menu"> + + <ul> + <li> + <span> + <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.getFormatedLastLogin()"/> + </span> + </li> + </ul> + <a id="flag_at" href="changeLanguage.action?request_locale=de" ><img alt="Deutsch" + src="./../images/de.png"></a> + <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) %>" + src="./../images/logout.png"></a> + </div> + + + <s:url action="searchOAInit" var="searchOAs" namespace="/secure" /> + <a href="<s:property value="#searchOAs" />"><img alt="Deutsch" + src="./../images/lupe.png"></a> + </div> -</html>
\ No newline at end of file + + +</div> +</html> |