some (deep) changes in survey data model (simplifications), added survey modes (limit...

[platal.git] / templates / xnetgrp / form.announce.tpl

diff --git a/templates/xnetgrp/form.announce.tpl b/templates/xnetgrp/form.announce.tpl
index b7b047a..03d612c 100644 (file)
--- a/templates/xnetgrp/form.announce.tpl
+++ b/templates/xnetgrp/form.announce.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  *}
@@ -32,14 +32,14 @@
       </div>
       {/if}
       {tidy}
-      {if $admin}Aperçu de : {/if}{$art.titre}
+      {if $admin}Aperçu de : {/if}{$art.titre}
       {/tidy}
     </th>
   </tr>
   <tr>
     <td style="padding-bottom: 1em">
       {tidy}
-      {$art.texte|nl2br}
+      {$art.texte|wiki_to_html|smarty:nodefaults}
       {/tidy}
     </td>
   </tr>
@@ -53,7 +53,7 @@
       {if $art.contact_html}
       {$art.contact_html|nl2br|smarty:nodefaults}
       {else}
-      {$art.contacts|url_catcher|nl2br|smarty:nodefaults}
+      {$art.contacts|wiki_to_html|nl2br|smarty:nodefaults}
       {/if}
       {/tidy}
     </td>
@@ -62,7 +62,7 @@
   <tr class="pair right">
     <td>
       <small>
-        Annonce proposée par
+        Annonce proposée par
         <a class="popup2" href="https://www.polytechnique.org/profile/{$art.forlife}">
           {$art.prenom} {$art.nom} (X{$art.promo})
         </a>
@@ -71,4 +71,4 @@
   </tr>
 </table>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}