Skip to content
This repository was archived by the owner on Sep 28, 2022. It is now read-only.

Commit 5eb50f6

Browse files
author
Dominik Frantisek Bucik
committed
feat: 🎸 Adderd e-INFRA CZ template
Added e-INFRA CZ template for frontend pages. Enable it by using web.theme=einfra in the config
1 parent d5079cf commit 5eb50f6

File tree

6 files changed

+112
-1
lines changed

6 files changed

+112
-1
lines changed

‎perun-oidc-server-webapp/src/main/resources/localization/cs.properties

+11
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,18 @@ registration_continue=Pokračovat na registrační stránku do vybrané skupiny
109109

110110
#CESNET footer specific
111111
footer_other_projects=OSTATNÍ PROJEKTY
112+
footer_other_links=RYCHLÉ ODKAZY
112113
footer_helpdesk=HELPDESK
114+
einfra_link=https://www.e-infra.cz/
115+
einfra_name=e-INFRA CZ
116+
cesnet_link=https://www.cesnet.cz/
117+
cesnet_name=CESNET
118+
cerit_link=https://www.cerit-sc.cz/
119+
cerit_name=CERIT-SC
120+
it4i_link=https://www.it4i.cz/
121+
it4i_name=IT4Innovations
122+
data_processing_link=https://www.e-infra.cz/zpracovani-osobnich-udaju
123+
data_processing_name=Personal data processing
113124

114125
#AUP
115126
aup_header=Formulář s podmínkami užití

‎perun-oidc-server-webapp/src/main/resources/localization/en.properties

+13-1
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,20 @@ registration_select_vo=Select virtual organization for registration:
106106
registration_select_group=Select group for registration:
107107
registration_continue=Continue to the registration page for selected group
108108

109-
#CESNET footer specific
109+
#CESNET+einfra footer specific
110110
footer_other_projects=OTHER CESNET PROJECTS
111+
footer_other_links=LINKS
111112
footer_helpdesk=HELPDESK
113+
einfra_link=https://www.e-infra.cz/en
114+
einfra_name=e-INFRA CZ
115+
cesnet_link=https://www.cesnet.cz/?lang=en
116+
cesnet_name=CESNET
117+
cerit_link=https://www.cerit-sc.cz/
118+
cerit_name=CERIT-SC
119+
it4i_link=https://www.it4i.cz/en
120+
it4i_name=IT4Innovations
121+
data_processing_link=https://www.e-infra.cz/en/personal-data-processing
122+
data_processing_name=Personal data processing
112123

