superfluous code removed, code optimised

This commit is contained in:
ogerly 2023-05-17 08:36:02 +02:00
parent 21799c9950
commit 6e55acef7f
16 changed files with 258 additions and 570 deletions

View File

@ -1,16 +1,19 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.accountActivation.title')
.text-block
include ../includes/salutation.pug
p= t('emails.accountActivation.emailRegistered')
.content.w-container
h2.heading= t('emails.general.completeRegistration')
h2= t('emails.accountActivation.title')
.text-block
include ../includes/salutation.pug
p= t('emails.accountActivation.emailRegistered')
.content
h2= t('emails.general.completeRegistration')
div(class="p_content")= t('emails.accountActivation.pleaseClickLink')
a.button-3.w-button(href=activationLink) #{t('emails.accountActivation.activateAccount')}
a.button-3(href=activationLink) #{t('emails.accountActivation.activateAccount')}
div(class="p_content")= t('emails.general.orCopyLink')
a(href=activationLink) #{activationLink}
a.clink(href=activationLink) #{activationLink}
br
br
br
include ../includes/requestNewLink.pug

View File

@ -1,21 +1,22 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.accountMultiRegistration.title')
.text-block
include ../includes/salutation.pug
p
= t('emails.accountMultiRegistration.emailReused')
br
= t('emails.accountMultiRegistration.emailExists')
.content.w-container
h2.heading= t('emails.resetPassword.title')
h2= t('emails.accountMultiRegistration.title')
.text-block
include ../includes/salutation.pug
p
= t('emails.accountMultiRegistration.emailReused')
br
= t('emails.accountMultiRegistration.emailExists')
.content
h2= t('emails.resetPassword.title')
div(class="p_content")= t('emails.accountMultiRegistration.onForgottenPasswordClickLink')
a.button-3.w-button(href=resendLink) #{t('emails.general.reset')}
a.button-3(href=resendLink) #{t('emails.general.reset')}
div(class="p_content")= t('emails.general.orCopyLink')
a(href=resendLink) #{resendLink}
h2.heading-2= t('emails.accountMultiRegistration.contactSupport')
a.clink(href=resendLink) #{resendLink}
h2(style="color: red")= t('emails.accountMultiRegistration.contactSupport')
div(class="p_content")= t('emails.accountMultiRegistration.ifYouAreNotTheOne')
a(href='mailto:' + supportEmail)= supportEmail
a.clink(href='mailto:' + supportEmail)= supportEmail

View File

@ -1,14 +1,17 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.addedContributionMessage.title')
.text-block
include ../includes/salutation.pug
p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
.content.w-container
h2.heading= t('emails.addedContributionMessage.readMessage')
h2= t('emails.addedContributionMessage.title')
.text-block
include ../includes/salutation.pug
p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo })
.content
h2= t('emails.addedContributionMessage.readMessage')
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.clink(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')}
br
br
br
include ../includes/doNotReply.pug

View File

@ -1,11 +1,10 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.contributionConfirmed.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount })
.content.w-container
h2= t('emails.contributionConfirmed.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount })
.content
include ../includes/contributionDetailsCTA.pug
include ../includes/doNotReply.pug

View File

@ -1,11 +1,10 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.contributionDeleted.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName })
.content.w-container
h2= t('emails.contributionDeleted.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName })
.content
include ../includes/contributionDetailsCTA.pug
include ../includes/doNotReply.pug

View File

@ -1,11 +1,10 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.contributionDenied.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName })
.content.w-container
h2= t('emails.contributionDenied.title')
.text-block
include ../includes/salutation.pug
p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName })
.content
include ../includes/contributionDetailsCTA.pug
include ../includes/doNotReply.pug

View File

