diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index 1c5164f52..05d1e9f87 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -292,13 +292,13 @@ class ServiceProvider extends ModuleServiceProvider */ MailManager::instance()->registerCallback(function ($manager) { $manager->registerMailLayouts([ - 'default' => 'system::mail.default', - 'system' => 'system::mail.system', + 'default' => 'system::mail.layout-default', + 'system' => 'system::mail.layout-system', ]); $manager->registerMailPartials([ - 'button' => 'system::mail.button', - 'table' => 'system::mail.table', + 'button' => 'system::mail.partial-button', + 'table' => 'system::mail.partial-table', ]); }); diff --git a/modules/system/views/mail/button.htm b/modules/system/views/mail/button.htm deleted file mode 100644 index 25f41c220..000000000 --- a/modules/system/views/mail/button.htm +++ /dev/null @@ -1,5 +0,0 @@ -name = "Button" -== -{{ body|raw }} -== - diff --git a/modules/system/views/mail/default.htm b/modules/system/views/mail/default.htm deleted file mode 100644 index 18c35509b..000000000 --- a/modules/system/views/mail/default.htm +++ /dev/null @@ -1,14 +0,0 @@ -name = "Default layout" -== -{{ content|raw }} -== - - - - - - {{ content|raw }} - - diff --git a/modules/system/views/mail/layout-default.htm b/modules/system/views/mail/layout-default.htm new file mode 100644 index 000000000..4157b8c2e --- /dev/null +++ b/modules/system/views/mail/layout-default.htm @@ -0,0 +1,40 @@ +name = "Default layout" +== +{{ content|raw }} +== + + + + + + + + + + + + + +
+ + + + + +
+ + + + + +
+ {{ content|raw }} +
+
+
+ + + diff --git a/modules/system/views/mail/system.htm b/modules/system/views/mail/layout-system.htm similarity index 92% rename from modules/system/views/mail/system.htm rename to modules/system/views/mail/layout-system.htm index a04ed935c..8637d8abd 100644 --- a/modules/system/views/mail/system.htm +++ b/modules/system/views/mail/layout-system.htm @@ -9,6 +9,7 @@ This is an automatic message. Please do not reply to it. diff --git a/modules/system/views/mail/partial-button.htm b/modules/system/views/mail/partial-button.htm new file mode 100644 index 000000000..cb78d61d7 --- /dev/null +++ b/modules/system/views/mail/partial-button.htm @@ -0,0 +1,23 @@ +name = "Button" +== +{{ body }} <{{ url }}> +== + + + + +
+ + + + +
+ + + + +
+ {{ body }} +
+
+
diff --git a/modules/system/views/mail/partial-table.htm b/modules/system/views/mail/partial-table.htm new file mode 100644 index 000000000..a5fb6b099 --- /dev/null +++ b/modules/system/views/mail/partial-table.htm @@ -0,0 +1,5 @@ +name = "Table" +== +{{ body }} +== +
{{ body|md }}
diff --git a/modules/system/views/mail/table.htm b/modules/system/views/mail/table.htm deleted file mode 100644 index 4005c84a6..000000000 --- a/modules/system/views/mail/table.htm +++ /dev/null @@ -1,5 +0,0 @@ -name = "Table" -== -{{ body|raw }} -== -
{{ body|raw }}