aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp/jsp/snippets
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp15
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp10
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp7
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp73
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp1
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp3
6 files changed, 79 insertions, 30 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index 3dda0c0a4..f0b5c816a 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -84,6 +84,21 @@
key="webpages.oaconfig.general.testing.oids"
cssClass="textfield_long">
</s:textfield>
+
+ <s:checkbox key="webpages.oaconfig.general.testing.idltruststore"
+ labelposition="left"
+ cssClass="checkbox"
+ value="%{authOA.useTestIDLValidationTrustStore}"
+ name="authOA.useTestIDLValidationTrustStore">
+ </s:checkbox>
+
+ <s:checkbox key="webpages.oaconfig.general.testing.authblocktruststore"
+ labelposition="left"
+ cssClass="checkbox"
+ value="%{authOA.useTestAuthblockValidationTrustStore}"
+ name="authOA.useTestAuthblockValidationTrustStore">
+ </s:checkbox>
+
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
index a004a03a3..294d638f8 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
@@ -14,38 +14,42 @@
cssClass="checkbox">
</s:checkbox>
</s:if>
+
<s:checkbox name="saml1OA.provideStammZahl"
value="%{saml1OA.provideStammZahl}"
labelposition="left"
key="webpages.oaconfig.saml1.provideStammZahl"
cssClass="checkbox">
</s:checkbox>
+ <br>
<s:checkbox name="saml1OA.provideAuthBlock"
value="%{saml1OA.provideAuthBlock}"
labelposition="left"
key="webpages.oaconfig.saml1.provideAuthBlock"
cssClass="checkbox">
</s:checkbox>
- <br>
+
<s:checkbox name="saml1OA.provideIdentityLink"
value="%{saml1OA.provideIdentityLink}"
labelposition="left"
key="webpages.oaconfig.saml1.provideIdentityLink"
cssClass="checkbox">
- </s:checkbox>
+ </s:checkbox>
+ <br>
<s:checkbox name="saml1OA.provideCertificate"
value="%{saml1OA.provideCertificate}"
labelposition="left"
key="webpages.oaconfig.saml1.provideCertificate"
cssClass="checkbox">
</s:checkbox>
+ <br>
<s:checkbox name="saml1OA.provideFullMandateData"
value="%{saml1OA.provideFullMandateData}"
labelposition="left"
key="webpages.oaconfig.saml1.provideFullMandateData"
cssClass="checkbox">
</s:checkbox>
- <br>
+
<s:checkbox name="saml1OA.provideAllErrors"
value="%{saml1OA.provideAllErrors}"
labelposition="left"
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp
index e78319181..bcad99a5d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/footer.jsp
@@ -2,8 +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"/>)
+ <!-- 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 6ba70da54..4d740fd06 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,54 @@
-<%@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"/>,&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 id="header_area">
+ <!-- <div> -->
+
+
+ <div id ="left_area">
+ <h2><%=LanguageHelper.getGUIString("header.title", request) %></h2>
</div>
-</html> \ No newline at end of file
+
+ <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" />">Logout <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>
+
+
+</div>
+</html>
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>