2 files changed, 57 insertions, 60 deletions
diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
index ea9fefbc5..52627ebe4 100644
--- a/template/yoga/mail/text/html/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
@@ -1,54 +1,57 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="nbm_message">
-<h2>{lang:Notification}</h2>
-<p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>
+<h2>{'Notification'|@translate}</h2>
+<p>{'nbm_content_hello_1'|@translate}{$USERNAME}{'nbm_content_hello_2'|@translate}</p>
 
-<!-- BEGIN subscribe_by_admin -->
-<p>{lang:nbm_content_subscribe_by_admin}</p>
-<!-- END subscribe_by_admin -->
-<!-- BEGIN subscribe_by_himself -->
-<p>{lang:nbm_content_subscribe_by_himself}</p>
-<!-- END subscribe_by_himself -->
-<!-- BEGIN unsubscribe_by_admin -->
-<p>{lang:nbm_content_unsubscribe_by_admin}</p>
-<!-- END unsubscribe_by_admin -->
-<!-- BEGIN unsubscribe_by_himself -->
-<p>{lang:nbm_content_unsubscribe_by_himself}</p>
-<!-- END unsubscribe_by_himself -->
-<!-- BEGIN content_new_elements_single -->
-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}</p>
-<!-- END content_new_elements_single -->
-<!-- BEGIN content_new_elements_between -->
-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}</p>
-<!-- END content_new_elements_between -->
-<!-- BEGIN global_new_line -->
+{if isset($subscribe_by_admin)}
+<p>{'nbm_content_subscribe_by_admin'|@translate}</p>
+{/if}
+{if isset($subscribe_by_himself)}
+<p>{'nbm_content_subscribe_by_himself'|@translate}</p>
+{/if}
+{if isset($unsubscribe_by_admin)}
+<p>{'nbm_content_unsubscribe_by_admin'|@translate}</p>
+{/if}
+{if isset($unsubscribe_by_himself)}
+<p>{'nbm_content_unsubscribe_by_himself'|@translate}</p>
+{/if}
+{if isset($content_new_elements_single)}
+<p>{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_single'|@translate}{$content_new_elements_single.DATE_SINGLE}.</p>
+{/if}
+{if isset($content_new_elements_between)}
+<p>{'nbm_content_new_elements'|@translate}{'nbm_content_new_elements_between_1'|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{'nbm_content_new_elements_between_2'|@translate}{$content_new_elements_between.DATE_BETWEEN_2}.</p>
+{/if}
+
+{if not empty($global_new_lines)}
 <ul id="nbm_new_line">
-  <!-- BEGIN new_line -->
-  <li>{global_new_line.new_line.DATA}</li>
-  <!-- END new_line -->
+{foreach from=$global_new_lines item=line}
+  <li>{$line}</li>
+{/foreach}
 </ul>
-<!-- END global_new_line -->
-<!-- BEGIN custom -->
-<p>{custom.CUSTOMIZE_MAIL_CONTENT}</p>
-<!-- END custom -->
-<!-- BEGIN goto -->
-<p>{lang:nbm_content_goto_1}<a href="{goto.GALLERY_URL}">{goto.GALLERY_TITLE}</a>{lang:nbm_content_goto_2}</p>
-<!-- END goto -->
-<p>{lang:nbm_content_byebye}</p>
-<p ALIGN=center>{SEND_AS_NAME}</p>
+{/if}
+
+{if not empty($custom_mail_content)}
+<p>{$custom_mail_content}</p>
+{/if}
+
+{if not empty($GOTO_GALLERY_TITLE)}
+<p>{'nbm_content_goto_1'|@translate}<a href="{$GOTO_GALLERY_URL}">{$GOTO_GALLERY_TITLE}</a>{'nbm_content_goto_2'|@translate}</p>
+{/if}
+<p>{'nbm_content_byebye'|@translate}</p>
+<p style="text-align:center">{$SEND_AS_NAME}</p>
 <p>
-<br/><hr>
-{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}<a href="{UNSUBSCRIBE_LINK}">{UNSUBSCRIBE_LINK}</a><br/>
-{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}<a href="{SUBSCRIBE_LINK}">{SUBSCRIBE_LINK}</a><br/>
-{lang:nbm_content_problem_contact}<a href="mailto:{CONTACT_EMAIL}?subject={lang:nbm_content_pb_contact_object}">{CONTACT_EMAIL}</a><br/>
-<hr><br/>
+<br/><hr/>
+{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br/>
+{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br/>
+{'nbm_content_problem_contact'|@translate}<a href="mailto:{$CONTACT_EMAIL}?subject={'nbm_content_pb_contact_object'|@translate}">{$CONTACT_EMAIL}</a><br/>
+<hr/><br/>
 </p>
-<!-- BEGIN recent_post -->
+{if not empty($recent_posts)}
 </div>
 <div id="nbm_recent_post">
-  <!-- BEGIN recent_post_block -->
-  <h2>{recent_post.recent_post_block.TITLE}</h2>
-  {recent_post.recent_post_block.HTML_DATA}
-  <!-- END recent_post_block -->
-<!-- END recent_post -->
+  {foreach from=$recent_posts item=recent_post }
+  <h2>{$recent_post.TITLE}</h2>
+  {$recent_post.HTML_DATA}
+  {/foreach}
+{/if}
 </div>
diff --git a/template/yoga/mail/text/html/global-mail-css.tpl b/template/yoga/mail/text/html/global-mail-css.tpl
index c47505e66..29b34f375 100644
--- a/template/yoga/mail/text/html/global-mail-css.tpl
+++ b/template/yoga/mail/text/html/global-mail-css.tpl
@@ -1,18 +1,12 @@
 {* $Id$ *}
 /* Global mail css */
-/* Including like css style on HTML mail */
 
-body {ldelim}background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
-#the_page {ldelim}background: #fff url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;
-margin:0px;padding:0px;text-align: left;}
-#content {ldelim}background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;
-margin:0px;padding:82px 0px 0px 62px; width:732px;}
-hr {ldelim}width:632px;margin-left:0px;}
-#copyright {ldelim}background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}
-.PWG {ldelim}font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
-h2 {ldelim}background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}
-img {ldelim}margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover {ldelim}padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
-a {ldelim}color: #005e89; background: transparent; }
-a:hover {ldelim}color: #858460; text-decoration: none;}
+body {ldelim} font-family: Univers, Helvetica, Optima; font-size:12px; margin:0px; padding:0px; }
+#the_page {ldelim} margin:0px; padding:0px; text-align:left;}
+#content {ldelim} margin:0px; padding:82px 0px 0px 62px; width:732px;}
+hr {ldelim} width:632px; margin-left:0;}
+#copyright {ldelim} font-size:10px; margin:0px; padding:48px 0px 32px 62px;}
+.PWG {ldelim} font-family:verdana, sans-serif !important; font-size:0.9em; font-weight:normal; letter-spacing:0px;}
+h2 {ldelim} padding:7px 15px; width:617px; font-weight:bold;}
+img {ldelim} margin:16px; border:16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover {ldelim} padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }