3 files changed, 25 insertions, 29 deletions
diff --git a/template/yoga/mail/text/html/default-layout-mail-css.tpl b/template/yoga/mail/text/html/default-layout-mail-css.tpl
new file mode 100644
index 000000000..cf506b7e0
--- /dev/null
+++ b/template/yoga/mail/text/html/default-layout-mail-css.tpl
@@ -0,0 +1,19 @@
+/* $Id$ */
+/* 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.jpg) repeat-y scroll left top;
+margin:0px;padding:0px;text-align: left;}
+a {text-decoration: none}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.jpg) no-repeat scroll left top;
+margin:0px;padding:82px 0px 0px 62px;}
+hr {width:632px;margin-left:0px;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.jpg) 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;}
+a.PWG { border: 0px; }
+a.PWG .P { color : #f92; }
+a.PWG .W { color : #aaa; }
+a.PWG .G { color : #69c; }
+a.PWG:hover .P { color : #69c; }
+a.PWG:hover .G { color : #f92; }
diff --git a/template/yoga/mail/text/html/default-layout.css b/template/yoga/mail/text/html/default-layout.css
deleted file mode 100644
index d415a371f..000000000
--- a/template/yoga/mail/text/html/default-layout.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $Id$ */
-
-BODY#theMailPage #content
-{
-  margin: 2em;
-  text-align: left;
-}
-
diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
index ed0304f7f..3d13d7766 100644
--- a/template/yoga/mail/text/html/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
@@ -2,28 +2,13 @@
             "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="{LANG}" dir="{DIR}">
 <head>
-<title>PhpWebGallery Notication by Mail</title>
+<title>PhpWebGallery Mail</title>
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
-
-<!--<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/mail/text/html/default-layout.css">-->
-
-<style><!-- /* Notification mini style for mails */
-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.jpg) repeat-y scroll left top;
-margin:0px;padding:0px;text-align: left;}
-a {text-decoration: none}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.jpg) no-repeat scroll left top;
-margin:0px;padding:82px 0px 0px 62px;}
-hr {width:632px;margin-left:0px;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.jpg) 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;}
-a.PWG { border: 0px; }
-a.PWG .P { color : #f92; }
-a.PWG .W { color : #aaa; }
-a.PWG .G { color : #69c; }
-a.PWG:hover .P { color : #69c; }
-a.PWG:hover .G { color : #f92; }
+<style><!-- /* Mini style for mails */
+{MAIL_CSS_DEFAULT_TEMPLATE}
+{MAIL_CSS_THEME}
+{MAIL_CSS_LOCAL_TEMPLATE}
+{MAIL_CSS_LOCAL_COMMON}
 --></style>
 </head>
 <body>