Skip to content
Snippets Groups Projects
Commit 10ee8378 authored by Dominik František Bučík's avatar Dominik František Bučík
Browse files

chore: merge branch 'envri_theme' into 'main'

feat: envri theme

See merge request !371
parents 33e86618 36dbfe50
No related branches found
No related tags found
1 merge request!371feat: envri theme
Pipeline #390021 canceled
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %> <%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %>
<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %> <%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %>
<%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %> <%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %>
<%@ taglib prefix="envri" tagdir="/WEB-INF/tags/envri" %>
<%@ taglib prefix="muni" tagdir="/WEB-INF/tags/muni" %> <%@ taglib prefix="muni" tagdir="/WEB-INF/tags/muni" %>
<%@ taglib prefix="t" tagdir="/WEB-INF/tags/common" %> <%@ taglib prefix="t" tagdir="/WEB-INF/tags/common" %>
<%@ attribute name="baseURL" required="true" %> <%@ attribute name="baseURL" required="true" %>
...@@ -20,6 +21,9 @@ ...@@ -20,6 +21,9 @@
<c:when test="${theme eq 'ceitec'}"> <c:when test="${theme eq 'ceitec'}">
<ceitec:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/> <ceitec:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
</c:when> </c:when>
<c:when test="${theme eq 'envri'}">
<envri:footer baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
</c:when>
<c:when test="${theme eq 'muni'}"> <c:when test="${theme eq 'muni'}">
<muni:footer/> <muni:footer/>
</c:when> </c:when>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %> <%@ taglib prefix="cesnet" tagdir="/WEB-INF/tags/cesnet" %>
<%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %> <%@ taglib prefix="einfra" tagdir="/WEB-INF/tags/einfra" %>
<%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %> <%@ taglib prefix="ceitec" tagdir="/WEB-INF/tags/ceitec" %>
<%@ taglib prefix="envri" tagdir="/WEB-INF/tags/envri" %>
<%@ taglib prefix="muni" tagdir="/WEB-INF/tags/muni" %> <%@ taglib prefix="muni" tagdir="/WEB-INF/tags/muni" %>
<%@ attribute name="title" required="true" %> <%@ attribute name="title" required="true" %>
<%@ attribute name="reqURL" required="true" %> <%@ attribute name="reqURL" required="true" %>
...@@ -22,6 +23,9 @@ ...@@ -22,6 +23,9 @@
<c:when test="${theme eq 'ceitec'}"> <c:when test="${theme eq 'ceitec'}">
<ceitec:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/> <ceitec:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
</c:when> </c:when>
<c:when test="${theme eq 'envri'}">
<envri:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
</c:when>
<c:when test="${theme eq 'muni'}"> <c:when test="${theme eq 'muni'}">
<muni:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/> <muni:header title="${title}" reqURL="${reqURL}" cssLinks="${cssLinks}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
</c:when> </c:when>
......
<%@ 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" %>
<jsp:useBean id="date" class="java.util.Date" />
<div style="text-align: center;">
<div id="footer" style="display: flex; justify-content: space-between; margin: 0 auto; max-width: 1000px;">
<div>
<img src="${samlResourcesURL}/module.php/perun/res/img/envri_logo_120.png" alt="ENVRI Logo">
</div>
<div>
<img src="${samlResourcesURL}/module.php/perun/res/img/eu_logo_120.png" alt="EU Logo">
</div>
<div>
<p>Virtual ENVRI community platform is maintained thanks to ENVRI-FAIR project.
The project received funding from the European Union’s Horizon 2020 research and innovation
programme under grant agreement No 824068.</p>
<p>ENVRI-FAIR is coordinated by Forschungszentrum Jülich.</p>
<p><a href="mailto:elter@ics.muni.cz">elter@ics.muni.cz</a></p>
<p>Copyright © ENVRI-FAIR <?php echo date("Y"); ?></p>
</div>
</div>
</div>
<%@ 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<java.lang.String>" %>
<c:set var="logoURL" value="${samlResourcesURL}/module.php/perun/res/img/envri_logo_200.png"/>
<o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
<link rel="icon" href="resources/images/envri.ico" />
<link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/perun/res/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/perun/res/css/envri.css" />
<o:headerCssLinks cssLinks="${cssLinks}"/>
</head>
<o:headerBody logoURL="${logoURL}"/>
perun-oidc-server-webapp/src/main/webapp/resources/images/envri.ico

119 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment