From: cvs <cvs>
Date: Sat, 30 Mar 2002 17:25:39 +0000 (+0000)
Subject: data, config and other bugfixes
X-Git-Tag: prexmlproducerconfig~176
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=bf032101d4e4f2204a3be74caaf11796b30dfd0e;p=mir.git

data, config and other bugfixes
---

diff --git a/templates-dist/admin/confirm.template b/templates-dist/admin/confirm.template
index 86977b97..1343d85b 100755
--- a/templates-dist/admin/confirm.template
+++ b/templates-dist/admin/confirm.template
@@ -12,7 +12,7 @@
   </tr>
   <tr> 
     <td colspan="2">
-      <form method="post" action="${actionRoot}">
+      <form method="post" action="${config.actionRoot}">
         <div align="center">
           <input type="hidden" name="module" value=${data.module}>
           <input type="hidden" name="do" value="delete">
diff --git a/templates-dist/admin/content.template b/templates-dist/admin/content.template
index c14a50bb..58c58e03 100755
--- a/templates-dist/admin/content.template
+++ b/templates-dist/admin/content.template
@@ -61,8 +61,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<select name="to_topic" size="5" multiple>
 
 		<list extra.themenPopupData as t>
-
-		<option value="${t.key}" <list data.to_topics as to><if (t.key == to)>selected</if></list>>${t.value}</option>
+		<option value="${t.key}" <list data.to_topics as to><if (t.key == to["id"])>selected</if></list>>${t.value}</option>
 		</list>
 
 		</select>
diff --git a/templates-dist/admin/contentlist.template b/templates-dist/admin/contentlist.template
index 86765c1b..ad33e6c0 100755
--- a/templates-dist/admin/contentlist.template
+++ b/templates-dist/admin/contentlist.template
@@ -32,15 +32,15 @@
 	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>
 			<font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${entry.place}: </if>${entry.title}</b><br>
 			${entry.creator}&nbsp;
-			<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">${lang("edit")}</a>
-			<if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">newswire</a></if></font></td>
+			<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">${lang("edit")}</a>
+			<if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">newswire</a></if></font></td>
 	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
 			<if entry.thema_id!="0">${themenHashData[entry.thema_id]["name"]}</if>&nbsp;<br>
 			<if entry.to_feature!="0">${schwerpunktHashData[entry.to_feature]["title"]}</if>&nbsp;</font></td>
 	    <td width="20%" <if grey=="1">bgcolor="Pink"<else>bgcolor="Yellow"</if> valign="top"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
 			${entry.comment}&nbsp;</font></td>
 	    <td bgcolor="#888888"><font size="1">
-  	      <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">${lang("delete")}</a>
+  	      <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">${lang("delete")}</a>
 	      </font></td>
 	</tr>
 	</list>
@@ -73,4 +73,4 @@
 
 <include "admin/foot.template">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/templates-dist/admin/topiclist.template b/templates-dist/admin/topiclist.template
index c5fd9c85..8254401a 100755
--- a/templates-dist/admin/topiclist.template
+++ b/templates-dist/admin/topiclist.template
@@ -36,7 +36,7 @@
 <if (data.prev || data.next)>
  <form method="post" action="${config.actionRoot}">
  <input type="hidden" name="module" value="Topics">
- <input type="hidden" name="where" value="${where}">
+ <input type="hidden" name="where" value="${data.where}">
 <if data.prev>
  <input type="hidden" name="prevoffset" value="${prev}">
  <input type="submit" name="prev" value="${lang("list.previous")}">