Fixed message template class naming

dalhyncarrillo · Feb 9, 2018 · a3581cd · a3581cd
1 parent 91152c7
commit a3581cd
Show file tree

Hide file tree

Showing 60 changed files with 162 additions and 136 deletions.
diff --git a/src/Presentation/SmartStore.Web/Administration/Content/theme.scss b/src/Presentation/SmartStore.Web/Administration/Content/theme.scss
@@ -218,10 +218,10 @@ $content-padding-y:			15px;
 		&:not(:active):not(.active):focus,
 		&:not(:active):not(.active).focus {
 			@if $color == "secondary" or $color == "light" {
-				box-shadow: 0 0 0 0.125rem rgba($primary, .15);
+				box-shadow: 0 0 0 0.25em rgba($primary, .15);
 			}
 			@else {
-				box-shadow: 0 0 0 0.125rem rgba($value, .4);
+				box-shadow: 0 0 0 0.25em rgba($value, .4);
 			}
 		}
 	}

diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
@@ -417,5 +417,16 @@ public ActionResult CopyTemplate(MessageTemplateModel model)
 				return RedirectToAction("Edit", new { id = model.Id });
 			}
 		}
+
+		public ActionResult ImportAllTemplates()
+		{
+			// Hidden action for admins
+			var converter = new MessageTemplateConverter(Services.DbContext);
+			converter.ImportAll(Services.WorkContext.WorkingLanguage);
+
+			NotifySuccess("All file based message templates imported successfully.");
+
+			return RedirectToAction("List");
+		}
     }
 }
diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Blog.BlogComment.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Blog.BlogComment.xml
@@ -13,7 +13,7 @@
 <p>
   der Blog-Eintrag <a href="{{ BlogComment.PostUrl }}">{{ BlogComment.PostTitle }}</a> wurde von <a href="{{ Customer.EditUrl }}">{{ Customer.FullName }}</a> kommentiert:
 </p>
-<table class="w-100 brd bg-light m-t-4">
+<table class="w-100 brd bg-light mt-4">
   <tbody>
     <tr>
     	<td class="p-3"><i>"{{ BlogComment.Text | Truncate: 400 }}"</i></td>

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.BackInStock.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.BackInStock.xml
@@ -12,7 +12,7 @@
 <p>
   der Artikel <b>{{ Product.Name }}</b> ist wieder verfügbar.
 </p>
-<p class="m-t-4">
+<p class="mt-4">
 	<a href="{{ Product.Url }}" class="btn btn-primary">Zum Artikel</a>
 </p>
 {% endblock %}]]></Body>

diff --git a/...resentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.EmailValidationMessage.xml b/...resentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.EmailValidationMessage.xml
@@ -13,7 +13,7 @@
   bitte bestätigen Sie Ihre Registrierung mit einem Klick auf folgenden Link:
 </p>
 
-<p class="text-center m-t-4 m-b-4">
+<p class="text-center mt-4 mb-4">
   <a class="btn btn-primary" href="{{ Customer.AccountActivationURL }}">Registrierung bestätigen</a>
 </p>
 

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.NewOrderNote.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.NewOrderNote.xml
@@ -21,7 +21,7 @@
         {{ OrderNote.Text }}
       </p>
       {% if Order.Url %}
-        <p class="text-center m-t-4">
+        <p class="text-center mt-4">
           <a href="{{ Order.Url }}" class="btn btn-primary">Zu den Bestelldetails</a>
         </p>
       {% endif %}

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.NewPM.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.NewPM.xml
@@ -13,14 +13,14 @@
   Sie haben eine neue private Nachricht von <b>{{ PrivateMessage.FromName }}</b> erhalten.
 </p>
 
-<p class="m-t-4 m-b-4">
+<p class="mt-4 mb-4">
   <a href="{{ PrivateMessage.Url }}" class="btn btn-primary">Zur Nachricht</a>
 </p>
 
 <table class="w-100 brd bg-light">
 	<tr>
   	<td class="p-3">
-      <h3 class="m-b-3">
+      <h3 class="mb-3">
         {{ PrivateMessage.Subject }}
       </h3>
       <p class="message">

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.PasswordRecovery.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Customer.PasswordRecovery.xml
@@ -14,7 +14,7 @@
   um Ihr Kennwort zurückzusetzen, klicken Sie bitte auf den folgenden Link:
 </p>
 
-<p class="text-center m-t-4 m-b-4">
+<p class="text-center mt-4 mb-4">
   <a class="btn btn-danger" href="{{ Customer.PasswordRecoveryURL }}">Kennwort zurücksetzen</a>
 </p>
 

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Forums.NewForumPost.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Forums.NewForumPost.xml
@@ -14,14 +14,14 @@
   im Forum <a href="{{ Forum.Url }}">{{ Forum.Name }}</a> wurde ein neuer Beitrag von <strong>{{ ForumPost.Author }}</strong> erstellt:
 </p>
 
