X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fshow.tpl;h=8cb933252fb1e3c26bf98a4f72a340400fdb2fee;hb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;hp=bec53588598ce1d53a4f4876f2f1d113ba9afde0;hpb=045a152265abdde0a9b7e28d24c24ed116817cda;p=platal.git

diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl
index bec5358..8cb9332 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,44 +20,36 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>
+<h1 style="clear: both">
   Lettre de Polytechnique.org du {$nl->_date|date_format}
 </h1>
 
-<p>
-[<a href='{rel}/nl'>liste des lettres</a>]
-{if $smarty.get.text}
-[<a href='?nid={$nl->_id}'>version HTML</a>]
-{else}
-[<a href='?nid={$nl->_id}&amp;text=1'>version Texte</a>]
-{/if}
-{perms level='admin'}
-[<a href='{rel}/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 hasPerm('admin')}
+  [<a href='admin/newsletter/edit/{$nl->id()}'>Editer</a>]
+  {/if}
 </p>
 
-<form method="post" action="{rel}/{$platal->path}">
-  <div class='center'>
+{include file="include/massmailer-nav.tpl" mm=$nl base=nl}
+
+<form method="post" action="{$platal->path}">
+  <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.mail.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: *}