rename notification templated

dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml

@@ -11,68 +11,47 @@ notification:
       overrides: []
   resolver:
     global-policies:
-        - #Confirmation
+        - #dmpInvitation
-          type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-          contacts: [ email ]
-        - #DataManagementPlan
           type: 065DEECD-21BB-44AF-9983-E660FDF24BC4
           contacts: [ email ]
-        - #Finalised
+        - #dpmModified
-          type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-          contacts: [ email ]
-        - #MergeConfirmation
-          type: BFE68845-CB05-4C5A-A03D-29161A7C9660
-          contacts: [ email ]
-        - #Modified
           type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
           contacts: [ email ]
-        - #ModifiedFinalised
+        - #dmpFinalised
-          type: D3CD55FE-8DA2-42E7-A501-3795EE4F16D3
+          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
+          - #dmpInvitation
-            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
             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
+          - #dmpModified
-            key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
+            key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-            subject-path: classpath:notification_templates/Finalised/Email/subject.{language}.txt
+            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
+          - #dmpFinalised
-            key: BFE68845-CB05-4C5A-A03D-29161A7C9660
+            key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-            subject-path: classpath:notification_templates/MergeConfirmation/Email/subject.{language}.txt
+            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
+          - #removeCredentialConfirmation
-            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
             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"

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Confirmation/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Email Confirmation

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Finalised/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Finalised

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/MergeConfirmation/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Merge Confirmation

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Modified/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Modified

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/ModifiedFinalised/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Modified Finalised

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Publish/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Publish

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/Template/Email/subject.en.txt

@@ -1 +0,0 @@
-ARGOS - Template Invite

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html

@@ -261,7 +261,7 @@
                                 <tr>
                                     <td>
                                         <p>Dear {recipient},</p>
-                                        <p>{reasonName} just made changes to the {name}.</p>
+                                        <p>{reasonName} just made changes to the Description {name}.</p>
 
                                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
                                             <tbody>
@@ -270,7 +270,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}{path}/{id}" target="_blank">Click here to view it.</a> </td>
+                                                            <td> <a href="{installation-url}/descriptions/edit/{id}" target="_blank">Click here to view it.</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Description Modified

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html

@@ -271,7 +271,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}/dataset-profiles/{templateID}" target="_blank">{templateName}</a> </td>
+                                                            <td> <a href="{installation-url}/description-templates/{templateID}" target="_blank">{templateName}</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Description Template Invite

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html

