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

diff --git a/templates-dist/de/schwerpunkt.template b/templates-dist/de/schwerpunkt.template
index de16460..cfb783a 100755 (executable)
--- a/templates-dist/de/schwerpunkt.template
+++ b/templates-dist/de/schwerpunkt.template
@@ -9,24 +9,24 @@ indymedia.de | feature
 <include "head.template">
 
 <table border="0">
-  <form method="post" action="${actionRoot}">
+  <form method="post" action="${config.actionRoot}">
     <input type="hidden" name="module" value="Schwerpunkt">
-    <input type="hidden" name="where" value="${where}">
-    <input type="hidden" name="offset" value="${offset}">
-    <input type="hidden" name="order" value="${order}">
-    <if new>
+    <input type="hidden" name="where" value="${data.where}">
+    <input type="hidden" name="offset" value="${data.offset}">
+    <input type="hidden" name="order" value="${data.order}">
+    <if data.new>
     <input type="hidden" name="do" value="insert">
     <else>
     <input type="hidden" name="do" value="update">
     </if>
-    <input type="hidden" name="id" value="${id}">
+    <input type="hidden" name="id" value="${data.id}">
     <tr>
       <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Titel:</B></font></td>
       <td>
-        <input type="text" size="40" name="title" value="${title}">
+        <input type="text" size="40" name="title" value="${data.title}">
         <select name="is_published">
-                       <option value="1"<if is_published!="0">selected</if>>freigeschaltet</option>
-                       <option value="0" <if is_published=="0">selected</if>>nicht freigesch.</option>
+                       <option value="1"<if data.is_published!="0">selected</if>>freigeschaltet</option>
+                       <option value="0" <if data.is_published=="0">selected</if>>nicht freigesch.</option>
         </select>
       </td>
     </tr>
@@ -34,26 +34,26 @@ indymedia.de | feature
     <tr>
       <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Filename:</B></font></td>
       <td>
-         <input type="text" size="20" name="filename" value="${filename}">
+         <input type="text" size="20" name="filename" value="${data.filename}">
       </td>
     </tr>
 
     <tr>
       <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Abstract:</B></font></td>
       <td>
-        <textarea cols="40" rows="3" name="description">${description}</textarea>
+        <textarea cols="40" rows="3" name="description">${data.description}</textarea>
       </td>
     </tr>
 
     <tr>
       <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Link:</B></font></td>
       <td>
-        <input type="text" size="40" name="main_url" value="${main_url}">
+        <input type="text" size="40" name="main_url" value="${data.main_url}">
       </td>
     </tr>
     <tr>
       <td colspan="2" align="right" valign="top" bgcolor="#ffffff"> <font color="#ffffff"><if new>
-        <input type="submit" name="save" value="einfügen">
+        <input type="submit" name="save" value="einf&uuml;gen">
         <else>
         <input type="submit" name="save" value="speichern">
         </if></font></td>

diff --git a/templates-dist/de/schwerpunktlist.template b/templates-dist/de/schwerpunktlist.template
index 025ef9d..9e73f03 100755 (executable)
--- a/templates-dist/de/schwerpunktlist.template
+++ b/templates-dist/de/schwerpunktlist.template
@@ -7,7 +7,7 @@
 <include "head.template">
 
 
-<if contentlist>
+<if data.contentlist>
 <table border="0">
   <tr bgcolor="#006600">
     <td><font color="#ffffff">frei</font></td>
@@ -16,7 +16,7 @@
     <td><font color="#ffffff">Link</font></td>
     <td><font color="#ffffff">Abstract</font></td>
   </tr>
-  <list contentlist as entry>
+  <list data.contentlist as entry>
   <tr
   <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
@@ -32,23 +32,23 @@
   <tr>
     <td align="center" colspan="5" bgcolor="#006600">
       <div align="left"><font color="#ffffff">${count} datens&auml;tze / anzeige
-        von ${from} bis ${to}</font></div>
+        von ${data.from} bis ${data.to}</font></div>
     </td>
-    <td><a href="${docRoot}"><font size="1">&nbsp;zur&uuml;ck</font></a></td>
+    <td><a href="${config.docRoot}"><font size="1">&nbsp;zur&uuml;ck</font></a></td>
   </tr>
 </table>
 
       <P>
 <if (prev || next)>
- <form method="post" action="${actionRoot}">
+ <form method="post" action="${config.actionRoot}">
  <input type="hidden" name="module" value="Schwerpunkt">
- <input type="hidden" name="where" value="${where}">
+ <input type="hidden" name="where" value="${data.where}">
 <if prev>
- <input type="hidden" name="prevoffset" value="${prev}">
+ <input type="hidden" name="prevoffset" value="${data.prev}">
  <input type="submit" name="prev" value="zur&uuml;ck">
 </if>
 <if next>
- <input type="hidden" name="nextoffset" value="${next}">
+ <input type="hidden" name="nextoffset" value="${data.next}">
  <input type="submit" name="next" value="weiter">
 </if>
  </form>