- changes to template to accomodate nbm (solved issue when we had same template filename with different root dirs)

- started some changes in mail templates

git-svn-id: http://piwigo.org/svn/trunk@2278 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 59 insertions, 61 deletions

diff --git a/template/yoga/mail/text/html/admin/cat_group_info.tpl b/template/yoga/mail/text/html/admin/cat_group_info.tpl
index 8d744746c..2c8c45d6a 100644
--- a/template/yoga/mail/text/html/admin/cat_group_info.tpl
+++ b/template/yoga/mail/text/html/admin/cat_group_info.tpl
@@ -1,9 +1,9 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="cat_group_info">
-<h2>{lang:Informations}</h2>
-<p>{IMG_URL}</p>
-<p>{lang:Hello,}</p>
-<p>{lang:Come to discover the category:} <a href="{LINK}">{CAT_NAME}</a></p>
-<p>{CPL_CONTENT}</p>
-<p>{lang:See you soon.}</p>
+<h2>{'Informations'|@translate}</h2>
+<p>{$IMG_URL}</p>
+<p>{'Hello,'|@translate}</p>
+<p>{'Come to discover the category:'|@translate} <a href="{$LINK}">{$CAT_NAME}</a></p>
+<p>{$CPL_CONTENT}</p>
+<p>{'See you soon.'|@translate}</p>
 </div>
diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl
index 50b661486..0b627bc00 100644
--- a/template/yoga/mail/text/html/footer.tpl
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -1,17 +1,17 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 </div> <!-- content -->
 <div id="copyright">
-<HR>
- <!-- Please, do not remove this copyright. If you really want to,
+<hr/>
+ {* Please, do not remove this copyright. If you really want to,
       contact us on http://phpwebgallery.net to find a solution on how
-      to show the origin of the script...-->
+      to show the origin of the script...*}
 
-  {lang:powered_by} 
+  {'powered_by'|@translate}
   <a href="http://www.phpwebgallery.net" class="PWG">
   <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
-  {VERSION}
-  - {lang:send_mail}
-  <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
+  {$VERSION}
+  - {'send_mail'|@translate}
+  <a href="mailto:{$MAIL}?subject={$TITLE_MAIL}">{'Webmaster'|@translate}</a>
 
 </div> <!-- copyright -->
 </div> <!-- the_page -->
diff --git a/template/yoga/mail/text/html/global-mail-css.tpl b/template/yoga/mail/text/html/global-mail-css.tpl
index f3c59f1e5..c47505e66 100644
--- a/template/yoga/mail/text/html/global-mail-css.tpl
+++ b/template/yoga/mail/text/html/global-mail-css.tpl
@@ -1,19 +1,18 @@
-<!-- DEV TAG: not smarty migrated -->
-/* $Id$ */
+{* $Id$ *}
 /* Global mail css */
 /* Including like css style on HTML mail */
 
-body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
-#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;
+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 {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;
+#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 {width:632px;margin-left:0px;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+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 {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
-h2 { background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}
-img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
-a { color: #005e89; background: transparent; }
-a:hover { color: #858460; text-decoration: none;}
+.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;}
diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
index 63ccbe327..598e25c62 100644
--- a/template/yoga/mail/text/html/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
@@ -1,17 +1,17 @@
-<!-- DEV TAG: not smarty migrated -->
------={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
+{* $Id$ *}
+-----={$BOUNDARY_KEY}
+Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}";
 Content-Transfer-Encoding: 8bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{LANG}" dir="{DIR}">
+<html lang="{$LANG}" dir="{$DIR}">
 <head>
 <title>PhpWebGallery Mail</title>
-<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
+<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
 <style><!-- /* Mini style for mails */
-{GLOBAL_MAIL_CSS}
-{MAIL_CSS}
-{LOCAL_MAIL_CSS}
+{if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if}
+{if isset($MAIL_CSS)}{$MAIL_CSS}{/if}
+{if isset($LOCAL_MAIL_CSS)}{$LOCAL_MAIL_CSS}{/if}
 --></style>
 </head>
 <body>
diff --git a/template/yoga/mail/text/plain/admin/cat_group_info.tpl b/template/yoga/mail/text/plain/admin/cat_group_info.tpl
index c6df0aac9..d91c0ebcc 100644
--- a/template/yoga/mail/text/plain/admin/cat_group_info.tpl
+++ b/template/yoga/mail/text/plain/admin/cat_group_info.tpl
@@ -1,9 +1,9 @@
-<!-- DEV TAG: not smarty migrated -->
-{lang:Hello,}
+{* $Id$ *}
+{'Hello,'|@translate}
 
-{lang:Come to discover the category:} {CAT_NAME}
-{LINK}
+{'Come to discover the category:'|@translate} {$CAT_NAME}
+{$LINK}
 
-{CPL_CONTENT}
+{$CPL_CONTENT}
 
-{lang:See you soon.}
\ No newline at end of file
+{'See you soon.'|@translate}
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/yoga/mail/text/plain/footer.tpl
index b3e48bc30..cb740c96a 100644
--- a/template/yoga/mail/text/plain/footer.tpl
+++ b/template/yoga/mail/text/plain/footer.tpl
@@ -1,4 +1,4 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 
 ------------------------
-PhpWebGallery {VERSION}
+PhpWebGallery {$VERSION}
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/yoga/mail/text/plain/header.tpl
index 2b710b439..7471010c9 100644
--- a/template/yoga/mail/text/plain/header.tpl
+++ b/template/yoga/mail/text/plain/header.tpl
@@ -1,4 +1,4 @@
-<!-- DEV TAG: not smarty migrated -->
------={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
+{* $Id$ *}
+-----={$BOUNDARY_KEY}
+Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}";
 Content-Transfer-Encoding: 8bit
diff --git a/template/yoga/nbm.tpl b/template/yoga/nbm.tpl
index 68643f4fb..b8d174839 100644
--- a/template/yoga/nbm.tpl
+++ b/template/yoga/nbm.tpl
@@ -1,32 +1,31 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 
 <div id="content">
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:nbm_item_notification}</h2>
+    <h2>{'nbm_item_notification'|@translate}</h2>
   </div>
 
-  <!-- BEGIN errors -->
+  {if not empty($errors)}
   <div class="errors">
     <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END errors -->
+  {/if}
 
-  <!-- BEGIN infos -->
+  {if not empty($infos)}
   <div class="infos">
     <ul>
-      <!-- BEGIN info -->
-      <li>{infos.info.INFO}</li>
-      <!-- END info -->
+      {foreach from=$infos item=info}
+      <li>{$info}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END infos -->
+  {/if}
 
 </div>