From 7a81759fb0121c8bebd3764ecd3a4f2d1e190f85 Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 13 Mar 2010 01:19:57 +0000 Subject: [PATCH] Feature 1502 Move mail images. Change image path in mail-css files. Remove local css file for NBM. git-svn-id: http://piwigo.org/svn/trunk@5125 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/notification_by_mail.php | 1 - include/functions_mail.inc.php | 12 +------ themes/Sylvia/mail-css.tpl | 4 +-- themes/clear/mail-css.tpl | 6 ++-- themes/dark/mail-css.tpl | 8 ++--- themes/default/{mail => images}/index.php | 0 .../html/images => images/mail}/footer-bg.png | Bin .../html/images => images/mail}/header-bg.png | Bin .../html/images => images/mail}/index.php | 0 .../images => images/mail}/mailbody-bg.png | Bin .../mail/text/html/images/footer-bg.jpg | Bin 9014 -> 0 bytes themes/default/mail/text/html/index.php | 30 ------------------ themes/default/mail/text/index.php | 30 ------------------ themes/default/mail/text/plain/index.php | 30 ------------------ .../template/mail/text/html/header.tpl | 1 - themes/p0w0/mail-css.tpl | 8 ++--- themes/wipi/mail-css.tpl | 8 ++--- 17 files changed, 18 insertions(+), 120 deletions(-) rename themes/default/{mail => images}/index.php (100%) rename themes/default/{mail/text/html/images => images/mail}/footer-bg.png (100%) rename themes/default/{mail/text/html/images => images/mail}/header-bg.png (100%) rename themes/default/{mail/text/html/images => images/mail}/index.php (100%) rename themes/default/{mail/text/html/images => images/mail}/mailbody-bg.png (100%) delete mode 100644 themes/default/mail/text/html/images/footer-bg.jpg delete mode 100644 themes/default/mail/text/html/index.php delete mode 100644 themes/default/mail/text/index.php delete mode 100644 themes/default/mail/text/plain/index.php 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 similarity index 100% rename from themes/default/mail/index.php rename to 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 similarity index 100% rename from themes/default/mail/text/html/images/footer-bg.png rename to 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 similarity index 100% rename from themes/default/mail/text/html/images/header-bg.png rename to 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 similarity index 100% rename from themes/default/mail/text/html/images/index.php rename to 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 similarity index 100% rename from themes/default/mail/text/html/images/mailbody-bg.png rename to 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 deleted file mode 100644 index 3d8a5eed2d2b1b93ee2252c4fcf333834bbbec21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9014 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 uc`1{l_pE6_M}quVG<*mD>=g~sc 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 @@ - 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 @@ - 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 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; }