diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/notification_by_mail.php | 1 | ||||
| -rw-r--r-- | include/functions_mail.inc.php | 12 | ||||
| -rw-r--r-- | themes/Sylvia/mail-css.tpl | 4 | ||||
| -rw-r--r-- | themes/clear/mail-css.tpl | 6 | ||||
| -rw-r--r-- | themes/dark/mail-css.tpl | 8 | ||||
| -rw-r--r-- | themes/default/images/index.php (renamed from themes/default/mail/index.php) | 0 | ||||
| -rw-r--r-- | themes/default/images/mail/footer-bg.png (renamed from themes/default/mail/text/html/images/footer-bg.png) | bin | 15656 -> 15656 bytes | |||
| -rw-r--r-- | themes/default/images/mail/header-bg.png (renamed from themes/default/mail/text/html/images/header-bg.png) | bin | 30525 -> 30525 bytes | |||
| -rw-r--r-- | themes/default/images/mail/index.php (renamed from themes/default/mail/text/html/images/index.php) | 0 | ||||
| -rw-r--r-- | themes/default/images/mail/mailbody-bg.png (renamed from themes/default/mail/text/html/images/mailbody-bg.png) | bin | 924 -> 924 bytes | |||
| -rw-r--r-- | themes/default/mail/text/html/images/footer-bg.jpg | bin | 9014 -> 0 bytes | |||
| -rw-r--r-- | themes/default/mail/text/html/index.php | 30 | ||||
| -rw-r--r-- | themes/default/mail/text/index.php | 30 | ||||
| -rw-r--r-- | themes/default/mail/text/plain/index.php | 30 | ||||
| -rw-r--r-- | themes/default/template/mail/text/html/header.tpl | 1 | ||||
| -rw-r--r-- | themes/p0w0/mail-css.tpl | 8 | ||||
| -rw-r--r-- | themes/wipi/mail-css.tpl | 8 |
17 files changed, 18 insertions, 120 deletions
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index eee0f30c5..f3867e685 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -396,7 +396,6 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l 'email_format' => $env_nbm['email_format'], 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true), 'content_format' => $env_nbm['email_format'], - 'template' => $nbm_user['template'], 'theme' => $nbm_user['theme'] ) )) diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index b55d55366..d340e9781 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -654,13 +654,11 @@ function pwg_mail($to, $args = array()) if ($content_type == 'text/html') { - /* - if (is_file($conf_mail[$cache_key]['theme']->get_template_dir().'/global-mail-css.tpl')) + if ($conf_mail[$cache_key]['theme']->smarty->template_exists('global-mail-css.tpl')) { $conf_mail[$cache_key]['theme']->set_filename('css', 'global-mail-css.tpl'); $conf_mail[$cache_key]['theme']->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css'); } - */ $file = PHPWG_ROOT_PATH.'themes/'.$args['theme'].'/mail-css.tpl'; if (is_file($file)) @@ -668,14 +666,6 @@ function pwg_mail($to, $args = array()) $conf_mail[$cache_key]['theme']->set_filename('css', realpath($file)); $conf_mail[$cache_key]['theme']->assign_var_from_handle('MAIL_CSS', 'css'); } - /* - $file = $root_abs_path.'/template-common/local-mail-css.tpl'; - if (is_file($file)) - { - $conf_mail[$cache_key]['template']->set_filename('css', $file); - $conf_mail[$cache_key]['template']->assign_var_from_handle('LOCAL_MAIL_CSS', 'css'); - } - */ } // what are displayed on the header of each mail ? diff --git a/themes/Sylvia/mail-css.tpl b/themes/Sylvia/mail-css.tpl index df0f7067f..66d51cac1 100644 --- a/themes/Sylvia/mail-css.tpl +++ b/themes/Sylvia/mail-css.tpl @@ -3,9 +3,9 @@ body {ldelim} background-color:#111; color:#666;} #the_page {ldelim} } #content {ldelim} } -#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom; +#copyright {ldelim} background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/bottom-left-bg.jpg) no-repeat scroll left bottom; min-height: 220px; height: 220px; width: 100%; min-width: 100%; padding: 10px 100px 30px 100px; } -h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;} +h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;} img {ldelim} margin: 16px; border: 16px solid #444; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} padding: 15px; border: 0; background-color:#222;-moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #f70; background-color: transparent; border:0; text-decoration: none;} diff --git a/themes/clear/mail-css.tpl b/themes/clear/mail-css.tpl index 298926540..6c5e149cd 100644 --- a/themes/clear/mail-css.tpl +++ b/themes/clear/mail-css.tpl @@ -1,9 +1,9 @@ /* Theme clear mail css */ body {ldelim} background-color:#fff; color:#696969;} -#the_page {ldelim} background: #fff url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y 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;} -#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; +#the_page {ldelim} background: #fff url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;} +#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;} +#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom; color: #333;} h2 {ldelim} background-color: #ddd;} img {ldelim} margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; } diff --git a/themes/dark/mail-css.tpl b/themes/dark/mail-css.tpl index 26b51578b..e904a248d 100644 --- a/themes/dark/mail-css.tpl +++ b/themes/dark/mail-css.tpl @@ -1,11 +1,11 @@ /* Theme dark mail css */ body {ldelim} background-color:#444; color:#fff;} -#the_page {ldelim} background: #444 url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y 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;} -#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; +#the_page {ldelim} background: #444 url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;} +#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;} +#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);} +h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}themes/{$themeconf.theme}/images/tableh1_bg.png);} img {ldelim} margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; } diff --git a/themes/default/mail/index.php b/themes/default/images/index.php index 871b52b6a..871b52b6a 100644 --- a/themes/default/mail/index.php +++ b/themes/default/images/index.php diff --git a/themes/default/mail/text/html/images/footer-bg.png b/themes/default/images/mail/footer-bg.png Binary files differindex fd3c2925f..fd3c2925f 100644 --- a/themes/default/mail/text/html/images/footer-bg.png +++ b/themes/default/images/mail/footer-bg.png diff --git a/themes/default/mail/text/html/images/header-bg.png b/themes/default/images/mail/header-bg.png Binary files differindex 1770a3ddc..1770a3ddc 100644 --- a/themes/default/mail/text/html/images/header-bg.png +++ b/themes/default/images/mail/header-bg.png diff --git a/themes/default/mail/text/html/images/index.php b/themes/default/images/mail/index.php index 871b52b6a..871b52b6a 100644 --- a/themes/default/mail/text/html/images/index.php +++ b/themes/default/images/mail/index.php diff --git a/themes/default/mail/text/html/images/mailbody-bg.png b/themes/default/images/mail/mailbody-bg.png Binary files differindex 722a24f63..722a24f63 100644 --- a/themes/default/mail/text/html/images/mailbody-bg.png +++ b/themes/default/images/mail/mailbody-bg.png diff --git a/themes/default/mail/text/html/images/footer-bg.jpg b/themes/default/mail/text/html/images/footer-bg.jpg Binary files differdeleted file mode 100644 index 3d8a5eed2..000000000 --- a/themes/default/mail/text/html/images/footer-bg.jpg +++ /dev/null diff --git a/themes/default/mail/text/html/index.php b/themes/default/mail/text/html/index.php deleted file mode 100644 index 871b52b6a..000000000 --- a/themes/default/mail/text/html/index.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based picture gallery | -// +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | -// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | -// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -// Recursive call -$url = '../'; -header( 'Request-URI: '.$url ); -header( 'Content-Location: '.$url ); -header( 'Location: '.$url ); -exit(); -?> diff --git a/themes/default/mail/text/index.php b/themes/default/mail/text/index.php deleted file mode 100644 index 871b52b6a..000000000 --- a/themes/default/mail/text/index.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based picture gallery | -// +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | -// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | -// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -// Recursive call -$url = '../'; -header( 'Request-URI: '.$url ); -header( 'Content-Location: '.$url ); -header( 'Location: '.$url ); -exit(); -?> diff --git a/themes/default/mail/text/plain/index.php b/themes/default/mail/text/plain/index.php deleted file mode 100644 index 871b52b6a..000000000 --- a/themes/default/mail/text/plain/index.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based picture gallery | -// +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | -// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | -// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -// Recursive call -$url = '../'; -header( 'Request-URI: '.$url ); -header( 'Content-Location: '.$url ); -header( 'Location: '.$url ); -exit(); -?> diff --git a/themes/default/template/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl index 9ab46693c..e6af4c024 100644 --- a/themes/default/template/mail/text/html/header.tpl +++ b/themes/default/template/mail/text/html/header.tpl @@ -10,7 +10,6 @@ Content-Transfer-Encoding: 8bit <style><!-- /* Mini style for mails */ {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/themes/p0w0/mail-css.tpl b/themes/p0w0/mail-css.tpl index be4e4c22e..72d655ffa 100644 --- a/themes/p0w0/mail-css.tpl +++ b/themes/p0w0/mail-css.tpl @@ -1,11 +1,11 @@ /* Theme p0w0 mail css */ body {ldelim} background-color:#cde; color:#369;} -#the_page {ldelim} background: #cde url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y 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;} -#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; +#the_page {ldelim} background: #cde url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;} +#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;} +#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/button-bg.png);} +h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}themes/{$themeconf.theme}/images/button-bg.png);} img {ldelim} margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; } img:hover {ldelim} border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; } a {ldelim} color: #f92; background: transparent; } diff --git a/themes/wipi/mail-css.tpl b/themes/wipi/mail-css.tpl index a8da286b3..6cbbede86 100644 --- a/themes/wipi/mail-css.tpl +++ b/themes/wipi/mail-css.tpl @@ -1,11 +1,11 @@ /* Theme wipi mail css */ body {ldelim} background-color:#111; color:#69c;} -#the_page {ldelim} background: #111 url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y 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;} -#copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom; +#the_page {ldelim} background: #111 url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;} +#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;} +#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom; color: #69c;} -h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);} +h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}themes/{$themeconf.theme}/images/tableh1_bg.png);} img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; } img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; } a {ldelim} color: #69c; background: transparent; } |
