X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fnl.tpl;h=8649a13e7c5c9a8aca889d47a5f7ab7fb98ea5f2;hb=9e92370da8b6f3399257c1f1a056d6612d890d6a;hp=cd801562e886a2eb75d6b17773db21ba25f26e95;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/templates/newsletter/nl.tpl b/templates/newsletter/nl.tpl
index cd80156..8649a13 100644
--- a/templates/newsletter/nl.tpl
+++ b/templates/newsletter/nl.tpl
@@ -20,14 +20,14 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if !$html_version}
-{if $is_mail}
 {config_load file="mails.conf" section="newsletter"}
+{if $mail_part eq 'head'}
 {from full=#from#}
 {subject text=$nl->title(true)}
 {if isset(#replyto#)}{add_header name='Reply-To' value=#replyto#}{/if}
 {if isset(#retpath#)}{add_header name='Return-Path' value=#retpath#}{/if}
-{else}
+{elseif $mail_part eq 'text'}
+{if !$is_mail}
 <pre style="width : 72ex; margin: auto">
 {/if}
 ====================================================================
@@ -60,16 +60,16 @@
 Cette lettre est envoyÃ©e Ã  tous les Polytechniciens sur Internet par
 l'intermÃ©diaire de Polytechnique.org.
 
-archives         : [https://www.polytechnique.org/nl]
-Ã©crire           : [https://www.polytechnique.org/nl/submit]
-ne plus recevoir : [https://www.polytechnique.org/nl/out]
+archives         : <https://www.polytechnique.org/nl>
+Ã©crire           : <https://www.polytechnique.org/nl/submit>
+ne plus recevoir : <https://www.polytechnique.org/nl/out>
 
 {if !$is_mail}
 </pre>
 {/if}
-{else}
+{elseif $mail_part eq 'html'}
 {if $is_mail}
-<?xml version="1.0" encoding="iso-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"> 
   <head>  
