apply pug layout to contribution related email templates

backend/src/emails/templates/addedContributionMessage/html.pug

@@ -1,16 +1,15 @@
-doctype html
+extend ../layout.pug
-html(lang=locale)
+
-  head
+block content
-    title= t('emails.addedContributionMessage.subject')
+  .wrapper.wf-section
-  body
+    .w-container(class="wrapper_head")
-    h1(style='margin-bottom: 24px;')= t('emails.addedContributionMessage.subject')
+      h1.headline.h1= t('emails.addedContributionMessage.title')
-    #container.col
+      .text-block
-      include ../hello.pug
+        include ../includes/salutation.pug
-      p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
+        p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
-      p= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
+    .content.w-container
-      p
+      h2.heading= t('emails.addedContributionMessage.readMessage')
-        = t('emails.general.linkToYourAccount')
+      div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage')
-        = " "
+      a.button-3.w-button(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
-        a(href=overviewURL) #{overviewURL}
+      
-      p= t('emails.general.pleaseDoNotReply')
+      include ../includes/doNotReply.pug
-      include ../greatingFormularImprint.pug

backend/src/emails/templates/contributionConfirmed/html.pug

@@ -1,16 +1,18 @@
-doctype html
+extend ../layout.pug
-html(lang=locale)
+
-  head
+block content
-    title= t('emails.contributionConfirmed.subject')
+  .wrapper.wf-section
-  body
+    .w-container(class="wrapper_head")
-    h1(style='margin-bottom: 24px;')= t('emails.contributionConfirmed.subject')
+      h1.headline.h1= t('emails.contributionConfirmed.title')
-    #container.col
+      .text-block
-      include ../hello.pug
+        include ../includes/salutation.pug
-      p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName, contributionMemo })
+        p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName })
-      p= t('emails.general.amountGDD', { amountGDD: contributionAmount })
+    .content.w-container
-      p
+      h2.heading= t('emails.general.contributionDetails')
-        = t('emails.general.linkToYourAccount')
+      div(class="p_content")
-        = " "
+        = t('emails.general.amountGDD')
-        a(href=overviewURL) #{overviewURL}
+        br
-      p= t('emails.general.pleaseDoNotReply')
+        = t('emails.general.contribution')
-      include ../greatingFormularImprint.pug
+      a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')}
+
+      include ../includes/doNotReply.pug

backend/src/emails/templates/contributionDeleted/html.pug

@@ -1,16 +1,16 @@
-doctype html
+extend ../layout.pug
-html(lang=locale)
+
-  head
+block content
-    title= t('emails.contributionDeleted.subject')
+  .wrapper.wf-section
-  body
+    .w-container(class="wrapper_head")
-    h1(style='margin-bottom: 24px;')= t('emails.contributionDeleted.subject')
+      h1.headline.h1= t('emails.contributionDeleted.title')
-    #container.col
+      .text-block
-      include ../hello.pug
+        include ../includes/salutation.pug
-      p= t('emails.contributionDeleted.commonGoodContributionDeleted', { senderFirstName, senderLastName, contributionMemo })
+        p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName })
-      p= t('emails.contributionDeleted.toSeeContributionsAndMessages')
+    .content.w-container
-      p
+      h2.heading= t('emails.general.contributionDetails')
-        = t('emails.general.linkToYourAccount')
+      div(class="p_content")
-        = " "
+        = t('emails.contribution.toSeeContributionsAndMessages')
-        a(href=overviewURL) #{overviewURL}
+      a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')}
-      p= t('emails.general.pleaseDoNotReply')
+
-      include ../greatingFormularImprint.pug
+      include ../includes/doNotReply.pug

backend/src/emails/templates/contributionDenied/html.pug

@@ -1,16 +1,16 @@
-doctype html
+extend ../layout.pug
-html(lang=locale)
+
-  head
+block content
-    title= t('emails.contributionDenied.subject')
+  .wrapper.wf-section
-  body
+    .w-container(class="wrapper_head")
-    h1(style='margin-bottom: 24px;')= t('emails.contributionDenied.subject')
+      h1.headline.h1= t('emails.contributionDenied.title')
-    #container.col
+      .text-block
-      include ../hello.pug
+        include ../includes/salutation.pug
-      p= t('emails.contributionDenied.commonGoodContributionDenied', { senderFirstName, senderLastName, contributionMemo })
+        p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName })
-      p= t('emails.contributionDenied.toSeeContributionsAndMessages')
+    .content.w-container
-      p
+      h2.heading= t('emails.general.contributionDetails')
-        = t('emails.general.linkToYourAccount')
+      div(class="p_content")
-        = " "
+        = t('emails.contribution.toSeeContributionsAndMessages')
-        a(href=overviewURL) #{overviewURL}
+      a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')}
-      p= t('emails.general.pleaseDoNotReply')
+
-      include ../greatingFormularImprint.pug
+      include ../includes/doNotReply.pug