-<p class="m-t-4 m-b-4">
+<p class="mt-4 mb-4">
   <a href="{{ ForumTopic.Url }}" class="btn btn-primary">Zum Beitrag</a>
 </p>
 
 <table class="w-100 brd bg-light">
 	<tr>
   	<td class="p-3">
-      <h3 class="m-b-3">
+      <h3 class="mb-3">
         {{ ForumTopic.Subject }}
       </h3>
       <p class="message">

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Forums.NewForumTopic.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Forums.NewForumTopic.xml
@@ -14,14 +14,14 @@
   im Forum <a href="{{ Forum.Url }}">{{ Forum.Name }}</a> wurde ein neues Thema erstellt:
 </p>
 
-<p class="m-t-4 m-b-4">
+<p class="mt-4 mb-4">
   <a href="{{ ForumTopic.Url }}" class="btn btn-primary">Zum Thema</a>
 </p>
 
 <table class="w-100 brd bg-light">
 	<tr>
   	<td class="p-3">
-      <h3 class="m-b-3">
+      <h3 class="mb-3">
         {{ ForumTopic.Subject }}
       </h3>
       <p class="message">

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/GiftCard.Notification.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/GiftCard.Notification.xml
@@ -23,7 +23,7 @@
 <table class="w-100 brd bg-light">
 	<tr>
   	<td class="p-3">
-      <h3 class="m-b-3">
+      <h3 class="mb-3">
         Persönliche Nachricht
       </h3>
       <p>

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewCustomer.Notification.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/NewCustomer.Notification.xml
@@ -22,7 +22,7 @@
   <a href="mailto:{{ Customer.Email }}">{{ Customer.Email }}</span>
 </p>
 
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
 	<a class="btn btn-primary" href="{{ Customer.EditUrl }}">Zum Profil</a>  
 </p>
 {% endblock %}]]></Body>

diff --git a/...ion/SmartStore.Web/App_Data/EmailTemplates/de/NewReturnRequest.StoreOwnerNotification.xml b/...ion/SmartStore.Web/App_Data/EmailTemplates/de/NewReturnRequest.StoreOwnerNotification.xml
@@ -14,7 +14,7 @@
   <b>{{ Customer.FullName }}</b> hat eine Retouren-Anfrage geschickt.
 </p>
 
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
   <a class="btn btn-primary" href="{{ ReturnRequest.Url }}">Anfrage bearbeiten</a>
 </p>
 

diff --git a/...tion/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml b/...tion/SmartStore.Web/App_Data/EmailTemplates/de/NewVATSubmitted.StoreOwnerNotification.xml
@@ -15,7 +15,7 @@
   <b>{{ Customer.FullName }}</b> (<a mailto:{{ Customer.Email }}>{{ Customer.Email }}</a>) hat eine neue Umsatzsteuer-ID übermittelt.
 </p>
 
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
   <a class="btn btn-primary" href="{{ Customer.EditUrl }}">Zum Kundenprofil</a>
 </p>
 

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/News.NewsComment.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/News.NewsComment.xml
@@ -18,7 +18,7 @@
 <table class="w-100 brd bg-light">
 	<tr>
   	<td class="p-3">
-      <h3 class="m-b-3">
+      <h3 class="mb-3">
         {{ NewsComment.Title }}
       </h3>
       <p class="message">

diff --git a/...on/SmartStore.Web/App_Data/EmailTemplates/de/NewsLetterSubscription.ActivationMessage.xml b/...on/SmartStore.Web/App_Data/EmailTemplates/de/NewsLetterSubscription.ActivationMessage.xml
@@ -14,7 +14,7 @@
   um Ihre Newsletter-Anmeldung zu bestätigen, klicken Sie bitte auf den folgenden Link:
 </p>
 
-<p class="text-center m-t-4 m-b-4">
+<p class="text-center mt-4 mb-4">
   <a class="btn btn-success" href="{{ NewsLetterSubscription.ActivationUrl }}">Anmeldung bestätigen</a>
 </p>
 

diff --git a/.../SmartStore.Web/App_Data/EmailTemplates/de/NewsLetterSubscription.DeactivationMessage.xml b/.../SmartStore.Web/App_Data/EmailTemplates/de/NewsLetterSubscription.DeactivationMessage.xml
@@ -14,7 +14,7 @@
   um sich von unserem Newsletter abzumelden, klicken Sie bitte auf den folgenden Link:
 </p>
 
-<p class="text-center m-t-4 m-b-4">
+<p class="text-center mt-4 mb-4">
   <a class="btn btn-danger" href="{{ NewsLetterSubscription.DeactivationUrl }}">Abmeldung bestätigen</a>
 </p>
 