@ -1,6 +1,7 @@
//-
h2.heading= t('emails.general.contributionDetails')
h2= t('emails.general.contributionDetails')
div(class="p_content")= t('emails.contribution.toSeeContributionsAndMessages')
a.button-3.w-button(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')}
a.button-3(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')}
div(class="p_content")= t('emails.general.orCopyLink')
a(href="https://gdd.gradido.net/community/contributions") https://gdd.gradido.net/community/contributions
a.clink(href="https://gdd.gradido.net/community/contributions") https://gdd.gradido.net/community/contributions

View File

@ -1,7 +1,7 @@
footer
.w-container(class="footer_01")
.socialmedia
a(
a.slink(
target="_blank"
href="https://www.facebook.com/groups/Gradido/"
)
@ -19,7 +19,7 @@ footer
path(
d="M16 8.049c0-4.446-3.582-8.05-8-8.05C3.58 0-.002 3.603-.002 8.05c0 4.017 2.926 7.347 6.75 7.951v-5.625h-2.03V8.05H6.75V6.275c0-2.017 1.195-3.131 3.022-3.131.876 0 1.791.157 1.791.157v1.98h-1.009c-.993 0-1.303.621-1.303 1.258v1.51h2.218l-.354 2.326H9.25V16c3.824-.604 6.75-3.934 6.75-7.951z"
)
a(
a.slink(
target="_blank"
href="https://twitter.com/gradido"
)
@ -37,7 +37,7 @@ footer
path(
d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"
)
a(
a.slink(
target="_blank"
href="https://www.youtube.com/c/GradidoNet"
)
@ -55,7 +55,7 @@ footer
path(
d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.007 2.007 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.007 2.007 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31.4 31.4 0 0 1 0 7.68v-.122C.002 7.343.01 6.6.064 5.78l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.007 2.007 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A99.788 99.788 0 0 1 7.858 2h.193zM6.4 5.209v4.818l4.157-2.408L6.4 5.209z"
)
a(
a.slink(
target="_blank"
href="https://t.me/GradidoGruppe"
)
@ -69,15 +69,26 @@ footer
path(
d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.287 5.906c-.778.324-2.334.994-4.666 2.01-.378.15-.577.298-.595.442-.03.243.275.339.69.47l.175.055c.408.133.958.288 1.243.294.26.006.549-.1.868-.32 2.179-1.471 3.304-2.214 3.374-2.23.05-.012.12-.026.166.016.047.041.042.12.037.141-.03.129-1.227 1.241-1.846 1.817-.193.18-.33.307-.358.336a8.154 8.154 0 0 1-.188.186c-.38.366-.664.64.015 1.088.327.216.589.393.85.571.284.194.568.387.936.629.093.06.183.125.27.187.331.236.63.448.997.414.214-.02.435-.22.547-.82.265-1.417.786-4.486.906-5.751a1.426 1.426 0 0 0-.013-.315.337.337 0 0 0-.114-.217.526.526 0 0 0-.31-.093c-.3.005-.763.166-2.984 1.09z"
)
.line
.wf-section(class="footer_02")
.container-2.w-container
.line
.footer
div(class="footer_p1")= t("emails.footer.contactOurSupport")
div(class="footer_p2")= t("emails.footer.supportEmail")
img.image-2(
img.image(
alt="Gradido Logo"
src="https://gdd.gradido.net/img/brand/green.png"
)
div
a(
class="terms_of_use"
href="https://gradido.net/de/impressum/"
target="_blank"
)= t("emails.footer.imprint")
br
a(
class="terms_of_use"
href="https://gradido.net/de/datenschutz/"
target="_blank"
)= t("emails.footer.privacyPolicy")
div(class="footer_p1")
| Gradido-Akademie
br
@ -88,15 +99,7 @@ footer
| 74653 Künzelsau
br
| Deutschland
.div-block
a(
class="terms_of_use"
href="https://gradido.net/de/impressum/"
target="_blank"
)= t("emails.footer.imprint")
.text-block-3 |
a(
class="terms_of_use"
href="https://gradido.net/de/datenschutz/"
target="_blank"
)= t("emails.footer.privacyPolicy")
br
br
br

View File

@ -1,7 +1,6 @@
//- This sets the greeting at the end of every e-mail
.w-container(class="wrapper_head")
.text-block
p
= t('emails.general.sincerelyYours')
br
= t('emails.general.yourGradidoTeam')
.text-block
p
= t('emails.general.sincerelyYours')
br
= t('emails.general.yourGradidoTeam')

View File

@ -1,5 +1,5 @@
header
.head.wf-section(class="header")
.head
//- TODO
//- when https://gdd.gradido.net/img/gradido-email-header.jpg is on production,
//- replace this URL by https://gdd.gradido.net/img/brand/gradido-email-header.png

View File

@ -1,10 +1,10 @@
//-
requestNewLink
h2.heading-2= t('emails.general.requestNewLink')
h2= t('emails.general.requestNewLink')
if timeDurationObject.minutes == 0
div(class="p_content")= t('emails.general.linkValidity', { hours: timeDurationObject.hours })
else
div(class="p_content")= t('emails.general.linkValidityWithMinutes', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes })
a.button-4.w-button(href=resendLink) #{t('emails.general.newLink')}
a.button-4(href=resendLink) #{t('emails.general.newLink')}

File diff suppressed because one or more lines are too long

View File

@ -16,10 +16,11 @@ html(lang=locale)
include includes/webflow.css
body
include includes/header.pug
div.container
include includes/header.pug
.wrapper.wf-section
block content
include includes/greeting.pug
.wrapper
block content
include includes/greeting.pug
include includes/footer.pug
include includes/footer.pug

View File

@ -1,16 +1,19 @@
extends ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.resetPassword.title')
.text-block
include ../includes/salutation.pug
p= t('emails.resetPassword.youOrSomeoneResetPassword')
.content.w-container
h2.heading= t('emails.resetPassword.title')
h2= t('emails.resetPassword.title')
.text-block
include ../includes/salutation.pug
p= t('emails.resetPassword.youOrSomeoneResetPassword')
.content
h2= t('emails.resetPassword.title')
div(class="p_content")= t('emails.resetPassword.pleaseClickLink')
a.button-3.w-button(href=resetLink) #{t('emails.general.reset')}
a.button-3(href=resetLink) #{t('emails.general.reset')}
div(class="p_content")= t('emails.general.orCopyLink')
a(href=resetLink) #{resetLink}
a.clink(href=resetLink) #{resetLink}
br
br
br
include ../includes/requestNewLink.pug

View File

@ -1,18 +1,21 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName })
.text-block
include ../includes/salutation.pug
p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
.content.w-container
h2.heading= t('emails.general.transactionDetails')
h2= t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName })
.text-block
include ../includes/salutation.pug
p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
.content
h2= t('emails.general.transactionDetails')
div(class="p_content")= t('emails.general.amountGDD', { amountGDD: transactionAmount })
br
= t('emails.transactionLinkRedeemed.memo', { transactionMemo })
br
= t('emails.general.detailsYouFindOnLinkToYourAccount')
a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
a.clink(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
br
br
br
include ../includes/doNotReply.pug

View File

@ -1,15 +1,18 @@
extend ../layout.pug
block content
.w-container(class="wrapper_head")
h1.headline.h1= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
.text-block
include ../includes/salutation.pug
p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
.content.w-container
h2.heading= t('emails.general.transactionDetails')
h2= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
.text-block
include ../includes/salutation.pug
p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
.content
h2= t('emails.general.transactionDetails')
div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount')
a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
a.clink(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')}
br
br
br
include ../includes/doNotReply.pug