Changeset 1807

Timestamp:

02/11/07 13:17:41 (6 years ago)

Author:

rub

Message:

Issue 0000598: NBM: Add new informations

VDigital structure applied!

Location:

trunk

Files:

• include/functions_mail.inc.php (modified) (1 diff)
• template-common (modified) (1 prop)
• template/yoga/mail/text/html/global-mail-css.tpl (moved) (moved from trunk/template/yoga/mail/text/html/default-layout-mail-css.tpl) (1 diff)
• template/yoga/mail/text/html/header.tpl (modified) (1 diff)
• template/yoga/theme/clear/mail-css.tpl (moved) (moved from trunk/template/yoga/theme/clear/layout-mail-css.tpl) (1 diff)
• template/yoga/theme/dark/mail-css.tpl (moved) (moved from trunk/template/yoga/theme/dark/layout-mail-css.tpl) (1 diff)
• template/yoga/theme/p0w0/mail-css.tpl (moved) (moved from trunk/template/yoga/theme/p0w0/layout-mail-css.tpl) (1 diff)
• template/yoga/theme/wipi/mail-css.tpl (moved) (moved from trunk/template/yoga/theme/wipi/layout-mail-css.tpl) (1 diff)

trunk/include/functions_mail.inc.php

@@ -209 +209 @@
     if ($email_format == 'text/html')
     {
-      if (is_file($mail_template->root.'/default-layout-mail-css.tpl'))
+      $old_root = $mail_template->root;
+
+      if (is_file($mail_template->root.'/global-mail-css.tpl'))
       {
-        $mail_template->set_filename('mail_css_default_template', 'default-layout-mail-css.tpl');
-        $mail_template->assign_var_from_handle('MAIL_CSS_DEFAULT_TEMPLATE', 'mail_css_default_template');
+        $mail_template->set_filename('global_mail_css', 'global-mail-css.tpl');
+        $mail_template->assign_var_from_handle('GLOBAL_MAIL_CSS', 'global_mail_css');
       }
 
-      $old_root = $mail_template->root;
-
       $mail_template->root = PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/'.$user['theme'];
-      if (is_file($mail_template->root.'/layout-mail-css.tpl'))
+      if (is_file($mail_template->root.'/mail-css.tpl'))
       {
-        $mail_template->set_filename('mail_css_theme', 'layout-mail-css.tpl');
-        $mail_template->assign_var_from_handle('MAIL_CSS_THEME', 'mail_css_theme');
+        $mail_template->set_filename('mail_css', 'mail-css.tpl');
+        $mail_template->assign_var_from_handle('MAIL_CSS', 'mail_css');
       }
 
       $mail_template->root = PHPWG_ROOT_PATH.'template-common';
-      if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
+      if (is_file($mail_template->root.'/local-mail-css.tpl'))
       {
-        $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
-        $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_COMMON', 'mail_css_local_template');
+        $mail_template->set_filename('local_mail_css', 'local-mail-css.tpl');
+        $mail_template->assign_var_from_handle('LOCAL_MAIL_CSS', 'local_mail_css');
       }
 
       $mail_template->root = $old_root;
-      if (is_file($mail_template->root.'/local-layout-mail-css.tpl'))
-      {
-        $mail_template->set_filename('mail_css_local_template', 'local-layout-mail-css.tpl');
-        $mail_template->assign_var_from_handle('MAIL_CSS_LOCAL_TEMPLATE', 'mail_css_local_template');
-      }
     }
 

trunk/template-common

@@ -3 +3 @@
 local-layout.css
 local-layout-mail-css.tpl
+local-mail-css.tpl

@@ -3 +3 @@
 local-layout.css
 local-layout-mail-css.tpl
+local-mail-css.tpl

trunk/template/yoga/mail/text/html/global-mail-css.tpl

@@ -1 +1 @@
 /* $Id$ */
+/* Global mail css */
 /* Including like css style on HTML mail */
 

trunk/template/yoga/mail/text/html/header.tpl

@@ -6 +6 @@
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
 <style><!-- /* Mini style for mails */
-{MAIL_CSS_DEFAULT_TEMPLATE}
-{MAIL_CSS_THEME}
-{MAIL_CSS_LOCAL_TEMPLATE}
-{MAIL_CSS_LOCAL_COMMON}
+{GLOBAL_MAIL_CSS}
+{MAIL_CSS}
+{LOCAL_MAIL_CSS}
 --></style>
 </head>

trunk/template/yoga/theme/clear/mail-css.tpl

@@ -1 +1 @@
 /* $Id$ */
+/* Theme mail css */
 /* Including like css style on HTML mail */
 

trunk/template/yoga/theme/dark/mail-css.tpl

@@ -1 +1 @@
 /* $Id$ */
+/* Theme mail css */
 /* Including like css style on HTML mail */
 

trunk/template/yoga/theme/p0w0/mail-css.tpl

@@ -1 +1 @@
 /* $Id$ */
+/* Theme mail css */
 /* Including like css style on HTML mail */
 

trunk/template/yoga/theme/wipi/mail-css.tpl

@@ -1 +1 @@
 /* $Id$ */
+/* Theme mail css */
 /* Including like css style on HTML mail */
 

@@ -3 +3 @@
 local-layout.css
 local-layout-mail-css.tpl
+local-mail-css.tpl