templateModelRoot ist now a simplehash with two entries: data and config, bugfix...

diff --git a/templates-dist/de/comment.template b/templates-dist/de/comment.template
index b7b6810..d7245cc 100755 (executable)
--- a/templates-dist/de/comment.template
+++ b/templates-dist/de/comment.template
@@ -10,11 +10,11 @@ indymedia.de | comment
 
 <form method="post" action="${config.actionRoot}">
        <input type="hidden" name="module" value="Comment">
-       <input type="hidden" name="where" value="${where}">
-       <input type="hidden" name="offset" value="${offset}">
-       <input type="hidden" name="order" value="${order}">
+       <input type="hidden" name="where" value="${data.where}">
+       <input type="hidden" name="offset" value="${data.offset}">
+       <input type="hidden" name="order" value="${data.order}">
        <input type="hidden" name="id" value="${data.id}">
-       <input type="hidden" name="date" value="${date}">
+       <input type="hidden" name="date" value="${data.date}">
        <input type="hidden" name="to_media" value="${data.to_media}">
        <if new> <input type="hidden" name="do" value="insert">
        <else>   <input type="hidden" name="do" value="update">
@@ -25,7 +25,7 @@ indymedia.de | comment
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>datum:</B></font></td>
-    <td>${date}</td>
+    <td>${data.date}</td>
        </tr>
        
        <tr> 

diff --git a/templates-dist/de/commentlist.template b/templates-dist/de/commentlist.template
index 501b920..4fa64ae 100755 (executable)
--- a/templates-dist/de/commentlist.template
+++ b/templates-dist/de/commentlist.template
@@ -13,21 +13,21 @@
         <form method="post" action="${config.actionRoot}">
        <input type="hidden" name="module" value="Comment">
        <input type="hidden" name="do" value="list">
-       <input type="hidden" name="offset" value="${offset}">
-       <input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
+       <input type="hidden" name="offset" value="${data.offset}">
+       <input type="text" size="10" maxlength="20" name="query_text" value="${data.query_text}">
        <select name="query_field">
-    <option value="title"<if query_field=="title"> selected</if>>Titel</option>
-    <option value="creator"<if query_field=="creator"> selected</if>>Urbheber</option>
-    <option value="description"<if query_field=="description"> selected</if>>Inhalt</option>
+    <option value="title"<if data.query_field=="title"> selected</if>>Titel</option>
+    <option value="creator"<if data.query_field=="creator"> selected</if>>Urbheber</option>
+    <option value="description"<if data.query_field=="description"> selected</if>>Inhalt</option>
     </select>
        <select name="query_is_published">
     <option value="">--</option>
-    <option value="0" <if query_is_published=="0"> selected</if>>versteckt</option>
-    <option value="1" <if query_is_published=="1"> selected</if>>produziert</option>
+    <option value="0" <if data.query_is_published=="0"> selected</if>>versteckt</option>
+    <option value="1" <if data.query_is_published=="1"> selected</if>>produziert</option>
     </select>
     <select name="order">
-    <option value="webdb_create" <if order=="webdb_create"> selected</if>>uhrzeit</option>
-    <option value="articletitle" <if order=="articletitle"> selected</if>>artikeltitel</option>
+    <option value="webdb_create" <if data.order=="webdb_create"> selected</if>>uhrzeit</option>
+    <option value="articletitle" <if data.order=="articletitle"> selected</if>>artikeltitel</option>
     </select>
        <input type="submit" name="search" value="go!">
        </form>
@@ -58,7 +58,7 @@
        
        <td>
                <font size="-1">${entry.description}</font>
-               <a href="${config.actionRoot}?module=Comment&do=edit&order=${order}&offset=${offset}&id=${entry.id}">edit</a>
+               <a href="${config.actionRoot}?module=Comment&do=edit&order=${data.order}&offset=${data.offset}&id=${entry.id}">edit</a>
        </td>
 
        <td>
@@ -78,10 +78,10 @@
   </tr>
 <tr><td>
 <if prev>
-<a href="${config.actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
+<a href="${config.actionRoot}?module=Comment&do=list&order=${data.order}&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
 </if>
-<if next>
-<a href="${actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${next}&next=weiter">weiter</a>
+<if data.next>
+<a href="${config.actionRoot}?module=Comment&do=list&order=${data.order}&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.next}&next=weiter">weiter</a>
 </if>
 </td></tr>
 <else>

diff --git a/templates-dist/de/confirm.template b/templates-dist/de/confirm.template
index d0e8ff2..6be1df5 100755 (executable)
--- a/templates-dist/de/confirm.template
+++ b/templates-dist/de/confirm.template
@@ -15,12 +15,12 @@
     <td colspan="2">
       <form method="post" action="${actionRoot}">
         <div align="center">
-          <input type="hidden" name="module" value=${module}>
+          <input type="hidden" name="module" value=${data.module}>
           <input type="hidden" name="do" value="delete">
-          <input type="hidden" name="id" value="${id}">
-          <input type="hidden" name="where" value="${where}">
-          <input type="hidden" name="order" value="${order}">
-          <input type="hidden" name="offset" value="${offset}">
+          <input type="hidden" name="id" value="${data.id}">
+          <input type="hidden" name="where" value="${data.where}">
+          <input type="hidden" name="order" value="${data.order}">
+          <input type="hidden" name="offset" value="${data.offset}">
           <input type="submit" name="cancel" value="abbrechen">
           <input type="submit" name="confirm" value="l&ouml;schen">
         </div>

diff --git a/templates-dist/fehler.template b/templates-dist/fehler.template
index 361d1d0..78954d2 100755 (executable)
--- a/templates-dist/fehler.template
+++ b/templates-dist/fehler.template
@@ -20,7 +20,7 @@
        <tr>
                <td>
                        <p>
-                       <p align="center"><font size="3" color="Red">${date} -- ${errorstring}</font>
+                       <p align="center"><font size="3" color="Red">${data.date} -- ${data.errorstring}</font>
                        <p>
                </td>
        </tr>