templateModelRoot ist now a simplehash with two entries: data and config, bugfix...
authoridfx <idfx>
Sun, 17 Mar 2002 19:17:56 +0000 (19:17 +0000)
committeridfx <idfx>
Sun, 17 Mar 2002 19:17:56 +0000 (19:17 +0000)
templates-dist/de/bilder.template
templates-dist/de/bilderlist.template

index 2464b5f..195f18c 100755 (executable)
@@ -6,37 +6,37 @@ indymedia.de | image
 <head>
 <SCRIPT LANGUAGE="JavaScript">
 function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${img_height},width=${img_width}");   
+   window.open(url,"vc","scrollbars=0,height=${data.img_height},width=${data.img_width}");   
 }
 </SCRIPT>
 <body bgcolor="#FFFFFF">
 <include "head.template">
 
 
-<form enctype="multipart/form-data" method="post" action="${actionRoot}?module=Images&do=<if new>insert<else>update</if>&id=${id}">
-<if icon_data=="" || icon_data=="0">
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Images&do=<if data.new>insert<else>update</if>&id=${data.id}">
+<if data.icon_data=="" || data.icon_data=="0">
        <INPUT TYPE="file" NAME="mptest">
 </if>
 
-       <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="id" value="${id}">
+       <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}">
        
        <table border="0">      
        <tr> 
     <td align="right" bgcolor="#006600">
-               <if (icon_data!="" && icon_data!="0") && !new>
+               <if (data.icon_data!="" && data.icon_data!="0") && !new>
                <font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-               <a href="JavaScript:openWin('${actionRoot}?module=Images&do=showimg&id=${id}')">
-               <img src="${actionRoot}?module=Images&do=showicon&id=${id}" border=0></a></font></td>
+               <a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=showimg&id=${data.id}')">
+               <img src="${config.actionRoot}?module=Images&do=showicon&id=${data.id}" border=0></a></font></td>
                </if>
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
-               erzeugt: ${webdb_create} <if webdb_lastchange>/ geaendert ${webdb_lastchange}</if><br>
-               <if is_published=="1">publiziert: ${publish_date} / ${publish_server}${publish_path}<br></if>
-               format: ${img_width}x${img_height} / ${imgformatHashdata[to_img_format]["name"]} / ${imglayoutHashdata[to_img_layout]["name"]} /  ${imgcolorHashdata[to_img_color]["name"]}<br>
-               rechte: <b>${rightsHashdata[to_rights]["name"]}</b><br>
-               bildtyp: <b>${imgtypeHashdata[to_img_type]["name"]}</b><br>
+               erzeugt: ${data.webdb_create} <if data.webdb_lastchange>/ geaendert ${data.webdb_lastchange}</if><br>
+               <if data.is_published=="1">publiziert: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+               format: ${data.img_width}x${data.img_height} / ${data.imgformatHashdata[to_img_format]["name"]} / ${data.imglayoutHashdata[to_img_layout]["name"]} /  ${data.imgcolorHashdata[to_img_color]["name"]}<br>
+               rechte: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
+               bildtyp: <b>${data.imgtypeHashdata[to_img_type]["name"]}</b><br>
        </td>
        </tr>
        
