X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fshow.tpl;h=7b162caa62b0086ca25a72b210f0ba97081ac7d5;hb=40d428d888fbbe36da4c6196caa7b346266934f3;hp=833c88e388868aed1a52d629a67bb1f772c66217;hpb=ed76a506a12cf15a03232d142d5bfd0c2c882b92;p=platal.git

diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl
index 833c88e..7b162ca 100644
--- a/templates/newsletter/show.tpl
+++ b/templates/newsletter/show.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,45 +20,36 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>
+<h1 style="clear: both">
   Lettre de Polytechnique.org du {$nl->_date|date_format}
 </h1>
 
-<p>
-[<a href='nl'>liste des lettres</a>]
-{if $smarty.get.text}
-[<a href='nl/show/{$nl->id()}'>version HTML</a>]
-{else}
-[<a href='nl/show/{$nl->id()}?text=1'>version Texte</a>]
-{/if}
-{if $smarty.session.perms eq admin}
-[<a href='admin/newsletter/edit/{$nl->id()}'>Editer</a>]
-{/if}
+<p style="float: left">
+  {if $smarty.get.text}
+  [<a href='nl/show/{$nl->id()}'>version HTML</a>]
+  {else}
+  [<a href='nl/show/{$nl->id()}?text=1'>version Texte</a>]
+  {/if}
+  {if hasPerm('admin')}
+  [<a href='admin/newsletter/edit/{$nl->id()}'>Editer</a>]
+  {/if}
 </p>
 
+{include file="include/massmailer-nav.tpl" mm=$nl base=nl}
+
 <form method="post" action="{$platal->path}">
-  <div class='center'>
+  <div class='center' style="clear: both">
     <input type='submit' value="me l'envoyer" name='send' />
   </div>
 </form>
 
-<table class="bicol" cellpadding="3" cellspacing="0">
-  <tr>
-    <th>{$nl->title()}</th>
-  </tr>
+<table class="bicol">
+  <tr><th>{$nl->title(true)}</th></tr>
   <tr>
     <td>
-      {if $smarty.get.text}
-      <pre>{$nl->toText($smarty.session.prenom, $smarty.session.nom, $smarty.session.femme)}</pre>
-      {else}
-      <div class='nl'>
-        {$nl->toHtml($smarty.session.prenom, $smarty.session.nom, $smarty.session.femme,
-                     false, true)|smarty:nodefaults}
-      </div>
-      {/if}
+      {include file="newsletter/nl.mail.tpl" escape=true}
     </td>
   </tr>
 </table>
 
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}