Browse Source

Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

Yannick Warnier 9 years ago
parent
commit
4282a29a2f

+ 11 - 13
main/template/default/mail/content_registration_platform.tpl

@@ -1,13 +1,11 @@
-{{ 'Dear'|get_lang }} {{ complete_name }},
-</br>
-{{ 'YouAreReg'|get_lang }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|get_lang }}</br>
-{{ 'Username'|get_lang }} : {{ login_name }}
-{{ 'Pass'|get_lang }} : {{ original_password }}
-</br></br>
-{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ mailWebPath }}</br>
-{{ 'Problem'|get_lang }}</br>
-{{ 'SignatureFormula'|get_lang }}</br>
-{{ _admin.name }}, {{ _admin.surname }}
-{{ 'Manager'|get_lang }} {{ _s.site_name }}
-{{ _admin.telephone ? 'T. ' ~ _admin.telephone ~ '<br>' }}
-{{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }}
+<p>{{ 'Dear'|get_lang }} {{ complete_name }},</p>
+<p>{{ 'YouAreReg'|get_lang }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|get_lang }}</p>
+<p>{{ 'Username'|get_lang }} : {{ login_name }}<br>
+    {{ 'Pass'|get_lang }} : {{ original_password }}</p>
+<p>{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ mailWebPath }}</p>
+<p>{{ 'Problem'|get_lang }}</p>
+<p>{{ 'SignatureFormula'|get_lang }}</p>
+<p>{{ _admin.name }}, {{ _admin.surname }}<br>
+    {{ 'Manager'|get_lang }} {{ _s.site_name }}<br>
+    {{ _admin.telephone ? 'T. ' ~ _admin.telephone }}<br>
+    {{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }}</p>

+ 9 - 12
main/template/default/mail/content_subscription_to_session_confirmation.tpl

@@ -1,12 +1,9 @@
-{{ 'Dear'|get_lang }} {{ complete_name }},
-</br>
-{{ 'YouAreRegisterToSessionX'|get_lang|format(session_name) }}
-</br>
-{{ 'Address'|get_lang }}  {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}
-</br>
-{{ 'Problem'|get_lang }}</br>
-{{ 'SignatureFormula'|get_lang }}</br>
-{{ _admin.name }} {{ _admin.surname }}
-{{ 'Manager'|get_lang }} {{ _s.site_name }}
-{{ _admin.telephone ? 'T. ' ~ _admin.telephone ~ '<br>' }}
-{{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }}
+<p>{{ 'Dear'|get_lang }} {{ complete_name }},</p>
+<p>{{ 'YouAreRegisterToSessionX'|get_lang|format(session_name) }}</p>
+<p>{{ 'Address'|get_lang }}  {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}</p>
+<p>{{ 'Problem'|get_lang }}</p>
+<p>{{ 'SignatureFormula'|get_lang }}</p>
+<p>{{ _admin.name }} {{ _admin.surname }}<br>
+    {{ 'Manager'|get_lang }} {{ _s.site_name }}<br>
+    {{ _admin.telephone ? 'T. ' ~ _admin.telephone }}<br>
+    {{ _admin.email ? 'Email'|get_lang ~ ': ' ~ _admin.email }}</p>

+ 1 - 1
main/template/default/mail/cron_course_finished_body.tpl

@@ -1 +1 @@
-{{ 'MailCronCourseFinishedBody'|get_lang|format(complete_user_name, session_name, session_name, _s.site_name) }}
+<p>{{ 'MailCronCourseFinishedBody'|get_lang|format(complete_user_name, session_name, session_name, _s.site_name) }}</p>

+ 1 - 1
main/template/default/mail/cron_remind_course_expiration_body.tpl

@@ -1 +1 @@
-{{ 'MailCronCourseExpirationReminderBody'|get_lang|format(complete_user_name, session_name, session_access_end_date, remaining_days, _p.web, _s.institution) }}
+<p>{{ 'MailCronCourseExpirationReminderBody'|get_lang|format(complete_user_name, session_name, session_access_end_date, remaining_days, _p.web, _s.institution) }}</p>