X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fshow.tpl;h=71f2160db7b0657e9c1b3c19f4f36aefce263e70;hb=35fa92e83c0ac722a75072cf86aa6d529554ca31;hp=a24ef6af996d27ebb55894c25ce768a45121212d;hpb=7b2413f614dc4deafd18501ba3cbe8db398c05e3;p=platal.git

diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl
index a24ef6a..71f2160 100644
--- a/templates/newsletter/show.tpl
+++ b/templates/newsletter/show.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,44 +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}
-{perms level='admin'}
-[<a href='admin/newsletter_edit.php?nid={$nl->_id}'>Editer</a>]
-{/perms}
+<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 $smarty.session.perms->hasFlag('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)|smarty:nodefaults}
-      </div>
-      {/if}
+      {include file="newsletter/nl.tpl"}
     </td>
   </tr>
 </table>
 
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}