backend/src/emails/templates/includes/doNotReply.pug

@@ -0,0 +1 @@
+div(class="p_content")= t('emails.general.pleaseDoNotReply')

backend/src/locales/de.json

@@ -20,12 +20,16 @@
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "du hast zu deinem Gemeinwohl-Beitrag „{contributionMemo}“ eine Nachricht von {senderFirstName} {senderLastName} erhalten.",
+      "readMessage": "Nachricht lesen und beantworten",
       "subject": "Gradido: Nachricht zu deinem Gemeinwohl-Beitrag",
       "title": "Nachricht zu deinem Gemeinwohl-Beitrag",
-      "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
+      "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“."
+    },
+    "contribution": {
+      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“."
     },
     "contributionConfirmed": {
-      "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt und in deinem Gradido-Konto gutgeschrieben.",
+      "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag wurde soeben von {senderFirstName} {senderLastName} bestätigt und in deinem Gradido-Konto gutgeschrieben.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde bestätigt",
       "title": "Dein Gemeinwohl-Beitrag wurde bestätigt"
     },
@@ -33,13 +37,11 @@
       "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde gelöscht",
       "title": "Dein Gemeinwohl-Beitrag wurde gelöscht",
-      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde abgelehnt",
       "title": "Dein Gemeinwohl-Beitrag wurde abgelehnt",
-      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
     },
     "footer": {
       "contactOurSupport": "Bei weiteren fragen kontaktiere bitte unseren Support.",
@@ -51,6 +53,8 @@
     },
     "general": {
       "amountGDD": "Betrag: {amountGDD} GDD",
+      "contribution": "Gemeinwohl-Beitrag: {contributionMemo}",
+      "contributionDetails": "Beitragsdetails",
       "detailsYouFindOnLinkToYourAccount": "Details zur Transaktion findest du in deinem Gradido-Konto:",
       "helloName": "Hallo {firstName} {lastName},",
       "linkToYourAccount": "Link zu deinem Konto:",
@@ -59,6 +63,7 @@
       "pleaseDoNotReply": "Bitte antworte nicht auf diese E-Mail!",
       "reset": "zurücksetzen",
       "sincerelyYours": "Liebe Grüße",
+      "toAccount": "Zum Konto",
       "yourGradidoTeam": "dein Gradido-Team"
     },
     "resetPassword": {
@@ -66,7 +71,6 @@
       "pleaseClickLink": "Wenn du es warst, klicke bitte auf den Link:",
       "subject": "Gradido: Passwort zurücksetzen",
       "title": "Passwort zurücksetzen",
-      "toAccount": "Zum Konto",
       "youOrSomeoneResetPassword": "du oder jemand anderes, hast für dieses Konto ein Zurücksetzen des Passworts angefordert."
     },
     "transactionLinkRedeemed": {

backend/src/locales/en.json

@@ -20,26 +20,28 @@
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "you have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.",
+      "readMessage": "Read and reply to message",
       "subject": "Gradido: Message about your common good contribution",
       "title": "Message about your common good contribution",
-      "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
+      "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab."
+    },
+    "contribution": {
+      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab."
     },
     "contributionConfirmed": {
-      "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
+      "commonGoodContributionConfirmed": "Your common good contribution has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
       "subject": "Gradido: Your contribution to the common good was confirmed",
       "title": "Your contribution to the common good was confirmed"
     },
     "contributionDeleted": {
-      "commonGoodContributionDeleted": "Your public good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.",
+      "commonGoodContributionDeleted": "Your common good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was deleted",
-      "title": "Your common good contribution was deleted",
+      "title": "Your common good contribution was deleted"
-      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
     },
     "contributionDenied": {
-      "commonGoodContributionDenied": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
+      "commonGoodContributionDenied": "Your common good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was rejected",
-      "title": "Your common good contribution was rejected",
+      "title": "Your common good contribution was rejected"
-      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
     },
     "footer": {
       "contactOurSupport": "If you have any further questions, please contact our support.",
@@ -51,6 +53,8 @@
     },
     "general": {
       "amountGDD": "Amount: {amountGDD} GDD",
+      "contribution": "Contribution: : {contributionMemo}",
+      "contributionDetails": "Contribution details",
       "detailsYouFindOnLinkToYourAccount": "You can find transaction details in your Gradido account:",
       "helloName": "Hello {firstName} {lastName}",
       "linkToYourAccount": "Link to your account:",
@@ -59,6 +63,7 @@
       "pleaseDoNotReply": "Please do not reply to this email!",
       "reset": "reset",
       "sincerelyYours": "Kind regards,",
+      "toAccount": "To account",
       "yourGradidoTeam": "your Gradido team"
     },
     "resetPassword": {