Skip to content

Commit

Permalink
ESURVEY-7883 EUSurvey Footer - Update ISA² to DEP-Interoperability label
Browse files Browse the repository at this point in the history
  • Loading branch information
clam2310 committed Dec 1, 2022
1 parent 98662d9 commit 1faed29
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/Content/mailtemplateeusurvey.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</table>
<div style="padding: 0px">
<p style="align:left; line-height:16px;font-size:10px;color:#009900;font-family:Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="[HOST]resources/images/mail/tree.png" />Please consider the environment before printing this mail.</p>
<p style="align:left; line-height:14px;font-size:10px;color:#707070;font-family:Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EUSurvey is supported by the European Commission's <a href="https://ec.europa.eu/isa2/home_en" style="color:#808080;">ISA² programme</a>, which promotes interoperability solutions for European public administrations.</p>
<p style="align:left; line-height:14px;font-size:10px;color:#707070;font-family:Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EUSurvey is supported by the European Commission's <a target="_blank" href="https://digital-strategy.ec.europa.eu/en/activities/digital-programme" style="color:#808080;" aria-label="DEP programme - Opens in new window">DEP-Interoperability programme</a>, which promotes interoperability solutions for European public administrations.</p>
</div>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/classes/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ error.ValidEmail = Please provide a valid e-mail address
error.ValidName = Please provide a valid username
error.SmtpServerNotConfigured = The application cannot send an activation link by e-mail due to a missing SMTP server configuration. Your registration process has been cancelled.
footer.fundedNew = EUSurvey is supported by the European Commission's <a target="_blank" href="https://ec.europa.eu/isa2/home_en" aria-label="ISA² programme - Opens in new window">ISA² programme</a>, which promotes interoperability solutions for European public administrations.
footer.fundedDEP = EUSurvey is supported by the European Commission's <a target="_blank" href="https://digital-strategy.ec.europa.eu/en/activities/digital-programme" aria-label="DEP programme - Opens in new window">DEP-Interoperability programme</a>, which promotes interoperability solutions for European public administrations.
footer.fundedOSSNew = EUSurvey is developed by the European Commission's Directorate-General for Informatics and is supported by the <a target="_blank" href="https://ec.europa.eu/isa2/home_en" aria-label="ISA² programme - Opens in new window">ISA² programme</a>, which promotes interoperability solutions for European public administrations.
footer.submit = Submit a bug report or feature request
form.Cell = Cell
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/footer.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<i>
<c:choose>
<c:when test="${oss}"><spring:message code="footer.fundedOSSNew" /></c:when>
<c:otherwise><spring:message code="footer.fundedNew" /></c:otherwise>
<c:otherwise><spring:message code="footer.fundedDEP" /></c:otherwise>
</c:choose>
</i>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/footerNoLanguagesEC.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<c:choose>
<c:when test="${oss}">${form.getMessage("footer.fundedOSSNew")}</c:when>
<c:otherwise>${form.getMessage("footer.fundedNew")}</c:otherwise>
<c:otherwise>${form.getMessage("footer.fundedDEP")}</c:otherwise>
</c:choose>

<br /><br />
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/footerNoLanguagesECnew.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div style="margin-top: 10px;">
<c:choose>
<c:when test="${oss}">${form.getMessage("footer.fundedOSSNew")}</c:when>
<c:otherwise>${form.getMessage("footer.fundedNew")}</c:otherwise>
<c:otherwise>${form.getMessage("footer.fundedDEP")}</c:otherwise>
</c:choose>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/footerresponsive.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<c:when test="${form != null}">
<c:choose>
<c:when test="${oss}">${form.getMessage("footer.fundedOSSNew")}</c:when>
<c:otherwise>${form.getMessage("footer.fundedNew")}</c:otherwise>
<c:otherwise>${form.getMessage("footer.fundedDEP")}</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${oss}"><spring:message code="footer.fundedOSSNew" /></c:when>
<c:otherwise><spring:message code="footer.fundedNew" /></c:otherwise>
<c:otherwise><spring:message code="footer.fundedDEP" /></c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
Expand Down

0 comments on commit 1faed29

Please sign in to comment.