Refit invite and restore mail templates

Fixes {% partial %} node for mail templates
Trim body var for text emails
Style code nodes
This commit is contained in:
Samuel Georges 2017-07-22 22:23:22 +10:00
parent b2b82588f2
commit 9287d926f7
11 changed files with 27 additions and 46 deletions

View File

@ -2,35 +2,19 @@ subject = "Welcome to October CMS"
layout = "system"
description = "Invite new admin to the site"
==
Hi {{ name }},
Hi {{ name }}
A user account has been created for you.
Login: {{ login }}
Password: {{ password }}
After signing in you should change your password by clicking your name on the top right corner of the administration area.
{% component 'panel' %}
- Login: `admin4{{ login }}`
- Password: `admin{{ password }}`
{% endcomponent %}
You can use the following link to sign in:
{{ link }}
==
{% component 'button' url=link %}
Sign in to admin area
{% endcomponent %}
<p>Hi {{ name }},</p>
<p>A user account has been created for you.</p>
<p>
Login: {{ login }}<br />
Password: {{ password }}
</p>
<p>After signing in you should change your password by clicking your name on the top right corner of the administration area.</p>
<p>
You can use the following link to sign in:<br />
<a href="{{ link }}">{{ link }}</a>
</p>
After signing in you should change your password by clicking your name on the top right corner of the administration area.

View File

@ -2,21 +2,12 @@ subject = "Password Reset"
layout = "system"
description = "Reset an admin password"
==
Hello {{ name }},
Hello {{ name }}
Somebody has requested a password reset for your account, if this was not you, please ignore this email.
You can use the following link to restore your password:
{{ link }}
==
<p>Hello {{ name }},</p>
<p>Somebody has requested a password reset for your account, if this was not you, please ignore this email.</p>
<p>
You can use the following link to restore your password:<br />
<a href="{{ link }}">{{ link }}</a>
</p>
{% component 'button' url=link type='positive' %}
Restore password
{% endcomponent %}

View File

@ -71,6 +71,12 @@ p {
text-align: left;
}
code {
color: @text-color;
font-size: 16px;
line-height: 1.5em;
}
p.sub {
font-size: 12px;
}

View File

@ -34,7 +34,7 @@ class MailPartialNode extends Twig_Node
}
$compiler
->write("echo \$this->env->getExtension('Cms\Twig\Extension')->partialFunction(")
->write("echo \System\Classes\MailManager::instance()->renderPartial(")
->subcompile($this->getNode('nodes')->getNode(0))
->write(", \$context['__system_partial_params']")
->write(");\n")

View File

@ -1,6 +1,6 @@
name = "Button"
==
{{ body }} <{{ url }}>
{{ body|trim }} <{{ url }}>
==
<table class="action" align="center" width="100%" cellpadding="0" cellspacing="0">
<tr>

View File

@ -1,7 +1,7 @@
name = "Footer"
==
-------------------
{{ body }}
{{ body|trim }}
==
<tr>
<td>

View File

@ -1,6 +1,6 @@
name = "Header"
==
*** {{ body }} <{{ url }}>
*** {{ body|trim }} <{{ url }}>
==
<tr>
<td class="header">

View File

@ -1,6 +1,6 @@
name = "Panel"
==
{{ body }}
{{ body|trim }}
==
<table class="panel" width="100%" cellpadding="0" cellspacing="0">
<tr>

View File

@ -1,6 +1,6 @@
name = "Promotion"
==
{{ body }}
{{ body|trim }}
==
<table class="promotion" align="center" width="100%" cellpadding="0" cellspacing="0">
<tr>

View File

@ -1,6 +1,6 @@
name = "Subcopy"
==
{{ body }}
{{ body|trim }}
==
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0">
<tr>

View File

@ -1,6 +1,6 @@
name = "Table"
==
{{ body }}
{{ body|trim }}
==
<div class="table">
{{ body|md_safe }}