feature 2965: apply new template on pwg_mail()

TODO : review other mail functions, configuration GUI

git-svn-id: http://piwigo.org/svn/trunk@25344 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 322 insertions, 48 deletions

diff --git a/themes/default/template/mail/text/html/footer.tpl b/themes/default/template/mail/text/html/footer.tpl
index b1f1b9317..da17e4473 100644
--- a/themes/default/template/mail/text/html/footer.tpl
+++ b/themes/default/template/mail/text/html/footer.tpl
@@ -1,22 +1,23 @@
-</div> <!-- content -->
-<div id="copyright">
-<hr>
-  {'Sent by'|@translate}
-  <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a>
+            {* <!-- end $CONTENT --> *}
+          </td></tr>
 
- {* Please, do not remove this copyright. If you really want to,
-      contact us on http://piwigo.org to find a solution on how
-      to show the origin of the script...*}
-  - {'Powered by'|@translate}
-  <a href="http://piwigo.org" class="Piwigo">
-  <span class="Piwigo">Piwigo</span></a>
-  {$VERSION}
+          <tr><td id="footer">
+            {* <!-- begin FOOTER --> *}
+{* <!-- Please, do not remove this copyright. If you really want to,
+contact us on http://piwigo.org to find a solution on how
+to show the origin of the script... --> *}
+      
+            {'Sent by'|translate} <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a>
+            - {'Powered by'|translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a>
+            {if not empty($VERSION)}{$VERSION}{/if}
+            
+            - {'Contact'|translate}
+            <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|translate|escape:url}">{'Webmaster'|@translate}</a>
+            {* <!-- end FOOTER --> *}
+          </td></tr>
+        </table>
 
