Changeset 5125


Ignore:
Timestamp:
Mar 13, 2010, 2:19:57 AM (11 years ago)
Author:
patdenice
Message:

Feature 1502
Move mail images.
Change image path in mail-css files.
Remove local css file for NBM.

Location:
trunk
Files:
3 added
1 deleted
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/admin/notification_by_mail.php

    r5036 r5125  
    397397                      'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
    398398                      'content_format' => $env_nbm['email_format'],
    399                       'template' => $nbm_user['template'],
    400399                      'theme' => $nbm_user['theme']
    401400                    )
  • trunk/include/functions_mail.inc.php

    r5123 r5125  
    655655      if ($content_type == 'text/html')
    656656      {
    657         /*
    658         if (is_file($conf_mail[$cache_key]['theme']->get_template_dir().'/global-mail-css.tpl'))
     657        if ($conf_mail[$cache_key]['theme']->smarty->template_exists('global-mail-css.tpl'))
    659658        {
    660659          $conf_mail[$cache_key]['theme']->set_filename('css', 'global-mail-css.tpl');
    661660          $conf_mail[$cache_key]['theme']->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css');
    662661        }
    663         */
    664662
    665663        $file = PHPWG_ROOT_PATH.'themes/'.$args['theme'].'/mail-css.tpl';
     
    669667          $conf_mail[$cache_key]['theme']->assign_var_from_handle('MAIL_CSS', 'css');
    670668        }
    671         /*
    672         $file = $root_abs_path.'/template-common/local-mail-css.tpl';
    673         if (is_file($file))
    674         {
    675           $conf_mail[$cache_key]['template']->set_filename('css', $file);
    676           $conf_mail[$cache_key]['template']->assign_var_from_handle('LOCAL_MAIL_CSS', 'css');
    677         }
    678         */
    679669      }
    680670
  • trunk/themes/Sylvia/mail-css.tpl

    r5123 r5125  
    44#the_page {ldelim} }
    55#content {ldelim} }
    6 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom;
     6#copyright {ldelim} background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/bottom-left-bg.jpg) no-repeat scroll left bottom;
    77min-height: 220px; height: 220px; width: 100%; min-width: 100%; padding: 10px 100px 30px 100px; }
    8 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;}
     8h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;}
    99img {ldelim} margin: 16px; border: 16px solid #444; -moz-border-radius: 4px; border-radius: 4px 4px; }
    1010img:hover {ldelim} padding: 15px; border: 0; background-color:#222;-moz-border-radius: 4px; border-radius: 4px 4px; }
  • trunk/themes/clear/mail-css.tpl

    r3283 r5125  
    22
    33body {ldelim} background-color:#fff; color:#696969;}
    4 #the_page {ldelim} background: #fff url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
    5 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
    6 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
     4#the_page {ldelim} background: #fff url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
     5#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
     6#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
    77color: #333;}
    88h2 {ldelim} background-color: #ddd;}
  • trunk/themes/dark/mail-css.tpl

    r5123 r5125  
    22
    33body {ldelim} background-color:#444; color:#fff;}
    4 #the_page {ldelim} background: #444 url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
    5 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
    6 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
     4#the_page {ldelim} background: #444 url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
     5#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
     6#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
    77color: #69c;}
    8 h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
     8h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}themes/{$themeconf.theme}/images/tableh1_bg.png);}
    99img {ldelim} margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
    1010img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
  • trunk/themes/default/template/mail/text/html/header.tpl

    r5095 r5125  
    1111{if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if}
    1212{if isset($MAIL_CSS)}{$MAIL_CSS}{/if}
    13 {if isset($LOCAL_MAIL_CSS)}{$LOCAL_MAIL_CSS}{/if}
    1413--></style>
    1514</head>
  • trunk/themes/p0w0/mail-css.tpl

    r5123 r5125  
    22
    33body {ldelim} background-color:#cde; color:#369;}
    4 #the_page {ldelim} background: #cde url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
    5 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
    6 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
     4#the_page {ldelim} background: #cde url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
     5#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
     6#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
    77color: #69c;}
    8 h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/button-bg.png);}
     8h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}themes/{$themeconf.theme}/images/button-bg.png);}
    99img {ldelim} margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; }
    1010img:hover {ldelim} border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; }
  • trunk/themes/wipi/mail-css.tpl

    r5123 r5125  
    22
    33body {ldelim} background-color:#111; color:#69c;}
    4 #the_page {ldelim} background: #111 url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
    5 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
    6 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
     4#the_page {ldelim} background: #111 url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
     5#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
     6#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
    77color: #69c;}
    8 h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
     8h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}themes/{$themeconf.theme}/images/tableh1_bg.png);}
    99img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
    1010img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
Note: See TracChangeset for help on using the changeset viewer.