Merge commit 'origin/master' into hruid

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

diff --git a/templates/xnetgrp/form.announce.tpl b/templates/xnetgrp/form.announce.tpl
index c1d6a49..0dfe367 100644 (file)
--- a/templates/xnetgrp/form.announce.tpl
+++ b/templates/xnetgrp/form.announce.tpl
@@ -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}
@@ -37,6 +37,11 @@
     </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">
       {$art.texte|miniwiki|smarty:nodefaults}
     </td>
@@ -58,11 +63,11 @@
   </tr>
   {/if}
   <tr class="pair">
-    <td>
+    <td {if $art.photo}colspan="2"{/if}>
       <div style="float: right">
       <small>
         Annonce proposée par
-        <a class="popup2" href="https://www.polytechnique.org/profile/{$art.forlife}">
+        <a class="popup2" href="https://www.polytechnique.org/profile/{$art.hruid}">
           {$art.prenom} {$art.nom} (X{$art.promo})
         </a>
       </small>