Many fixes in survey ergonomics

[platal.git] / templates / events / index.tpl

diff --git a/templates/events/index.tpl b/templates/events/index.tpl
index 7e64ba8..04b8399 100644 (file)
--- 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,15 +102,11 @@ 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 $category eq 'news'}
+        {/if}
+        {/if}
+        {if $category eq 'important'}
+          {icon name=error} Informations prioritaires&nbsp;:
+        {elseif $category eq 'news'}
           {icon name=bell} Nouvelles annonces&nbsp;:
         {elseif $category eq 'end'}
           {icon name=clock} Dernières minutes&nbsp;:
@@ -117,7 +115,6 @@ Bienvenue {$smarty.session.prenom}
         {/if}
       </td>
     </tr>
-    {/if}
     {iterate item=ev from=$evenement.summary}
     <tr class="impair">
       <td class="half">
@@ -143,6 +140,7 @@ Bienvenue {$smarty.session.prenom}
 
   <script type="text/javascript">
   {literal}
+  <!--
   function readEvent(id) {
        document.getElementById('content-evt'+id).style.display='none';
        var link = document.getElementById('link-evt'+id);
@@ -154,6 +152,7 @@ Bienvenue {$smarty.session.prenom}
        Ajax.update_html(null, 'events/read/'+id);
        return false;
   }
+  -->
   {/literal}
   </script>
  
@@ -166,7 +165,9 @@ Bienvenue {$smarty.session.prenom}
     <tr>
       <th>
         <div style="float: left">
-          {if $category eq 'news'}
+          {if $category eq 'important'}
+            {icon name=error title="Important"}
+          {elseif $category eq 'news'}
             {icon name=bell title="Nouvelle annonce"}
           {elseif $category eq 'end'}
             {icon name=clock title="Bientôt fini"}
@@ -175,7 +176,7 @@ Bienvenue {$smarty.session.prenom}
           {/if}
         </div>
         <div style="float:right">
-          {if $smarty.session.perms eq 'admin'}
+          {if $smarty.session.perms->hasFlag('admin')}
           <a href="admin/events/edit/{$ev.id}">{icon name=page_edit title="Editer cet article"}</a>
           {/if}
           <a href="events/read/{$ev.id}{if $previd}/newsid{$previd}{/if}" onclick="return readEvent('{$ev.id}')">{icon name=cross title="Cacher cet article"}</a>
@@ -187,17 +188,37 @@ 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">
+            {$ev.texte|smarty:nodefaults|nl2br}
+          </div>
+        </div>
+      </td>
+    </tr>
+    <tr class="pair">
+      <td class="half smaller">
+        <div style="display:block; float: right; padding-left:1em">
+          {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>