X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fsurvey%2Findex.tpl;h=11105216ea43fb2161c814c364e7c1f3b824e125;hb=9006db5d9e2b5d636b631fb51a834977a067d6bb;hp=e32c9f797094eb3374d8ac9ba2c178901ff6e584;hpb=9e1816c7666767755abbc24f6a0df290efff81b6;p=platal.git

diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl
index e32c9f7..1110521 100644
--- a/templates/survey/index.tpl
+++ b/templates/survey/index.tpl
@@ -22,50 +22,64 @@
 
 <h1>Sondages</h1>
 
+{* Survey::MODE_ALL equals 0. *}
+{assign var=SurveyMODE_ALL value=0}
+{if $survey_current->total() > 0 || $smarty.session.auth}
 <table class="bicol">
   <tr>
-    <th>
+    <th colspan="3">
       Sondages en cours
     </th>
   </tr>
   {iterate item=s from=$survey_current}
-  {if $smarty.session.auth || $s.mode == Survey::MODE_ALL}
+  {if $smarty.session.auth || $s.mode == $SurveyMODE_ALL}
   <tr class="{cycle name=cs_cycle values="impair,pair"}">
-    <td class="half">
-      &bull;
-      <a href="survey/vote/{$s.id}">
-        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
-      </a>
+    <td class="half" style="clear: both">
+      <a href="survey/vote/{$s.id}">{$s.title}</a>
+      {if $s.uid eq $smarty.session.user->id() || hasPerm('admin')}
+      (<a href="survey/result/{$s.id}">résultats partiels</a>)
+      {/if}
+    </td>
+    <td>
+      {$s.end|date_format:"%x"}
+    </td>
+    <td>
+      {$survey_modes[$s.mode]}
     </td>
   </tr>
     {assign var="has_cs" value="true"}
   {/if}
   {/iterate}
-  <tr class="impair"> 
-    <td class="half">
-      {if !$has_cs}Aucun sondage en cours{/if}
-      {if $smarty.session.auth}<a style="display: block; float: right;" href="survey/edit/new">{icon name=page_edit} Proposer un sondage</a>{/if}
-    </td> 
-  </tr> 
+  <tr class="impair">
+    <td colspan="3" style="text-align: right">
+      {if $smarty.session.auth}<a href="survey/edit/new">{icon name=page_edit} Proposer un sondage</a>{/if}
+    </td>
+  </tr>
 </table>
+{/if}
 
 <br />
 
 <table class="bicol">
   <tr>
-    <th>
+    <th colspan="3">
       Anciens sondages
     </th>
   </tr>
   {iterate item=s from=$survey_old}
-    {if $smarty.session.auth || $s.mode == Survey::MODE_ALL}
+    {if $smarty.session.auth || $s.mode == $SurveyMODE_ALL}
   <tr class="{cycle name=os_cycle values="impair,pair"}">
-    <td class="half">
-      &bull;
+    <td>
       <a href="survey/result/{$s.id}">
-        {$s.title} [{$s.end|date_format:"%x"} - {$survey_modes[$s.mode]}]
+        {$s.title}
       </a>
     </td>
+    <td>
+      {$s.end|date_format:"%x"}
+    </td>
+    <td>
+      {$survey_modes[$s.mode]}
+    </td>
   </tr>
       {assign var="has_os" value="true"}
     {/if}