From a72770868e18940fa2ecd4209531f800688401cd Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 13 Dec 2023 12:25:26 +0200 Subject: [PATCH] rename notification templated --- .../main/resources/config/notification.yml | 293 ++++++++--------- .../Confirmation/Email/body.en.html | 304 ------------------ .../Confirmation/Email/subject.en.txt | 1 - .../Finalised/Email/subject.en.txt | 1 - .../MergeConfirmation/Email/subject.en.txt | 1 - .../Modified/Email/subject.en.txt | 1 - .../ModifiedFinalised/Email/subject.en.txt | 1 - .../Publish/Email/subject.en.txt | 1 - .../Template/Email/subject.en.txt | 1 - .../email}/body.en.html | 4 +- .../descriptionmodified/email/subject.en.txt | 1 + .../email}/body.en.html | 2 +- .../email/subject.en.txt | 1 + .../descrptionfinalised/email/body.en.html | 304 ++++++++++++++++++ .../descrptionfinalised/email/subject.en.txt | 1 + .../Email => dmpdeposit/email}/body.en.html | 2 +- .../dmpdeposit/email/subject.en.txt | 1 + .../Email => dmpfinalised/email}/body.en.html | 4 +- .../dmpfinalised/email/subject.en.txt | 1 + .../email}/body.en.html | 2 +- .../email}/subject.en.txt | 0 .../Email => dmpmodified/email}/body.en.html | 4 +- .../dmpmodified/email/subject.en.txt | 1 + .../email}/body.en.html | 4 +- .../email/subject.en.txt | 1 + .../email}/body.en.html | 2 +- .../email}/subject.en.txt | 0 27 files changed, 470 insertions(+), 469 deletions(-) delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/body.en.html delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/subject.en.txt delete mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{Modified/Email => descriptionmodified/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{Template/Email => descriptiontemplateinvitation/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{Publish/Email => dmpdeposit/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{Finalised/Email => dmpfinalised/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{DataManagementPlan/Email => dmpinvitation/email}/body.en.html (98%) rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{DataManagementPlan/Email => dmpinvitation/email}/subject.en.txt (100%) rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{ModifiedFinalised/Email => dmpmodified/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{MergeConfirmation/Email => mergeacountconfirmation/email}/body.en.html (98%) create mode 100644 dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{UnlinkConfirmation/Email => removecredentialconfirmation/email}/body.en.html (99%) rename dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/{UnlinkConfirmation/Email => removecredentialconfirmation/email}/subject.en.txt (100%) diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml b/dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml index 2fb7dc98a..78178db04 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml +++ b/dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml @@ -10,69 +10,48 @@ notification: too-old-to-track-seconds: 604800 overrides: [] resolver: - global-policies: - - #Confirmation - type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 - contacts: [ email ] - - #DataManagementPlan + global-policies: + - #dmpInvitation type: 065DEECD-21BB-44AF-9983-E660FDF24BC4 contacts: [ email ] - - #Finalised - type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E - contacts: [ email ] - - #MergeConfirmation - type: BFE68845-CB05-4C5A-A03D-29161A7C9660 - contacts: [ email ] - - #Modified + - #dpmModified type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB contacts: [ email ] - - #ModifiedFinalised - type: D3CD55FE-8DA2-42E7-A501-3795EE4F16D3 + - #dmpFinalised + type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E contacts: [ email ] - - #Publish + - #descriptionModified + type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 + contacts: [ email ] + - #descriptionFinalised + type: 33790bad-94d4-488a-8ee2-7f6295ca18ea + contacts: [ email ] + - #mergeAcountConfirmation + type: BFE68845-CB05-4C5A-A03D-29161A7C9660 + contacts: [ email ] + - #removeCredentialConfirmation + type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604 + contacts: [ email ] + - #dmpDeposit type: 55736F7A-83AB-4190-AF43-9D031A6F9612 contacts: [ email ] - - #Template + - #descriptionTemplateInvitation type: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B contacts: [ email ] - - #UnlinkConfirmation - type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604 - contacts: [ email ] ad-hoc-config: ad-hoc-notification-type: null message: email: flows: - - #Confirmation - key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 - subject-path: classpath:notification_templates/Confirmation/Email/subject.{language}.txt - subject-field-options: - mandatory: [ ] - optional: [ ] - - body-path: classpath:notification_templates/Confirmation/Email/body.{language}.html - body-field-options: - mandatory: [ "{host}", "{confirmationToken}" ] - optional: - - key: "{expiration_time}" - value: -- - formatting: - '[{expiration_time}]': null - cc: [ ] - cc-mode: 0 - bcc: [ ] - bcc-mode: 0 - allow-attachments: false - cipher-fields: [ ] - - #DataManagementPlan + - #dmpInvitation key: 065DEECD-21BB-44AF-9983-E660FDF24BC4 - subject-path: classpath:notification_templates/DataManagementPlan/Email/subject.{language}.txt + subject-path: classpath:notification_templates/dmpinvitation/email/subject.{language}.txt subject-field-options: mandatory: [ ] optional: [ ] - body-path: classpath:notification_templates/DataManagementPlan/Email/body.{language}.html + body-path: classpath:notification_templates/dmpinvitation/email/body.{language}.html body-field-options: - mandatory: [ "{dmpname}", "{dmprole}", "{host}", "{invitationID}" ] + mandatory: [ "{dmpname}", "{dmprole}", "{installation-url}", "{invitationID}" ] optional: - key: "{recipient}" value: @@ -86,15 +65,15 @@ notification: bcc-mode: 0 allow-attachments: false cipher-fields: [ ] - - #Finalised - key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E - subject-path: classpath:notification_templates/Finalised/Email/subject.{language}.txt + - #dmpModified + key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB + subject-path: classpath:notification_templates/dmpmodified/email/subject.{language}.txt subject-field-options: mandatory: [ ] optional: [ ] - body-path: classpath:notification_templates/Finalised/Email/body.{language}.html + body-path: classpath:notification_templates/dmpmodified/email/body.{language}.html body-field-options: - mandatory: [ "{reasonName}", "{name}", "{host}", "{path}", "{id}" ] + mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ] optional: - key: "{recipient}" value: @@ -108,21 +87,87 @@ notification: bcc-mode: 0 allow-attachments: false cipher-fields: [ ] - - #MergeConfirmation - key: BFE68845-CB05-4C5A-A03D-29161A7C9660 - subject-path: classpath:notification_templates/MergeConfirmation/Email/subject.{language}.txt + - #dmpFinalised + key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E + subject-path: classpath:notification_templates/dmpfinalised/email/subject.{language}.txt subject-field-options: mandatory: [ ] optional: [ ] - body-path: classpath:notification_templates/MergeConfirmation/Email/body.{language}.html + body-path: classpath:notification_templates/dmpfinalised/email/body.{language}.html body-field-options: - mandatory: [ "{userName}", "{host}", "{confirmationToken}" ] + mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ] + optional: + - key: "{recipient}" + value: + formatting: + '[{reasonName}]': null + '[{name}]': null + '[{recipient}]': null + cc: [ ] + cc-mode: 0 + bcc: [ ] + bcc-mode: 0 + allow-attachments: false + cipher-fields: [ ] + - #desriptionModified + key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 + subject-path: classpath:notification_templates/descriptionmodified/email/subject.{language}.txt + subject-field-options: + mandatory: [ ] + optional: [ ] + body-path: classpath:notification_templates/descriptionmodified/email/body.{language}.html + body-field-options: + mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ] + optional: + - key: "{recipient}" + value: + formatting: + '[{reasonName}]': null + '[{name}]': null + '[{recipient}]': null + cc: [ ] + cc-mode: 0 + bcc: [ ] + bcc-mode: 0 + allow-attachments: false + cipher-fields: [ ] + - #descriptionFinalised + key: 33790bad-94d4-488a-8ee2-7f6295ca18ea + subject-path: classpath:notification_templates/descriptionfinalised/email/subject.{language}.txt + subject-field-options: + mandatory: [ ] + optional: [ ] + body-path: classpath:notification_templates/descriptionfinalised/email/body.{language}.html + body-field-options: + mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ] + optional: + - key: "{recipient}" + value: + formatting: + '[{reasonName}]': null + '[{name}]': null + '[{recipient}]': null + cc: [ ] + cc-mode: 0 + bcc: [ ] + bcc-mode: 0 + allow-attachments: false + cipher-fields: [ ] + - #mergeAccountConfirmation + key: BFE68845-CB05-4C5A-A03D-29161A7C9660 + subject-path: classpath:notification_templates/mergeaccountconfirmation/email/subject.{language}.txt + subject-field-options: + mandatory: [ ] + optional: [ ] + body-path: classpath:notification_templates/mergeaccountconfirmation/email/body.{language}.html + body-field-options: + mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ] optional: - key: "{expiration_time}" value: --- formatting: '[{userName}]': null - '[{host}]': null + '[{installation-url}]': null '[{expiration_time}]': null cc: [ ] cc-mode: 0 @@ -130,100 +175,13 @@ notification: bcc-mode: 0 allow-attachments: false cipher-fields: [ ] - - #Modified - key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB - subject-path: classpath:notification_templates/Modified/Email/subject.{language}.txt - subject-field-options: - mandatory: [ ] - optional: [ ] - body-path: classpath:notification_templates/Modified/Email/body.{language}.html - body-field-options: - mandatory: [ "{reasonName}", "{name}", "{host}", "{path}", "{id}" ] - optional: - - key: "{recipient}" - value: - formatting: - '[{reasonName}]': null - '[{name}]': null - '[{recipient}]': null - cc: [ ] - cc-mode: 0 - bcc: [ ] - bcc-mode: 0 - allow-attachments: false - cipher-fields: [ ] - - #ModifiedFinalised - key: D3CD55FE-8DA2-42E7-A501-3795EE4F16D3 - subject-path: classpath:notification_templates/ModifiedFinalised/Email/subject.{language}.txt - subject-field-options: - mandatory: [ ] - optional: [ ] - body-path: classpath:notification_templates/ModifiedFinalised/Email/body.{language}.html - body-field-options: - mandatory: [ "{reasonName}", "{name}", "{host}", "{path}", "{id}" ] - optional: - - key: "{recipient}" - value: - formatting: - '[{reasonName}]': null - '[{name}]': null - '[{recipient}]': null - cc: [ ] - cc-mode: 0 - bcc: [ ] - bcc-mode: 0 - allow-attachments: false - cipher-fields: [ ] - - #Publish - key: 55736F7A-83AB-4190-AF43-9D031A6F9612 - subject-path: classpath:notification_templates/Publish/Email/subject.{language}.txt - subject-field-options: - mandatory: [ ] - optional: [ ] - body-path: classpath:notification_templates/Publish/Email/body.{language}.html - body-field-options: - mandatory: [ "{reasonName}", "{name}", "{host}", "{path}", "{id}" ] - optional: - - key: "{recipient}" - value: - formatting: - '[{reasonName}]': null - '[{name}]': null - '[{recipient}]': null - cc: [ ] - cc-mode: 0 - bcc: [ ] - bcc-mode: 0 - allow-attachments: false - cipher-fields: [ ] - - #Template - key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B - subject-path: classpath:notification_templates/Template/Email/subject.{language}.txt - subject-field-options: - mandatory: [ ] - optional: [ ] - body-path: classpath:notification_templates/Template/Email/body.{language}.html - body-field-options: - mandatory: [ "{templateName}", "{host}", "{templateID}" ] - optional: - - key: "{recipient}" - value: - formatting: - '[{templateName}]': null - '[{recipient}]': null - cc: [ ] - cc-mode: 0 - bcc: [ ] - bcc-mode: 0 - allow-attachments: false - cipher-fields: [ ] - - #UnlinkConfirmation + - #removeCredentialConfirmation key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604 - subject-path: classpath:notification_templates/UnlinkConfirmation/Email/subject.{language}.txt + subject-path: classpath:notification_templates/removecredentialconfirmation/email/subject.{language}.txt subject-field-options: - mandatory: ["{host}", "{confirmationToken}"] + mandatory: [ "{installation-url}", "{confirmationToken}" ] optional: [ ] - body-path: classpath:notification_templates/UnlinkConfirmation/Email/body.{language}.html + body-path: classpath:notification_templates/removecredentialconfirmation/email/body.{language}.html body-field-options: mandatory: [ ] optional: @@ -239,6 +197,49 @@ notification: bcc-mode: 0 allow-attachments: false cipher-fields: [ ] + - #dmpDeposit + key: 55736F7A-83AB-4190-AF43-9D031A6F9612 + subject-path: classpath:notification_templates/dmpdeposit/email/subject.{language}.txt + subject-field-options: + mandatory: [ ] + optional: [ ] + body-path: classpath:notification_templates/dmpdeposit/email/body.{language}.html + body-field-options: + mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ] + optional: + - key: "{recipient}" + value: + formatting: + '[{reasonName}]': null + '[{name}]': null + '[{recipient}]': null + cc: [ ] + cc-mode: 0 + bcc: [ ] + bcc-mode: 0 + allow-attachments: false + cipher-fields: [ ] + - #descriptionTemplateInvitation + key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B + subject-path: classpath:notification_templates/descriptiontemplateinvitation/email/subject.{language}.txt + subject-field-options: + mandatory: [ ] + optional: [ ] + body-path: classpath:notification_templates/descriptiontemplateinvitation/email/body.{language}.html + body-field-options: + mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ] + optional: + - key: "{recipient}" + value: + formatting: + '[{templateName}]': null + '[{recipient}]': null + cc: [ ] + cc-mode: 0 + bcc: [ ] + bcc-mode: 0 + allow-attachments: false + cipher-fields: [ ] template-cache: prefix: ${CACHE_DISAMBIGUATION:} key-pattern: "{prefix}:Notification_Message_Email_Template:{key}:v0" diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/body.en.html deleted file mode 100644 index 3d46fc62d..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/body.en.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - Simple Transactional Email - - - - - - - - - -
  -
- - - This is preheader text. Some clients will show this text as a preview. - - - - - - - - -
- - - - -
- OpenDMP -

Thank you for joining OpenDMP!

-

Please confirm that your email address is correct to continue. -
The link will expire in {expiration_time}.

- - - - - - -
- - - - - - -
Confirm Email Address
-
-
-
- - -
- -
- - - -
- 		 
- - \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/subject.en.txt deleted file mode 100644 index b6107c108..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Email Confirmation \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/subject.en.txt deleted file mode 100644 index a53f1a7bc..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Finalised \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/subject.en.txt deleted file mode 100644 index 5621c2292..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Merge Confirmation \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/subject.en.txt deleted file mode 100644 index ff3f31c75..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Modified \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/subject.en.txt deleted file mode 100644 index a7ea51cb5..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Modified Finalised \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/subject.en.txt deleted file mode 100644 index 8576f2649..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Publish \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/subject.en.txt deleted file mode 100644 index ad592424e..000000000 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/subject.en.txt +++ /dev/null @@ -1 +0,0 @@ -ARGOS - Template Invite \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html index 87460d2da..7025e58bf 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html @@ -261,7 +261,7 @@

Dear {recipient},

-

{reasonName} just made changes to the {name}.

+

{reasonName} just made changes to the Description {name}.

@@ -270,7 +270,7 @@
- +
Click here to view it. Click here to view it.
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt new file mode 100644 index 000000000..440dc3c4f --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Description Modified \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html index 7214de36b..8c2ac8ab7 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html @@ -271,7 +271,7 @@ - +
{templateName} {templateName}
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt new file mode 100644 index 000000000..f634a5493 --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Description Template Invite \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html new file mode 100644 index 000000000..f34f75c23 --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html @@ -0,0 +1,304 @@ + + + + + + Simple Transactional Email + + + + + + + + + +
  +
+ + + This is preheader text. Some clients will show this text as a preview. + + + + + + + + +
+ + + + +
+

Dear {recipient},

+

{reasonName} just finalised the Description {name}.

+ + + + + + + +
+ + + + + + +
Click here to view it.
+
+ +
+
+ + +
+ +
+ + + +
+ 		 
+ + \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt new file mode 100644 index 000000000..76e26cfec --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Description Finalised \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html index d23a1d6d8..c80220834 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html @@ -270,7 +270,7 @@ - +
Click here to view it. Click here to view it.
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt new file mode 100644 index 000000000..5176c62fa --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Dmp Deposit \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html index 7316beb27..3e00fce2d 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html @@ -261,7 +261,7 @@

Dear {recipient},

-

{reasonName} just finalised the {name}.

+

{reasonName} just finalised the Dmp {name}.

@@ -270,7 +270,7 @@
- +
Click here to view it. Click here to view it.
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt new file mode 100644 index 000000000..9332be920 --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Dmp Finalised \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/DataManagementPlan/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/DataManagementPlan/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/body.en.html index e85ecdd4c..381bccc33 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/DataManagementPlan/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/body.en.html @@ -271,7 +271,7 @@ - +
Join Join
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/DataManagementPlan/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/subject.en.txt similarity index 100% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/DataManagementPlan/Email/subject.en.txt rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/subject.en.txt diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html index 1cfb61e82..7a36dccba 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html @@ -261,7 +261,7 @@

Dear {recipient},

-

{reasonName} just made changes and finalised the {name}.

+

{reasonName} just made changes to the Dmp {name}.

@@ -270,7 +270,7 @@
- +
Click here to view it. Click here to view it.
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt new file mode 100644 index 000000000..cd9748bae --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Dmp Modified \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html similarity index 98% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html index 01f0536d6..bc5bfc087 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html @@ -262,7 +262,7 @@ OpenDMP

User {userName} have sent you a merge Request.

-

Please confirm that you want to merge your {host} account with that account. +

Please confirm that you want to merge your {installation-url} account with that account.
The link will expire in {expiration_time}.

@@ -271,7 +271,7 @@
- +
Confirm Merge Request Confirm Merge Request
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt new file mode 100644 index 000000000..3c52e9249 --- /dev/null +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt @@ -0,0 +1 @@ +ARGOS - Merge Account Confirmation \ No newline at end of file diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/UnlinkConfirmation/Email/body.en.html b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html similarity index 99% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/UnlinkConfirmation/Email/body.en.html rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html index ee547f813..a43224531 100644 --- a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/UnlinkConfirmation/Email/body.en.html +++ b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html @@ -271,7 +271,7 @@ - +
Confirm Unlink Request Confirm Unlink Request
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/UnlinkConfirmation/Email/subject.en.txt b/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt similarity index 100% rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/UnlinkConfirmation/Email/subject.en.txt rename to dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt