X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fevents%2Findex.tpl;h=c1fcb5a11c03a887aec934bf5ebd8b9293ad7006;hb=f3fb8eda60266ea06ce7a04d1b8bc2617c845c62;hp=c2d7e21c343fc16a6e656d2c5ba2afd86f885cff;hpb=9ed396c06e661970436bcd81ecc4d758fa647ce0;p=platal.git

diff --git a/templates/events/index.tpl b/templates/events/index.tpl
index c2d7e21..c1fcb5a 100644
--- a/templates/events/index.tpl
+++ b/templates/events/index.tpl
@@ -89,9 +89,11 @@ Bienvenue {$smarty.session.prenom}
 
 {include file="include/tips.tpl" full=true}
   
-  <table class="bicol">
-    <tr>
-      <th>
+  <table class="tinybicol" id="menu-evts">
+    {foreach from=$events name=events key=category item=evenement}
+    <tr class="pair" style="height: 18px">
+      <td class="half titre" style="height: 18px; padding-top: 1px; padding-bottom: 1px;">
+        {if $smarty.foreach.events.first}
         {if $smarty.session.core_rss_hash}
         <a href='rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml' style="display:block;float:right">
           {icon name=feed title='fil rss'}
@@ -100,14 +102,8 @@ Bienvenue {$smarty.session.prenom}
         <a href='prefs/rss?referer=events'  style="display:block;float:right">
           {icon name=feed_add title='Activer mon fil rss'}
         </a>
-       {/if}
-        Sommaire des informations événementielles
-      </th>
-    </tr>
-    {foreach from=$events name=events key=category item=evenement}
-    {if $smarty.foreach.events.total neq 1}
-    <tr class="pair" style="height: 18px">
-      <td class="half titre" style="height: 18px; padding-top: 1px; padding-bottom: 1px;">
+        {/if}
+        {/if}
         {if $category eq 'important'}
           {icon name=error} Informations prioritaires&nbsp;:
         {elseif $category eq 'news'}
@@ -119,7 +115,6 @@ Bienvenue {$smarty.session.prenom}
         {/if}
       </td>
     </tr>
-    {/if}
     {iterate item=ev from=$evenement.summary}
     <tr class="impair">
       <td class="half">
@@ -191,17 +186,40 @@ Bienvenue {$smarty.session.prenom}
 	 {/tidy}
       </th>
     </tr>
-    <tr class="{cycle values="impair,pair"}">
+    {cycle values="left,right" assign=position}
+    <tr class="impair">
       <td class="half">
-        {tidy}
-          {$ev.texte|smarty:nodefaults|nl2br}
-        {/tidy}
-        <br />
-        <p class="smaller"><a href="events#pagetop" style="display:block;float:right"><img alt="Sommaire" title="Remonter tout en haut" src="images/up.png"/></a>Annonce proposée par
+        <div>
+          {if $ev.img}
+          <div style="float: {$position}; padding-{if $position eq right}left{else}right{/if}: 0.5em">
+            <img src="events/photo/{$ev.id}" alt="{$ev.title}" />
+          </div>
+          {/if}
+          <div style="text-align: justify">
+            {tidy}
+              {$ev.texte|smarty:nodefaults|nl2br}
+            {/tidy}
+          </div>
+        </div>
+      </td>
+    </tr>
+    <tr class="pair">
+      <td class="half smaller">
+        <div style="display:block; float: right; padding-left:1em">
+          <a href="events#pagetop">
+          {if $ev.post_id}
+          <a href="banana/{#globals.banana.event_reply#|default:#globals.banana.event_forum#}/read/{$ev.post_id}">
+            {icon name="comments" title="Discussion"}Suivre la discussion
+          </a> &bull;
+          {/if}
+          <a href="events#pagetop">
+            <img alt="Sommaire" title="Remonter tout en haut" src="images/up.png"/>
+          </a>
+        </div>
+        Annonce proposée par
         <a href="profile/{$ev.forlife}" class="popup2">
           {$ev.prenom} {$ev.nom} X{$ev.promo}
         </a>
-        </p>
       </td>
     </tr>
   </table>