diogenes update backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.5--patch-14
   Jeremy, next time you do this, i'll beat you ;p

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-620

diff --git a/templates/table-editor.tpl b/templates/table-editor.tpl
index 8ee2fc9..2b800e8 100644 (file)
--- a/templates/table-editor.tpl
+++ b/templates/table-editor.tpl
@@ -72,9 +72,9 @@
   </td>
 </tr>
 {/if}
-{foreach from=$rows item=myrow}{assign var="myarr" value=$myrow[2]}
+{foreach from=$rows item=myrow}{assign var="myarr" value=$myrow[1]}
 <tr class="{cycle values="pair,impair"}">
-  {if $idsum}<td>{$myrow[1]}</td>{/if}
+  {if $idsum}<td>{$myrow[0]}</td>{/if}
 {foreach from=$vars key=mykey item=myval}
 {if $myval.sum}
   <td>
@@ -93,19 +93,25 @@
   {if !$hideactions}
   <td class="action">
     {if !$readonly}
-    <a href="javascript:edit('{$myrow[1]}');">edit</a>
-    <a href="javascript:del('{$myrow[1]}');">delete</a>
+    <a href="javascript:edit('{$myrow[0]}');">edit</a>
+    <a href="javascript:del('{$myrow[0]}');">delete</a>
     {/if}
-    {foreach from=$myrow[3] item=myaction}
+    {foreach from=$myrow[2] item=myaction}
     {a lnk=$myaction}
     {/foreach}
   </td>
   {/if}
 </tr>
 {/foreach}
-
 </table>
 
+{if ($p_prev > -1) || ($p_next > -1)}
+<p class="pagenavigation">
+{if $p_prev > -1}<a href="?start={$p_prev}">{$msg_previous_page}</a>&nbsp;{/if}
+{if $p_next > -1}<a href="?start={$p_next}">{$msg_next_page}</a>{/if}
+</p>
+{/if}
+
 {else}
 
 <form method="post" action="{$smarty.server.PHP_SELF}">
@@ -128,6 +134,7 @@
         {if $myval.type=="password"}<br /><em>(blank=no change)</em>{/if}
       </td>
       <td>
+        {if $myval.edit}
         {if $myval.type=="textarea"}
         <textarea name="{$prefix}{$mykey}" rows="10" cols="70">{$myval.value}</textarea>
         {elseif $myval.type=="set"}
@@ -145,6 +152,9 @@
         {else}
         <input type="{$myval.type}" name="{$prefix}{$mykey}" size="40" value="{$myval.value}" />
         {/if}
+        {else}
+        {$myval.value|escape}
+        {/if}
       </td>
     </tr>
     {/foreach}