--- MPIWGWeb/zpt/Attic/editTalks.zpt	2005/10/18 12:59:51	1.1.2.2
+++ MPIWGWeb/zpt/Attic/editTalks.zpt	2008/08/26 15:01:41	1.1.2.7
@@ -2,74 +2,65 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html metal:use-macro="here/mainEditFile/macros/page">
 <body>
-  <tal:block metal:fill-slot="navsel" tal:define="global selected python:'talks'"/>
+<tal:block metal:fill-slot="navsel" tal:define="global menusel string:talks" />
 
 <tal:block metal:fill-slot="body" tal:define="yes_no_list python:'yes\nno'">
-   <form action="changeResearch" method="post">
-     <input type="hidden" name="id_main" tal:attributes="value person/id">
-     <input type="hidden" name="main_fields" value="talks__title">
-     <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='talks',id_main=person.id)">
-	  <tr class="fliesstext" tal:repeat="found2 python:here.sortPriority(founds2)">
-            <td valign="top">
-	      <input tal:attributes="name python:'talks__date__'+str(found2.oid); 
-				     value found2/date" size="10"/>
-	    </td>
-
-            <td>
-	      <input tal:attributes="name python:'talks__title__'+str(found2.oid); 
-				     value found2/title" size="80"/>
-
-            <br>
-	      <input tal:attributes="name python:'talks__place__'+str(found2.oid); 
-				     value found2/place" size="80"/>
-            <br>
-	      <input tal:attributes="name python:'talks__link__'+str(found2.oid); 
-				     value found2/link" size="80"/>
-
-	    </td>
-
-	    <td valign="top">
-	      <input tal:attributes="name python:'talks__priority__'+str(found2.oid);
-				     value found2/priority" size="3"/>
-	    </td>
-	    <td valign="top" tal:content="structure python:here.ZSQLSelectionFromCRList(
+  <form action="changeResearch" method="post">
+  <input type="hidden" name="key_main" tal:attributes="value python:here.decode(person.key)">
+  <input type="hidden" name="main_fields" value="talks__title">
+  <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='talks',key_main=person.key)">
+    <tr>
+      <th>Date</th>
+      <th>Title/Place/Link</th>
+      <th>Priority</th>
+      <th>Show</th>
+    </tr>
+    <tr class="fliesstext" tal:repeat="found2 python:here.sortPriority(founds2)">
+      <td valign="top">
+        <input tal:attributes="name python:'talks__date__'+str(found2.oid); 
+				     value found2/date" size="10" />
+      </td>
+      <td>
+        <input tal:attributes="name python:'talks__title__'+str(found2.oid); 
+				     value python:here.decode(found2.title)" size="80" /><br>
+        <input tal:attributes="name python:'talks__place__'+str(found2.oid); 
+				     value python:here.decode(found2.place)" size="80" /><br>
+        <input tal:attributes="name python:'talks__link__'+str(found2.oid); 
+				     value python:here.decode(found2.link)" size="80" />
+      </td>
+      <td valign="top">
+        <input tal:attributes="name python:'talks__priority__'+str(found2.oid); value found2/priority" size="3" />
+      </td>
+      <td valign="top"
+        tal:content="structure python:here.ZSQLSelectionFromCRList(
 			     'talks__published__'+str(found2.oid),
 			     yes_no_list,
 			     boxType='radio',
-			     checked=found2.published)"/>
-	    <td>
-	      <a tal:attributes="href python:'deleteField?table=talks&oid=%s'%found2.oid">delete</a>
-	    </td>
-	 </tr>
-	 <tr colspan="4">
-	   <td>Add new</td>
-	 </tr>
-	 <tr>
-	   <td valign="top">
-	      <input tal:attributes="name python:'talks__date__new'" size="10"/>
-	    </td>
-	   <td>
-	      <input tal:attributes="name python:'talks__title__new'" size="80">
-	      <br>
-	      <input tal:attributes="name python:'talks__place__new'" size="80"/>
-              <br>
-	      <input tal:attributes="name python:'talks__link__new'" size="80"/>
-
-
-	   </td>
-	   <td>
-	      <input tal:attributes="name python:'talks__priority__new'" size="3">
-	   </td>
-	   <td valign="top" tal:content="structure python:here.ZSQLSelectionFromCRList(
+			     checked=found2.published)" />
+      <td>
+        <a tal:attributes="href python:'deleteField?table=talks&oid=%s'%found2.oid">delete</a>
+      </td>
+    </tr>
+    <tr colspan="4">
+      <td>Add new</td>
+    </tr>
+    <tr>
+      <td valign="top"><input tal:attributes="name python:'talks__date__new'" size="10" /></td>
+      <td><input tal:attributes="name python:'talks__title__new'" size="80"> <br>
+      <input tal:attributes="name python:'talks__place__new'" size="80" /> <br>
+      <input tal:attributes="name python:'talks__link__new'" size="80" /></td>
+      <td><input tal:attributes="name python:'talks__priority__new'" size="3"></td>
+      <td valign="top"
+        tal:content="structure python:here.ZSQLSelectionFromCRList(
 			     'talks__published__new',
 			     yes_no_list,
 			     boxType='radio',
-			     checked='yes')"/>
-	 </tr>
-      </table>
-      <input type="submit" value="submit">
-  
-     </form>
+			     checked='yes')" />
+    </tr>
+  </table>
+  <input type="submit" value="submit">
+
+  </form>
 </tal:block>
 </body>
 </html>