-  - {'Contact'|@translate}
-  <a href="mailto:{$MAIL}?subject={$TITLE_MAIL}">{'Webmaster'|@translate}</a>
-
-</div> <!-- copyright -->
-</div> <!-- the_page -->
-
-</body>
-</html>
+      </td></tr>
+    </table>
+  </body>
+</html>
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl
index 072bcb0be..6bfcc1cd1 100644
--- a/themes/default/template/mail/text/html/global-mail-css.tpl
+++ b/themes/default/template/mail/text/html/global-mail-css.tpl
@@ -1,11 +1,103 @@
-/* Global mail css */
-
-body {ldelim} font-family: Univers, Helvetica, Optima; font-size:12px; margin:0px; padding:0px; }
-#the_page {ldelim} margin:0px; padding:0px; text-align:left;}
-#content {ldelim} margin:0px; padding:30px 0px 0px 30px; width:732px;}
-hr {ldelim} width:632px; margin-left:0;}
-#copyright {ldelim} font-size:10px; margin:0px; padding:48px 0px 32px 62px;}
-.PWG {ldelim} font-family:verdana, sans-serif !important; font-size:0.9em; font-weight:normal; letter-spacing:0px;}
-h2 {ldelim} padding:7px 15px; width:617px; font-weight:bold;}
-img {ldelim} margin:16px; border:16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover {ldelim} padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
+{strip}
+/* page */
+body {
+  font-family:"Verdana", "Helvetica", "Optima", sans-serif;
+  font-size:12px;
+  margin:0px;
+  padding:0px;
+}
+
+html, body, #bodyTable {
+  width:100%;
+  height:100%;
+}
+
+/* main block */
+#header {
+  padding:20px;
+}
+#header #title {
+  font-size:26px;
+  font-weight:bold;
+}
+#header #subtitle {
+  font-size:20px;
+}
+#content {
+  padding:0 20px 20px 20px;
+}
+#footer {
+  font-size:10px;
+  padding:5px;
+}
+#topSpacer {
+  margin-bottom:20px;
+}
+
+/* images */
+img {
+  border:none;
+}
+
+h1, h2, h3, h4, h5 {
+  margin:0.5em 0 0.25em 0;
+}
+h1 { font-size:26px; }
+h2 { font-size:20px; }
+h3 { font-size:16px; }
+h4 { font-size:12px; }
+h5 { font-size:10px; }
+
+/* paragraphs */
+p {
+  margin:0.25em 0 0.5em 0;
+}
+blockquote {
+  margin-left:10px;
+  padding-left:10px;
+  font-family:"Times",serif;
+  font-size:14px;
+}
+
+/* list */
+ul, ol {
+  margin:0.5em 0 0.25em 30px;
+  padding:0;
+}
+dl {
+  margin:0.5em 0 0.25em 10px;
+}
+dt {
+  margin:0.25em 0 0 0;
+  font-weight:bold;
+}
+dd {
+  margin:0 0 0.25em 10px;
+}
+
+/* tables */
+#content table {
+  width:100%;
+  border-spacing:0;
+  border-collapse:collapse;
+}
+#content table td {
+  padding:2px 3px;
+}
+#content table th {
+  font-weight:bold;
+  text-align:center;
+  padding:4px 0;
+}
+#content table tfoot td {
+  font-size:0.8em;
+}
+
+/* line */
+hr {
+  border-width:0 0 1px 0;
+  border-color:#ddd;
+  border-style:solid;
+  margin:1em;
+}
+{/strip}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl
index 9520bdb20..b98f5be18 100644
--- a/themes/default/template/mail/text/html/header.tpl
+++ b/themes/default/template/mail/text/html/header.tpl
@@ -1,13 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="{$lang_info.code}" dir="{$lang_info.direction}">
-<head>
-<title>Piwigo Mail</title>
-<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
-<style><!-- /* Mini style for mails */
-{if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if}
-{if isset($MAIL_CSS)}{$MAIL_CSS}{/if}
---></style>
-</head>
-<body>
-<div id="the_page">
-<div id="content" class="content">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"/>
+    <title>Piwigo Mail</title>
+
+    <style type="text/css">
+    {if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if}
+    {if isset($MAIL_CSS)}{$MAIL_CSS}{/if}
+    </style>
+  </head>
+
+  <body>
+    <table id="bodyTable" cellspacing="0" cellpadding="10" border="0">
+      <tr><td align="center" valign="top">
+
+        <table id="contentTable" cellspacing="0" cellpadding="0" border="0">
+          <tr><td id="header">
+            {* <!-- begin HEADER --> *}
+            <div id="title">{$MAIL_TITLE}</div>
+            {if not empty($MAIL_SUBTITLE)}<div id="subtitle">{$MAIL_SUBTITLE}</div>{/if}
+            {* <!-- end HEADER --> *}
+          </td></tr>
+
+          <tr><td id="content">
+{* <!-- use an invisible div with a bottom margin to force the browser 
+to merge the margin with the element bellow (typically h1/h2/...) --> *}
+            <div id="topSpacer"></div>
+            {* <!-- begin CONTENT --> *}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/mail-css-clear.tpl b/themes/default/template/mail/text/html/mail-css-clear.tpl
new file mode 100644
index 000000000..b23c2b5d3
--- /dev/null
+++ b/themes/default/template/mail/text/html/mail-css-clear.tpl
@@ -0,0 +1,73 @@
+{strip}
+/* page */
+body {
+  color:#111;
+}
+
+html, body, #bodyTable {
+  background:#fff;
+}
+#contentTable {
+  width:600px;
+}
+
+/* main block */
+#header {
+  background:#eee;
+  background:radial-gradient(ellipse at center, #fefefe, #e5e5e5);
+  border-top:4px solid #f70;
+  text-align:center;
+  text-shadow:1px 1px 0px #fff;
+}
+#header #subtitle {
+  color:#e06900;
+}
+#content {
+  background:#fefefe;
+  border-width:1px;
+  border-style:solid;
+  border-color:#ddd #eee;
+  box-shadow:inset 0 0 20px #eee;
+}
+#footer {
+  background:#eee;
+  border-bottom:2px solid #f70;
+}
+
+/* links */
+a {
+  color:#f70;
+  text-decoration:none;
+}
+a:hover {
+  text-decoration:underline;
+}
+
+/* images */
+img.photo {
+  border:10px solid #ddd;
+}
+img.photo:hover {
+  border-color:#eee;
+}
+
+/* paragraphs */
+blockquote {
+  border-left:2px solid #aaa;
+  border-radius:2px;
+}
+
+/* tables */
+#content table td {
+  border-bottom:1px solid #efefef;
+}
+#content table th {
+  background:#aaa;
+  color:#fff;
+  border-right:1px solid #ddd;
+}
+#content table tfoot td {
+  background:#eee;
+  border-right:1px solid #fff;
+}
+{/strip}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/html/mail-css-dark.tpl b/themes/default/template/mail/text/html/mail-css-dark.tpl
new file mode 100644
index 000000000..8299b5ad5
--- /dev/null
+++ b/themes/default/template/mail/text/html/mail-css-dark.tpl
@@ -0,0 +1,87 @@
+{strip}
+/* page */
+body {
+  color:#fff;
+}
+
+html, body, #bodyTable {
+  background:#111;
+}
+#contentTable {
+  width:600px;
+}
+
+/* main block */
+#header {
+  background:#444;
+  background:radial-gradient(ellipse at center, #555, #333);
+  border:1px solid #000;
+  border-top:4px solid #f70;
+  text-align:center;
+  text-shadow:1px 1px 0px #000;
+}
+#header #title {
+  color:#eee;
+}
+#header #subtitle {
+  color:#e06900;
+}
+#content {
+  background:#111;
+  border-width:1px;
+  border-style:solid;
+  border-color:#666 #000;
+  box-shadow:inset 0 0 20px #333;
+}
+#footer {
+  background:#333;
+  border:1px solid #000;
+  border-bottom:2px solid #f70;
+}
+
+/* links */
+a {
+  color:#f70;
+  text-decoration:none;
+}
+a:hover {
+  text-decoration:underline;
+}
+
+/* images */
+img.photo {
+  border:10px solid #666;
+}
+img.photo:hover {
+  border-color:#999;
+}
+
+h1, h2, h3, h4, h5 {
+  color:#bbb;
+}
+
+/* paragraphs */
+blockquote {
+  border-left:2px solid #aaa;
+  border-radius:2px;
+}
+
+/* tables */
+#content table td {
+  border-bottom:1px solid #999;
+}
+#content table th {
+  background:#666;
+  border-right:1px solid #aaa;
+}
+#content table tfoot td {
+  background:#444;
+  color:#aaa;
+  border-right:1px solid #aaa;
+}
+
+/* line */
+hr {
+  border-color:#555;
+}
+{/strip}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/plain/footer.tpl b/themes/default/template/mail/text/plain/footer.tpl
index 8574697e6..0f9ef273e 100644
--- a/themes/default/template/mail/text/plain/footer.tpl
+++ b/themes/default/template/mail/text/plain/footer.tpl
@@ -1,5 +1,7 @@
+{literal}
 
--- 
+{/literal}
+----
 {'Sent by'|@translate} "{$GALLERY_TITLE}" {$GALLERY_URL}
-{'Contact'|@translate} {$MAIL}
-{'Powered by'|@translate} Piwigo {$VERSION}
+{'Powered by'|@translate} "Piwigo{if not empty($VERSION)} {$VERSION}{/if}" {$PHPWG_URL}
+{'Contact'|@translate}: {$CONTACT_MAIL}
\ No newline at end of file
diff --git a/themes/default/template/mail/text/plain/header.tpl b/themes/default/template/mail/text/plain/header.tpl
index 88cd997fa..31d7456fb 100644
--- a/themes/default/template/mail/text/plain/header.tpl
+++ b/themes/default/template/mail/text/plain/header.tpl
@@ -1,3 +1,6 @@
+{$MAIL_TITLE}
+{if not empty($MAIL_SUBTITLE)}{$MAIL_SUBTITLE}
+{/if}
+----
 {literal}
-
-{/literal}{*note that there must be an empty line to separate the mime headers*}
+{/literal}
\ No newline at end of file