113124
#AUP
114125
aup_header=Acceptable Usage Policy form
@@ -170,3 +181,4 @@ login_success_msg=You have successfully logged in. However, it seems we have no
170181
logout_denied_title=Logout denied
171182
logout_denied_header=Logout canceled
172183
logout_denied_msg=You have canceled the logout process.
184+

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/footer.tag

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<%@ taglib prefix="o" tagdir="/WEB-INF/tags" %>
44
<%@ taglib prefix="elixir" tagdir="/WEB-INF/tags/elixir" %>
55
<%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %>
6+
<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %>
67
<%@ taglib prefix="bbmri" tagdir="/WEB-INF/tags/bbmri" %>
78
<%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %>
89
<%@ taglib prefix="europdx" tagdir="/WEB-INF/tags/europdx" %>
@@ -18,6 +19,9 @@
1819
<c:when test="${theme eq 'cesnet'}">
1920
<cesnet:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
2021
</c:when>
22+
<c:when test="${theme eq 'einfra'}">
23+
<einfra:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
24+
</c:when>
2125
<c:when test="${theme eq 'bbmri'}">
2226
<bbmri:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
2327
</c:when>

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/header.tag

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<%@ taglib prefix="o" tagdir="/WEB-INF/tags" %>
44
<%@ taglib prefix="elixir" tagdir="/WEB-INF/tags/elixir" %>
55
<%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %>
6+
<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %>
67
<%@ taglib prefix="bbmri" tagdir="/WEB-INF/tags/bbmri" %>
78
<%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %>
89
<%@ taglib prefix="europdx" tagdir="/WEB-INF/tags/europdx" %>
@@ -20,6 +21,9 @@
2021
<c:when test="${theme eq 'cesnet'}">
2122
<cesnet:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
2223
</c:when>
24+
<c:when test="${theme eq 'einfra'}">
25+
<einfra:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
26+
</c:when>
2327
<c:when test="${theme eq 'bbmri'}">
2428
<bbmri:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
2529
</c:when>

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/footer.tag

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<%@ tag pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
2+
<%@ attribute name="js" required="false"%>
3+
<%@ attribute name="baseURL" required="true"%>
4+
<%@ attribute name="samlResourcesURL" required="true"%>
5+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
6+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
7+
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
8+
<%@ taglib prefix="t" tagdir="/WEB-INF/tags/common" %>
9+
<jsp:useBean id="date" class="java.util.Date" />
10+
11+
<div id="footer">
12+
<footer>
13+
<div class="container">
14+
<div class="row">
15+
<div class="col-md-4 logo">
16+
<img src="${samlResourcesURL}/module.php/cesnet/res/img/footer_logo.png">
17+
</div>
18+
<div class="col-md-8">
19+
<div class="row">
20+
<div class="col col-sm-6">
21+
<h2>${langProps['footer_other_links']}</h2>
22+
<ul>
23+
<li>
24+
<a target="_blank" href="${langProps['einfra_link']}">${langProps['einfra_name']}</a>
25+
</li>
26+
<li>
27+
<a target="_blank" href="${langProps['cesnet_link']}">${langProps['cesnet_name']}</a>
28+
</li>
29+
<li>
30+
<a target="_blank" href="${langProps['cerit_link']}">${langProps['cerit_name']}</a>
31+
</li>
32+
<li>
33+
<a target="_blank" href="${langProps['it4i_link']}">${langProps['it4i_name']}</a>
34+
</li>
35+
<li>
36+
<a target="_blank" href="${langProps['data_processing_link']}">${langProps['data_processing_name']}</a>
37+
</li>
38+
</ul>
39+
</div>
40+
<div class="col col-sm-6">
41+
<h2>${langProps['footer_helpdesk']}</h2>
42+
TEL: +420 234 680 222<br>
43+
GSM: +420 602 252 531<br>
44+
<a href="mailto:[email protected]">[email protected]</a>
45+
</div>
46+
</div>
47+
</div>
48+
</div>
49+
<div class="row">
50+
<div class="col col-sm-12 copyright">
51+
&copy; 2021 | <a target="_blank" href="${langProps['einfra_link']}">${langProps['einfra_name']}</a>
52+
<%-- USABLE FROM 2022 --%>
53+
<%--&copy; 2021-<fmt:formatDate value="${date}" pattern="yyyy" /> | <a target="_blank" href="${langProps['einfra_link']}">${langProps['einfra_name']}</a>--%>
54+
</div>
55+
</div>
56+
</div>
57+
</footer>
58+
</div>

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<%@ tag pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
2+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
3+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
4+
<%@ taglib prefix="o" tagdir="/WEB-INF/tags/common" %>
5+
<%@ attribute name="title" required="true" %>
6+
<%@ attribute name="reqURL" required="true" %>
7+
<%@ attribute name="baseURL" required="true" %>
8+
<%@ attribute name="samlResourcesURL" required="true" %>
9+
<%@ attribute name="cssLinks" required="true" type="java.util.ArrayList<java.lang.String>" %>
10+
11+
<c:set var="logoURL" value="${samlResourcesURL}/module.php/cesnet/res/img/e-INFRAtransparent.png"/>
12+
13+
<o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}" />
14+
15+
<link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/bootstrap/css/bootstrap.min.css" />
16+
<link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/css/einfra.css" />
17+
18+
<o:headerCssLinks cssLinks="${cssLinks}"/>
19+
20+
</head>
21+
22+
<o:headerBody logoURL="${logoURL}"/>

0 commit comments

Comments
 (0)