X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnetgrp%2Fform.announce.tpl;h=fecbd7d04b04a2f81d6e8810f2da45d895c078f8;hb=794feea76e0979eba4e125bb91b7ea43680f26e0;hp=b7b047a3354681fd1b122e7a11ff84881f6d2306;hpb=8b1f8e12d444062ef63a0db3a8fa94582a9778c3;p=platal.git

diff --git a/templates/xnetgrp/form.announce.tpl b/templates/xnetgrp/form.announce.tpl
index b7b047a..fecbd7d 100644
--- 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,15 +32,13 @@
       </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}
-      {/tidy}
+      {$art.texte|miniwiki|smarty:nodefaults}
     </td>
   </tr>
   {if ($is_logged || $admin) && $art.contacts}
@@ -49,26 +47,33 @@
   </tr>
   <tr class="pair">
     <td style="padding-left: 20px">
-      {tidy}
       {if $art.contact_html}
+      {tidy}
       {$art.contact_html|nl2br|smarty:nodefaults}
+      {/tidy}
       {else}
-      {$art.contacts|url_catcher|nl2br|smarty:nodefaults}
+      {$art.contacts|miniwiki|smarty:nodefaults}
       {/if}
-      {/tidy}
     </td>
   </tr>
   {/if}
-  <tr class="pair right">
+  <tr class="pair">
     <td>
+      <div style="float: right">
       <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>
       </small>
+      </div>
+      <small>
+      {if $art.post_id}
+      <a href="{$platal->ns}forum/read/{$art.post_id}">{icon name=comments title="Discussions"}Discuter</a>
+      {/if}
+      </small>
     </td>
   </tr>
 </table>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}