diff --git a/...ntation/SmartStore.Web/App_Data/EmailTemplates/de/OrderCancelled.CustomerNotification.xml b/...ntation/SmartStore.Web/App_Data/EmailTemplates/de/OrderCancelled.CustomerNotification.xml
@@ -13,7 +13,7 @@
   wir haben Ihre Bestellung mit der Nummer <b>{{ Order.OrderNumber }}</b> storniert.
 </p>
 
-<table class="w-100 m-b-3">
+<table class="w-100 mb-3">
   <thead>
   	<tr>
     	<th class="text-muted text-sm">Bestellt am</th>
@@ -33,12 +33,12 @@
 </table>
 
 {% if Order.Url %}
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
   <a class="btn btn-warning" href="{{ Order.Url }}">Details aufrufen</a>
 </p>
 {% endif %}
 
-<table class="w-100 brd m-b-4">
+<table class="w-100 brd mb-4">
   <tbody>
   	<tr>
     	<td class="p-2">
@@ -50,7 +50,7 @@
                 <h3>Rechnungsanschrift</h3>
               	{% include 'address' with Order.Billing %}
                 {% if Order.PaymentMethod %}
-                	<h3 class="m-t-2">Zahlart</h3>
+                	<h3 class="mt-2">Zahlart</h3>
                 	<div class="text-sm">{{ Order.PaymentMethod }}</div>
                 {% endif %}
               </td>
@@ -62,7 +62,7 @@
                 	<p class="text-muted text-sm">Wie Rechnungsanschrift</p>
                 {% endif %} 
                 {% if Order.ShippingMethod %}
-                	<h3 class="m-t-2">Versandart</h3>
+                	<h3 class="mt-2">Versandart</h3>
                 	<div class="text-sm">{{ Order.ShippingMethod }} </div>    	
                 {% endif %}
               </td>

diff --git a/...ntation/SmartStore.Web/App_Data/EmailTemplates/de/OrderCompleted.CustomerNotification.xml b/...ntation/SmartStore.Web/App_Data/EmailTemplates/de/OrderCompleted.CustomerNotification.xml
@@ -13,7 +13,7 @@
   wir haben Ihre Bestellung mit der Nummer <b>{{ Order.OrderNumber }}</b> erfolgreich bearbeitet. Details finden Sie unten.
 </p>
 
-<table class="w-100 m-b-3">
+<table class="w-100 mb-3">
   <thead>
   	<tr>
     	<th class="text-muted text-sm">Bestellt am</th>
@@ -33,12 +33,12 @@
 </table>
 
 {% if Order.Url %}
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
   <a class="btn btn-success" href="{{ Order.Url }}">Details aufrufen</a>
 </p>
 {% endif %}
 
-<table class="w-100 brd m-b-4">
+<table class="w-100 brd mb-4">
   <tbody>
   	<tr>
     	<td class="p-2">
@@ -50,7 +50,7 @@
                 <h3>Rechnungsanschrift</h3>
               	{% include 'address' with Order.Billing %}
                 {% if Order.PaymentMethod %}
-                	<h3 class="m-t-2">Zahlart</h3>
+                	<h3 class="mt-2">Zahlart</h3>
                 	<div class="text-sm">{{ Order.PaymentMethod }}</div>
                 {% endif %}
               </td>
@@ -62,7 +62,7 @@
                 	<p class="text-muted text-sm">Wie Rechnungsanschrift</p>
                 {% endif %} 
                 {% if Order.ShippingMethod %}
-                	<h3 class="m-t-2">Versandart</h3>
+                	<h3 class="mt-2">Versandart</h3>
                 	<div class="text-sm">{{ Order.ShippingMethod }} </div>    	
                 {% endif %}
               </td>

diff --git a/...esentation/SmartStore.Web/App_Data/EmailTemplates/de/OrderPlaced.CustomerNotification.xml b/...esentation/SmartStore.Web/App_Data/EmailTemplates/de/OrderPlaced.CustomerNotification.xml
@@ -13,7 +13,7 @@
   herzlichen Dank für Ihre Bestellung bei <a href="{{ Store.URL }}">{{ Store.Name }}</a>, deren Erhalt wir hiermit bestätigen. Eine Übersicht über Ihre Bestellung finden Sie unten.
 </p>
 
-<table class="w-100 m-b-3">
+<table class="w-100 mb-3">
   <thead>
   	<tr>
     	<th class="text-muted text-sm">Bestellt am</th>
@@ -32,7 +32,7 @@
   </tbody>
 </table>
 
-<table class="w-100 brd m-b-4">
+<table class="w-100 brd mb-4">
   <tbody>
   	<tr>
     	<td class="p-2">
@@ -44,7 +44,7 @@
                 <h3>Rechnungsanschrift</h3>
               	{% include 'address' with Order.Billing %}
                 {% if Order.PaymentMethod %}
