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

diff --git a/templates/xnetgrp/form.announce.tpl b/templates/xnetgrp/form.announce.tpl
index b7b047a..acab579 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-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -22,7 +22,7 @@
 
 <table class="tinybicol" id="art{$art.id}">
   <tr>
-    <th>
+    <th {if $art.photo}colspan="2"{/if}>
       {if $is_logged && !$admin}
       <div style="float: right">
         {if $is_admin}
@@ -32,43 +32,50 @@
       </div>
       {/if}
       {tidy}
-      {if $admin}Aperçu de : {/if}{$art.titre}
+      {if $admin}Aperçu de&nbsp;: {/if}{$art.titre}
       {/tidy}
     </th>
   </tr>
   <tr>
+    {if $art.photo}
+    <td rowspan="{if ($is_logged || $admin) && $art.contacts}3{else}2{/if}" style="width: 100px">
+      <img src="{$platal->ns}announce/photo/{$art.id}" alt="{$art.titre}" style="width: 100px" />
+    </td>
+    {/if}
     <td style="padding-bottom: 1em">
-      {tidy}
-      {$art.texte|nl2br}
-      {/tidy}
+      {$art.texte|miniwiki|smarty:nodefaults}
     </td>
   </tr>
   {if ($is_logged || $admin) && $art.contacts}
   <tr class="pair">
-    <td class="titre">Contacts :</td>
+    <td class="titre">Contacts&nbsp;:</td>
   </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">
-    <td>
+  <tr class="pair">
+    <td {if $art.photo}colspan="2"{/if}>
+      <div style="float: right">
+      <small>
+        Annonce proposée par {profile user=$art.uid sex=false promo=true groupperms=false}
+      </small>
+      </div>
       <small>
-        Annonce proposée par
-        <a class="popup2" href="https://www.polytechnique.org/profile/{$art.forlife}">
-          {$art.prenom} {$art.nom} (X{$art.promo})
-        </a>
+      {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: *}