From a46f274c8330714a3263c850dc93a0768de59e17 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Mon, 29 Jan 2007 10:41:42 +0000 Subject: [PATCH] Do not show letter background on the web. Fix body margin on mail clients which support html body git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1424 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs/css/ax.css | 4 ++-- htdocs/css/nl.css | 4 ++-- templates/axletter/letter.tpl | 7 +++++-- templates/newsletter/nl.tpl | 7 +++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/htdocs/css/ax.css b/htdocs/css/ax.css index 32f1058..560c205 100644 --- a/htdocs/css/ax.css +++ b/htdocs/css/ax.css @@ -19,14 +19,14 @@ ***************************************************************************/ -div.ax_mail { +div.ax_background { margin : 0; padding : 1em 0; background-color: #ddd; color: #000; } -div.ax_text { +div.ax_mail { margin : auto; width : 72ex; font-family : "Georgia", "Times New Roman", serif; diff --git a/htdocs/css/nl.css b/htdocs/css/nl.css index e70c210..b1347a2 100644 --- a/htdocs/css/nl.css +++ b/htdocs/css/nl.css @@ -18,14 +18,14 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -div.nl { +div.nl_background { margin : 0; padding : 1em 0; background-color: #ddd; color: #000; } -div.nl_text { +div.nl { margin : auto; width : 72ex; font-family : "Verdana", "Arial", "Helvetica", sans-serif; diff --git a/templates/axletter/letter.tpl b/templates/axletter/letter.tpl index d592e07..32fcea5 100644 --- a/templates/axletter/letter.tpl +++ b/templates/axletter/letter.tpl @@ -57,15 +57,18 @@ ne plus recevoir : [https://www.polytechnique.org/ax/out{if $hash}/{$hash}{/if}] Lettre d'information de l'AX +
{/if}
-
{$am->title()}
{$am->head($prenom, $nom, $sexe, 'html')|smarty:nodefaults}
{$am->body('html')|smarty:nodefaults}
@@ -78,8 +81,8 @@ ne plus recevoir : [https://www.polytechnique.org/ax/out{if $hash}/{$hash}{/if}] ne plus recevoir]
-
{if $is_mail} + {/if} diff --git a/templates/newsletter/nl.tpl b/templates/newsletter/nl.tpl index 7e9bff2..34c5052 100644 --- a/templates/newsletter/nl.tpl +++ b/templates/newsletter/nl.tpl @@ -75,15 +75,18 @@ ne plus recevoir : [https://www.polytechnique.org/nl/out] Lettre mensuelle de Polytechnique.org +
{/if}
-
{$nl->title()}
{$nl->head($prenom, $nom, $sexe, 'html')|smarty:nodefaults}
@@ -114,8 +117,8 @@ ne plus recevoir : [https://www.polytechnique.org/nl/out] ne plus recevoir]
-
{if $is_mail} + {/if} -- 2.1.4