From e996f2504a549a7367adf217882e5576ae521b88 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Thu, 24 Jun 2010 22:59:01 +0200
Subject: [PATCH] Removes useless links on post-edit admin of surveys. Uses alt
 and titles in icon to lighten interface. Closes #1119

---
 ChangeLog                      |  1 +
 templates/survey/show_root.tpl | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d060c8e..00bd747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ Bug/Wish:
         - #993: Enables survey for oranges                                 -Car
         - #1002: Lets the user set promo interval in both ways             -Car
         - #967: Lets admin see surveys even when not in targeted promos    -Car
+        - #1119: Removes useless links on post-edit admin page             -Car
 
     * XnetGrp:
         - #1086: Fixes view members of group even if not in group          -Car
diff --git a/templates/survey/show_root.tpl b/templates/survey/show_root.tpl
index e8aa9c1..0b18177 100644
--- a/templates/survey/show_root.tpl
+++ b/templates/survey/show_root.tpl
@@ -68,8 +68,8 @@
     {/if}
     {if $survey_editmode}
     <td style="width: 30%">
-      <a href='survey/edit/question/root'>{icon name=page_edit} Modifier la description</a>
-      {if $survey_editallmode}<br /><a href='survey/edit/add/0'>{icon name=add} Ajouter une question au début</a>{/if}
+      <a href='survey/edit/question/root'>{icon name=page_edit alt="Modifier" title="Modifier la description"}</a>
+      {if $survey_editallmode}<br /><a href='survey/edit/add/0'>{icon name=add title="Ajouter une question au début" alt="Ajouter"}</a>{/if}
     </td>
     {/if}
   </tr>
@@ -81,9 +81,9 @@
     </td>
     {if $survey_editallmode}
     <td class="smaller" style="width: 30%; vertical-align: middle">
-      <a href='survey/edit/question/{$squestion.id}'>{icon name=page_edit} Modifier cette question</a><br />
-      <a href='survey/edit/del/{$squestion.id}'>{icon name=delete} Supprimer cette question</a><br />
-      <a href='survey/edit/add/{$squestion.id+1}'>{icon name=add} Ajouter une question après</a>
+      <a href='survey/edit/question/{$squestion.id}'>{icon name=page_edit title="Modifier cette question" alt="Modifier"}</a><br />
+      <a href='survey/edit/del/{$squestion.id}'>{icon name=delete title="Supprimer cette question" alt="Supprimer"}</a><br />
+      <a href='survey/edit/add/{$squestion.id+1}'>{icon name=add title="Ajouter une question après" alt="Ajouter"}</a>
     </td>
     {/if}
   </tr>
@@ -91,14 +91,14 @@
   {/if}
 </table>
 <p class="center">
-  {if $survey_editmode}
+  {if $survey_editmode && !$survey_updatemode}
   <a href='survey/edit/valid'>
     {icon name=tick}
-    {if $survey_updatemode}Enregistrer les modifications{else}Proposer ce sondage{/if}
+    Proposer ce sondage
   </a> |
   <a href='survey/edit/cancel'>
-    {icon name=cross} Annuler
-    {if $survey_updatemode}les modifications{else}totalement la création de ce sondage{/if}
+    {icon name=cross}
+    Annuler totalement la création de ce sondage
   </a>
   {elseif $survey_adminmode}
   {if !$survey.valid}<a href="survey/admin/valid/{$survey.id}">Valider ce sondage</a> | {/if}
-- 
2.1.4