From 56fa81700576d84b9d0aca5be8da52a34d7f0b97 Mon Sep 17 00:00:00 2001
From: Vincent MARMIESSE <vincent.marmiesse@ph2m.com>
Date: Mon, 29 May 2017 23:04:05 +0200
Subject: [PATCH] Change the default contact form email template to HTML

---
 .../Magento/Contact/etc/email_templates.xml   |  2 +-
 .../view/adminhtml/email/submitted_form.html  | 19 ---------------
 .../view/frontend/email/submitted_form.html   | 24 +++++++++++++++++++
 3 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 app/code/Magento/Contact/view/adminhtml/email/submitted_form.html
 create mode 100644 app/code/Magento/Contact/view/frontend/email/submitted_form.html

diff --git a/app/code/Magento/Contact/etc/email_templates.xml b/app/code/Magento/Contact/etc/email_templates.xml
index 8ae3b643f43c8..8f3f5ee442f7d 100644
--- a/app/code/Magento/Contact/etc/email_templates.xml
+++ b/app/code/Magento/Contact/etc/email_templates.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
-    <template id="contact_email_email_template" label="Contact Form" file="submitted_form.html" type="text" module="Magento_Contact" area="adminhtml"/>
+    <template id="contact_email_email_template" label="Contact Form" file="submitted_form.html" type="html" module="Magento_Contact" area="frontend"/>
 </config>
diff --git a/app/code/Magento/Contact/view/adminhtml/email/submitted_form.html b/app/code/Magento/Contact/view/adminhtml/email/submitted_form.html
deleted file mode 100644
index f65d67e6cafc3..0000000000000
--- a/app/code/Magento/Contact/view/adminhtml/email/submitted_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!--@subject {{trans "Contact Form"}} @-->
-<!--@vars {
-"var data.comment":"Comment",
-"var data.email":"Sender Email",
-"var data.name":"Sender Name",
-"var data.telephone":"Sender Telephone"
-} @-->
-
-{{trans "Name: %name" name=$data.name}}
-{{trans "Email: %email" email=$data.email}}
-{{trans "Phone Number: %telephone" telephone=$data.telephone}}
-
-{{trans "Comment: %comment" comment=$data.comment}}
diff --git a/app/code/Magento/Contact/view/frontend/email/submitted_form.html b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
new file mode 100644
index 0000000000000..b55f4200d8c81
--- /dev/null
+++ b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
@@ -0,0 +1,24 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@subject {{trans "Contact Form"}} @-->
+<!--@vars {
+"var data.comment":"Comment",
+"var data.email":"Sender Email",
+"var data.name":"Sender Name",
+"var data.telephone":"Sender Telephone"
+} @-->
+
+{{template config_path="design/email/header_template"}}
+
+<ul>
+    <li>{{trans "Name: %name" name=$data.name}}</li>
+    <li>{{trans "Email: %email" email=$data.email}}</li>
+    <li>{{trans "Phone Number: %telephone" telephone=$data.telephone}}</li>
+    <li>{{trans "Comment: %comment" comment=$data.comment}}</li>
+</ul>
+
+{{template config_path="design/email/footer_template"}}
\ No newline at end of file