@@ -0,0 +1,304 @@
+<!doctype html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Simple Transactional Email</title>
+    <style>
+      /* -------------------------------------
+          GLOBAL RESETS
+      ------------------------------------- */
+      img {
+        border: none;
+        -ms-interpolation-mode: bicubic;
+        max-width: 100%; }
+      body {
+        background-color: #f6f6f6;
+        font-family: sans-serif;
+        -webkit-font-smoothing: antialiased;
+        font-size: 14px;
+        line-height: 1.4;
+        margin: 0;
+        padding: 0;
+        -ms-text-size-adjust: 100%;
+        -webkit-text-size-adjust: 100%; }
+      table {
+        border-collapse: separate;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        width: 100%; }
+        table td {
+          font-family: sans-serif;
+          font-size: 14px;
+          vertical-align: top; }
+      /* -------------------------------------
+          BODY & CONTAINER
+      ------------------------------------- */
+      .body {
+        background-color: #f6f6f6;
+        width: 100%; }
+      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+      .container {
+        display: block;
+        Margin: 0 auto !important;
+        /* makes it centered */
+        max-width: 580px;
+        padding: 10px;
+        width: 580px; }
+      /* This should also be a block element, so that it will fill 100% of the .container */
+      .content {
+        box-sizing: border-box;
+        display: block;
+        Margin: 0 auto;
+        max-width: 580px;
+        padding: 10px; }
+      /* -------------------------------------
+          HEADER, FOOTER, MAIN
+      ------------------------------------- */
+      .main {
+        background: #ffffff;
+        border-radius: 3px;
+        width: 100%; }
+      .wrapper {
+        box-sizing: border-box;
+        padding: 20px; }
+      .content-block {
+        padding-bottom: 10px;
+        padding-top: 10px;
+      }
+      .footer {
+        clear: both;
+        Margin-top: 10px;
+        text-align: center;
+        width: 100%; }
+        .footer td,
+        .footer p,
+        .footer span,
+        .footer a {
+          color: #999999;
+          font-size: 12px;
+          text-align: center; }
+      /* -------------------------------------
+          TYPOGRAPHY
+      ------------------------------------- */
+      h1,
+      h2,
+      h3,
+      h4 {
+        color: #000000;
+        font-family: sans-serif;
+        font-weight: 400;
+        line-height: 1.4;
+        margin: 0;
+        Margin-bottom: 30px; }
+      h1 {
+        font-size: 35px;
+        font-weight: 300;
+        text-align: center;
+        text-transform: capitalize; }
+      p,
+      ul,
+      ol {
+        font-family: sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        margin: 0;
+        Margin-bottom: 15px; }
+        p li,
+        ul li,
+        ol li {
+          list-style-position: inside;
+          margin-left: 5px; }
+      a {
+        color: #3498db;
+        text-decoration: underline; }
+      /* -------------------------------------
+          BUTTONS
+      ------------------------------------- */
+      .btn {
+        box-sizing: border-box;
+        width: 100%; }
+        .btn > tbody > tr > td {
+          padding-bottom: 15px; }
+        .btn table {
+          width: auto; }
+        .btn table td {
+          background-color: #ffffff;
+          border-radius: 5px;
+          text-align: center; }
+        .btn a {
+          background-color: #ffffff;
+          border: solid 1px #3498db;
+          border-radius: 5px;
+          box-sizing: border-box;
+          color: #3498db;
+          cursor: pointer;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: bold;
+          margin: 0;
+          padding: 12px 25px;
+          text-decoration: none;
+          text-transform: capitalize; }
+      .btn-primary table td {
+        background-color: #3498db; }
+      .btn-primary a {
+        background-color: #3498db;
+        border-color: #3498db;
+        color: #ffffff; }
+      /* -------------------------------------
+          OTHER STYLES THAT MIGHT BE USEFUL
+      ------------------------------------- */
+      .last {
+        margin-bottom: 0; }
+      .first {
+        margin-top: 0; }
+      .align-center {
+        text-align: center; }
+      .align-right {
+        text-align: right; }
+      .align-left {
+        text-align: left; }
+      .clear {
+        clear: both; }
+      .mt0 {
+        margin-top: 0; }
+      .mb0 {
+        margin-bottom: 0; }
+      .preheader {
+        color: transparent;
+        display: none;
+        height: 0;
+        max-height: 0;
+        max-width: 0;
+        opacity: 0;
+        overflow: hidden;
+        mso-hide: all;
+        visibility: hidden;
+        width: 0; }
+      .powered-by a {
+        text-decoration: none; }
+      hr {
+        border: 0;
+        border-bottom: 1px solid #f6f6f6;
+        Margin: 20px 0; }
+      /* -------------------------------------
+          RESPONSIVE AND MOBILE FRIENDLY STYLES
+      ------------------------------------- */
+      @media only screen and (max-width: 620px) {
+        table[class=body] h1 {
+          font-size: 28px !important;
+          margin-bottom: 10px !important; }
+        table[class=body] p,
+        table[class=body] ul,
+        table[class=body] ol,
+        table[class=body] td,
+        table[class=body] span,
+        table[class=body] a {
+          font-size: 16px !important; }
+        table[class=body] .wrapper,
+        table[class=body] .article {
+          padding: 10px !important; }
+        table[class=body] .content {
+          padding: 0 !important; }
+        table[class=body] .container {
+          padding: 0 !important;
+          width: 100% !important; }
+        table[class=body] .main {
+          border-left-width: 0 !important;
+          border-radius: 0 !important;
+          border-right-width: 0 !important; }
+        table[class=body] .btn table {
+          width: 100% !important; }
+        table[class=body] .btn a {
+          width: 100% !important; }
+        table[class=body] .img-responsive {
+          height: auto !important;
+          max-width: 100% !important;
+          width: auto !important; }}
+      /* -------------------------------------
+          PRESERVE THESE STYLES IN THE HEAD
+      ------------------------------------- */
+      @media all {
+        .ExternalClass {
+          width: 100%; }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass span,
+        .ExternalClass font,
+        .ExternalClass td,
+        .ExternalClass div {
+          line-height: 100%; }
+        .apple-link a {
+          color: inherit !important;
+          font-family: inherit !important;
+          font-size: inherit !important;
+          font-weight: inherit !important;
+          line-height: inherit !important;
+          text-decoration: none !important; }
+        .btn-primary table td:hover {
+          background-color: #34495e !important; }
+        .btn-primary a:hover {
+          background-color: #34495e !important;
+          border-color: #34495e !important; } }
+    </style>
+</head>
+<body class="">
+<table border="0" cellpadding="0" cellspacing="0" class="body">
+    <tr>
+        <td>&nbsp;</td>
+        <td class="container">
+            <div class="content">
+
+                <!-- START CENTERED WHITE CONTAINER -->
+                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
+                <table class="main">
+
+                    <!-- START MAIN CONTENT AREA -->
+                    <tr>
+                        <td class="wrapper">
+                            <table border="0" cellpadding="0" cellspacing="0">
+                                <tr>
+                                    <td>
+                                        <p>Dear {recipient},</p>
+                                        <p>{reasonName} just finalised the Description {name}.</p>
+
+                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
+                                            <tbody>
+                                            <tr>
+                                                <td align="left">
+                                                    <table border="0" cellpadding="0" cellspacing="0">
+                                                        <tbody>
+                                                        <tr>
+                                                            <td> <a href="{installation-url}/descriptions/edit/{id}" target="_blank">Click here to view it.</a> </td>
+                                                        </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+
+                    <!-- END MAIN CONTENT AREA -->
+                </table>
+
+                <!-- START FOOTER -->
+                <div class="footer">
+
+                </div>
+                <!-- END FOOTER -->
+
+                <!-- END CENTERED WHITE CONTAINER -->
+            </div>
+        </td>
+        <td>&nbsp;</td>
+    </tr>
+</table>
+</body>
+</html>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Description Finalised

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html

@@ -270,7 +270,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}{path}/{id}" target="_blank">Click here to view it.</a> </td>
+                                                            <td> <a href="{installation-url}/{path}/{id}" target="_blank">Click here to view it.</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Dmp Deposit

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html

@@ -261,7 +261,7 @@
                                 <tr>
                                     <td>
                                         <p>Dear {recipient},</p>
-                                        <p>{reasonName} just finalised the {name}.</p>
+                                        <p>{reasonName} just finalised the Dmp {name}.</p>
 
                                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
                                             <tbody>
@@ -270,7 +270,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}{path}/{id}" target="_blank">Click here to view it.</a> </td>
+                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Click here to view it.</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Dmp Finalised

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitation/email/body.en.html

@@ -271,7 +271,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}/plans/invitation/{invitationID}" target="_blank">Join</a> </td>
+                                                            <td> <a href="{installation-url}/plans/invitation/{invitationID}" target="_blank">Join</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html

@@ -261,7 +261,7 @@
                                 <tr>
                                     <td>
                                         <p>Dear {recipient},</p>
-                                        <p>{reasonName} just made changes and finalised the {name}.</p>
+                                        <p>{reasonName} just made changes to the Dmp {name}.</p>
 
                                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
                                             <tbody>
@@ -270,7 +270,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{host}{path}/{id}" target="_blank">Click here to view it.</a> </td>
+                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Click here to view it.</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Dmp Modified

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt

@@ -0,0 +1 @@
+ARGOS - Merge Account Confirmation

dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html

@@ -271,7 +271,7 @@
                           <table border="0" cellpadding="0" cellspacing="0">
                             <tbody>
                             <tr>
-                              <td> <a href="{host}/unlink/confirmation/{confirmationToken}" target="_blank">Confirm Unlink Request</a> </td>
+                              <td> <a href="{installation-url}/unlink/confirmation/{confirmationToken}" target="_blank">Confirm Unlink Request</a> </td>
                             </tr>
                             </tbody>
                           </table>