From ff2c4d5d779a51fd970061062fabba700fc4287a Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 17 Jan 2024 13:32:13 +0100 Subject: [PATCH] Add privacy statement to login page [VIPSUTV-561] --- .../no/nibio/vips/logic/i18n/vipslogictexts.properties | 2 ++ .../no/nibio/vips/logic/i18n/vipslogictexts_bs.properties | 2 ++ .../no/nibio/vips/logic/i18n/vipslogictexts_hr.properties | 2 ++ .../no/nibio/vips/logic/i18n/vipslogictexts_nb.properties | 2 ++ .../no/nibio/vips/logic/i18n/vipslogictexts_sr.properties | 2 ++ .../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties | 2 ++ src/main/webapp/templates/login.ftl | 3 ++- 7 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties index e134529d..5c6eb4c3 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -1046,3 +1046,5 @@ pointOfInterestType_5=Trap sowingDate=Sowing date pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery +privacyStatement=Privacy statement +privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties index 38d4baa9..f6fb956e 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties @@ -1040,3 +1040,5 @@ pointOfInterestType_5=Trap sowingDate=Sowing date pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery +privacyStatement=Privacy statement +privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties index 6adbad65..272dd07c 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties @@ -1038,3 +1038,5 @@ pointOfInterestType_5=Trap sowingDate=Sowing date pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery +privacyStatement=Privacy statement +privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index f5553056..f04c559b 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -1046,3 +1046,5 @@ pointOfInterestType_5=Felle sowingDate=S\u00e5dato pointOfInterestType_6=Big\u00e5rdsplass pointOfInterestType_7=Planteskole +privacyStatement=Personvernerkl\u00e6ring +privacyStatementFileName=Personvernerklaering_NIBIO-VIPS.pdf diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties index 478db1ea..ba8dce69 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties @@ -1040,3 +1040,5 @@ pointOfInterestType_5=Trap sowingDate=Sowing date pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery +privacyStatement=Privacy statement +privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties index 3676563e..eccfa4a8 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties @@ -1034,3 +1034,5 @@ pointOfInterestType_5=Trap sowingDate=Sowing date pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery +privacyStatement=Privacy statement +privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf diff --git a/src/main/webapp/templates/login.ftl b/src/main/webapp/templates/login.ftl index 6866a069..535c3150 100755 --- a/src/main/webapp/templates/login.ftl +++ b/src/main/webapp/templates/login.ftl @@ -47,7 +47,8 @@ <button class="btn btn-lg btn-primary btn-block" type="submit">${i18nBundle.login}</button> <input type="checkbox" name="rememberUser"<#if checkRemember?has_content && checkRemember> checked="checked"</#if>/> ${i18nBundle.rememberLogin}<br/> <a href="/user?action=registerNewUserForm&userAuthenticationTypeId=1">${i18nBundle.registerNewUser}</a><br/> - <a href="/user?action=resetPasswordRequestForm">${i18nBundle.forgottenPassword}</a> + <a href="/user?action=resetPasswordRequestForm">${i18nBundle.forgottenPassword}</a><br/> + <a href="/public/documentation/${i18nBundle.privacyStatementFileName}" target="new">${i18nBundle.privacyStatement}</a> </form> </div> </#macro> -- GitLab