From 5eb50f64414db6a42cff76003c5b41f4e8e03535 Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Wed, 3 Nov 2021 09:57:56 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Adderd=20e-INFRA=20CZ=20?= =?UTF-8?q?template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added e-INFRA CZ template for frontend pages. Enable it by using web.theme=einfra in the config --- .../main/resources/localization/cs.properties | 11 ++++ .../main/resources/localization/en.properties | 14 ++++- .../webapp/WEB-INF/tags/common/footer.tag | 4 ++ .../webapp/WEB-INF/tags/common/header.tag | 4 ++ .../webapp/WEB-INF/tags/einfra/footer.tag | 58 +++++++++++++++++++ .../webapp/WEB-INF/tags/einfra/header.tag | 22 +++++++ 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/footer.tag create mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag diff --git a/perun-oidc-server-webapp/src/main/resources/localization/cs.properties b/perun-oidc-server-webapp/src/main/resources/localization/cs.properties index bdd8ac27e..d59769ff9 100644 --- a/perun-oidc-server-webapp/src/main/resources/localization/cs.properties +++ b/perun-oidc-server-webapp/src/main/resources/localization/cs.properties @@ -109,7 +109,18 @@ registration_continue=Pokračovat na registrační stránku do vybrané skupiny #CESNET footer specific footer_other_projects=OSTATNÍ PROJEKTY +footer_other_links=RYCHLÉ ODKAZY footer_helpdesk=HELPDESK +einfra_link=https://www.e-infra.cz/ +einfra_name=e-INFRA CZ +cesnet_link=https://www.cesnet.cz/ +cesnet_name=CESNET +cerit_link=https://www.cerit-sc.cz/ +cerit_name=CERIT-SC +it4i_link=https://www.it4i.cz/ +it4i_name=IT4Innovations +data_processing_link=https://www.e-infra.cz/zpracovani-osobnich-udaju +data_processing_name=Personal data processing #AUP aup_header=Formulář s podmínkami užití diff --git a/perun-oidc-server-webapp/src/main/resources/localization/en.properties b/perun-oidc-server-webapp/src/main/resources/localization/en.properties index be19a55ef..6ca652672 100644 --- a/perun-oidc-server-webapp/src/main/resources/localization/en.properties +++ b/perun-oidc-server-webapp/src/main/resources/localization/en.properties @@ -106,9 +106,20 @@ registration_select_vo=Select virtual organization for registration: registration_select_group=Select group for registration: registration_continue=Continue to the registration page for selected group -#CESNET footer specific +#CESNET+einfra footer specific footer_other_projects=OTHER CESNET PROJECTS +footer_other_links=LINKS footer_helpdesk=HELPDESK +einfra_link=https://www.e-infra.cz/en +einfra_name=e-INFRA CZ +cesnet_link=https://www.cesnet.cz/?lang=en +cesnet_name=CESNET +cerit_link=https://www.cerit-sc.cz/ +cerit_name=CERIT-SC +it4i_link=https://www.it4i.cz/en +it4i_name=IT4Innovations +data_processing_link=https://www.e-infra.cz/en/personal-data-processing +data_processing_name=Personal data processing #AUP aup_header=Acceptable Usage Policy form @@ -170,3 +181,4 @@ login_success_msg=You have successfully logged in. However, it seems we have no logout_denied_title=Logout denied logout_denied_header=Logout canceled logout_denied_msg=You have canceled the logout process. + diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/footer.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/footer.tag index 7a9a97f96..87b04434f 100644 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/footer.tag +++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/footer.tag @@ -3,6 +3,7 @@ <%@ taglib prefix="o" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="elixir" tagdir="/WEB-INF/tags/elixir" %> <%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %> +<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %> <%@ taglib prefix="bbmri" tagdir="/WEB-INF/tags/bbmri" %> <%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %> <%@ taglib prefix="europdx" tagdir="/WEB-INF/tags/europdx" %> @@ -18,6 +19,9 @@ + + + diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/header.tag index 7814e0936..10f3869d2 100644 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/header.tag +++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/header.tag @@ -3,6 +3,7 @@ <%@ taglib prefix="o" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="elixir" tagdir="/WEB-INF/tags/elixir" %> <%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %> +<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %> <%@ taglib prefix="bbmri" tagdir="/WEB-INF/tags/bbmri" %> <%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %> <%@ taglib prefix="europdx" tagdir="/WEB-INF/tags/europdx" %> @@ -20,6 +21,9 @@ + + + diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/footer.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/footer.tag new file mode 100644 index 000000000..7b8f2fb76 --- /dev/null +++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/footer.tag @@ -0,0 +1,58 @@ +<%@ tag pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %> +<%@ attribute name="js" required="false"%> +<%@ attribute name="baseURL" required="true"%> +<%@ attribute name="samlResourcesURL" required="true"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags/common" %> + + + diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag new file mode 100644 index 000000000..11d9c947f --- /dev/null +++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag @@ -0,0 +1,22 @@ +<%@ tag pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="o" tagdir="/WEB-INF/tags/common" %> +<%@ attribute name="title" required="true" %> +<%@ attribute name="reqURL" required="true" %> +<%@ attribute name="baseURL" required="true" %> +<%@ attribute name="samlResourcesURL" required="true" %> +<%@ attribute name="cssLinks" required="true" type="java.util.ArrayList" %> + + + + + + + + + + + + +