@@ -45,8 +45,8 @@ function openWin(url) {
         <B>Mediennmappe:</B></font></td>
     <td>
                <select name="to_media_folder">
-               <list mediafolderPopupData as m>
-               <option value="${m.key}" <if m.key == to_media_folder>selected</if>>${m.value}</option>
+               <list data.mediafolderPopupData as m>
+               <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
                </list>
            </select>
        </td>
@@ -56,56 +56,56 @@ function openWin(url) {
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>titel:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${title}"></td>
+    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
        </tr>
 
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>beschreibung:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="description" value="${description}"></td>
+    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
        </tr>
   
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>datum/zusatz:</B></font></td>
-    <td><input type="text" size="8" maxlength="8" name="date" value="${date}">
-               <input type="text" size="20" maxlength="40" name="year" value="${year}"></td>
+    <td><input type="text" size="8" maxlength="8" name="date" value="${data.date}">
+               <input type="text" size="20" maxlength="40" name="year" value="${data.year}"></td>
        </tr>
        
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>ort:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="place" value="${place}"></td>
+    <td><input type="text" size="40" maxlength="80" name="place" value="${data.place}"></td>
        </tr>
   
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>uhrheber:</B></font></td>
     <td>
-               <input type="text" size="40" maxlength="80" name="creator" value="${creator}">
+               <input type="text" size="40" maxlength="80" name="creator" value="${data.creator}">
        </tr>
 
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>stichworte:</B></font></td>
-    <td><textarea cols="40" rows="2" name="keywords">${keywords}</textarea></td>
+    <td><textarea cols="40" rows="2" name="keywords">${data.keywords}</textarea></td>
        </tr>
 
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>kommentar:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${comment}</textarea></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
        </tr>
 
        <tr> 
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>quelle:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="source" value="${source}"></td>
+    <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
        </tr>
        <tr> 
     <td colspan="2" align="right"> <font color="black">
-       zur Ver&ouml;ffentlichung freigeben <input type="checkbox" name="is_published" value="1"<if is_published!="0" && is_published!=""> checked</if>>
-       <if new> 
+       zur Ver&ouml;ffentlichung freigeben <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+       <if data.new> 
       <input type="submit" name="save" value="einfügen">
     <else> 
     <input type="submit" name="save" value="speichern">
index c3b98a4..d585b34 100755 (executable)
@@ -8,10 +8,10 @@
 
 <table border="0" cellpadding="2" cellspacing="1">
   <tr>
-    <td colspan="5"><form method="post" action="${actionRoot}">
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
        <input type="hidden" name="module" value="Images">
        <input type="hidden" name="do" value="list">
-       <input type="hidden" name="cid" value="${cid}">
+       <input type="hidden" name="cid" value="${data.cid}">
        <table border="0">
        <tr bgcolor="Pink">
                <td>Text suchen in:</td>
        
        <tr>
        <td>
-               <input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
+               <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="place"<if query_field=="place"> selected</if>>Ort</option>
-               <option value="keywords"<if query_field=="keywords"> selected</if>>Stichworte</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="place"<if data.query_field=="place"> selected</if>>Ort</option>
+               <option value="keywords"<if data.query_field=="keywords"> selected</if>>Stichworte</option>
        </select>
        </td>
        <td>
                <select name="query_is_published">
                    <option value="">egal</option>
-               <option value="0" <if query_is_published=="0"> selected</if>>nein</option>
-                   <option value="1" <if query_is_published=="1"> selected</if>>ja</option>
+               <option value="0" <if data.query_is_published=="0"> selected</if>>nein</option>
+                   <option value="1" <if data.query_is_published=="1"> selected</if>>ja</option>
            </select>
        </td>
        <td>
        <select name="query_media_folder">
-       <list mediafolderPopupData as m>
+       <list data.mediafolderPopupData as m>
        <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>urheber</b></font></td>
   </tr>
-  <if contentlist>
-  <list contentlist as entry>
+  <if data.contentlist>
+  <list data.contentlist as entry>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
   <td>
        <if entry.icon_data!="" && entry.icon_data!="0">
-       <a href="${actionRoot}?module=Images&do=showimg&id=${entry.id}" target="new">
-         <img src="${actionRoot}?module=Images&do=showicon&id=${entry.id}" border=0></a></font></td>
+       <a href="${config.actionRoot}?module=Images&do=showimg&id=${entry.id}" target="new">
+         <img src="${config.actionRoot}?module=Images&do=showicon&id=${entry.id}" border=0></a></font></td>
        </if>
   <td>${entry.title}&nbsp;
-         <if decription><br>${description}</if></td>
-  <td>${mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
+         <if entry.decription><br>${entry.description}</if></td>
+  <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
-       <if cid><a href="${actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${cid}">attach</a>
+       <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">attach</a>
        <else>
-       <a href="${actionRoot}?module=Images&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Images&do=edit&id=${entry.id}">edit</a> 
+       <a href="${config.actionRoot}?module=Images&do=delete&id=${entry.id}">delete</a>
+    | <a href="${config.actionRoot}?module=Images&do=edit&id=${entry.id}">edit</a> 
        </if>
        </font></td>
   </tr>
   </list>
   <tr>
-    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${count} datens&auml;tze
-      / anzeige von ${from} bis ${to}</font></td>
+    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${data.count} datens&auml;tze
+      / anzeige von ${data.from} bis ${data.to}</font></td>
     <td>&nbsp;</td>
   </tr>
 
 <tr><td>
-<if prev>
-       <a href="${actionRoot}?module=Images&do=list&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&cid=${cid}">zurueck</a>&nbsp;
+<if data.prev>
+       <a href="${config.actionRoot}?module=Images&do=list&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&cid=${data.cid}">zurueck</a>&nbsp;
 </if>
 <if next>
-<a href="${actionRoot}?module=Images&do=list&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&cid=${cid}">weiter</a>
+<a href="${config.actionRoot}?module=Images&do=list&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&cid=${data.cid}">weiter</a>
 </if>
 </td></tr>
 <else>