-                	<h3 class="m-t-2">Zahlart</h3>
+                	<h3 class="mt-2">Zahlart</h3>
                 	<div class="text-sm">{{ Order.PaymentMethod }}</div>
                 {% endif %}
               </td>
@@ -56,7 +56,7 @@
                 	<p class="text-muted text-sm">Wie Rechnungsanschrift</p>
                 {% endif %} 
                 {% if Order.ShippingMethod %}
-                	<h3 class="m-t-2">Versandart</h3>
+                	<h3 class="mt-2">Versandart</h3>
                 	<div class="text-sm">{{ Order.ShippingMethod }} </div>    	
                 {% endif %}
               </td>
@@ -71,21 +71,21 @@
 
 {% include 'order' %}
 
-<table id="conditions-of-use" class="m-t-5 m-b-4">
+<table id="conditions-of-use" class="mt-5 mb-4">
   <tr>
   	<td class="text-sm text-muted-all">
-      <h2 class="m-b-3">{{ Order.ConditionsOfUse.Title }} </h2>
+      <h2 class="mb-3">{{ Order.ConditionsOfUse.Title }} </h2>
     	{{ Order.ConditionsOfUse.Body }}
     </td>
   </tr>
 </table>
 
 <hr />
 
-<table id="disclaimer" class="m-t-4">
+<table id="disclaimer" class="mt-4">
   <tr>
   	<td class="text-sm text-muted-all">
-      <h2 class="m-b-3">{{ Order.Disclaimer.Title }} </h2>
+      <h2 class="mb-3">{{ Order.Disclaimer.Title }} </h2>
     	{{ Order.Disclaimer.Body }}
     </td>
   </tr>

diff --git a/...entation/SmartStore.Web/App_Data/EmailTemplates/de/OrderPlaced.StoreOwnerNotification.xml b/...entation/SmartStore.Web/App_Data/EmailTemplates/de/OrderPlaced.StoreOwnerNotification.xml
@@ -11,7 +11,7 @@
   Neue Bestellung eingegangen,
 </h1>
 
-<table class="w-100 m-b-3">
+<table class="w-100 mb-3">
   <thead>
   	<tr>
     	<th class="text-muted text-sm">Bestellt am</th>
@@ -30,7 +30,7 @@
   </tbody>
 </table>
 
-<table class="w-100 brd m-b-4">
+<table class="w-100 brd mb-4">
   <tbody>
   	<tr>
     	<td class="p-2">
@@ -42,7 +42,7 @@
                 <h3>Rechnungsanschrift</h3>
               	{% include 'address' with Order.Billing %}
                 {% if Order.PaymentMethod %}
-                	<h3 class="m-t-2">Zahlart</h3>
+                	<h3 class="mt-2">Zahlart</h3>
                 	<div class="text-sm">{{ Order.PaymentMethod }}</div>
                 {% endif %}
               </td>
@@ -54,7 +54,7 @@
                 	<p class="text-muted text-sm">Wie Rechnungsanschrift</p>
                 {% endif %} 
                 {% if Order.ShippingMethod %}
-                	<h3 class="m-t-2">Versandart</h3>
+                	<h3 class="mt-2">Versandart</h3>
                 	<div class="text-sm">{{ Order.ShippingMethod }} </div>  
                 {% endif %}
               </td>

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Product.AskQuestion.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Product.AskQuestion.xml
@@ -43,7 +43,7 @@
 </table>
 
 {% if Customer.IsRegistered %}
-  <p class="m-t-4 m-b-4 text-center">
+  <p class="mt-4 mb-4 text-center">
     <a class="btn btn-primary" href="{{ Customer.Url }}">Zum Kundenprofil</a>
   </p>
 {% endif %}

diff --git a/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Product.ProductReview.xml b/src/Presentation/SmartStore.Web/App_Data/EmailTemplates/de/Product.ProductReview.xml
@@ -38,7 +38,7 @@
   </p>
 {% endif %}
 
-<p class="m-t-4 m-b-4">
+<p class="mt-4 mb-4">
   <a href="{{ Product.Url }}" class="btn btn-primary">Zum Produkt</a>
 </p>
 

diff --git a/...Store.Web/App_Data/EmailTemplates/de/RecurringPaymentCancelled.StoreOwnerNotification.xml b/...Store.Web/App_Data/EmailTemplates/de/RecurringPaymentCancelled.StoreOwnerNotification.xml
@@ -14,7 +14,7 @@
   <b>{{ Customer.FullName }}</b> hat ein Zahlungs-Abo storniert.
 </p>
 
-<p class="m-t-4 m-b-4 text-center">
+<p class="mt-4 mb-4 text-center">
   <a class="btn btn-primary" href="{{ RecurringPayment.Url }}">Abo aufrufen</a>
 </p>