--- MPIWGWeb/zpt/Attic/editMPIWGStaff.zpt	2008/08/20 09:40:57	1.1.2.6
+++ MPIWGWeb/zpt/Attic/editMPIWGStaff.zpt	2011/05/18 10:52:29	1.1.2.10
@@ -7,90 +7,33 @@
 <tal:block metal:fill-slot="navsel" tal:define="global menusel string:research" />
 <tal:block metal:fill-slot="body" tal:define="yes_no_list python:'yes\nno'">
 
-  <form action="changeResearch" method="post">
-  <input type="hidden" name="key_main" tal:attributes="value person/key">
-  <input type="hidden" name="main_fields" value="current_work__current,research_interest__interest">
-  <h3>Short entry</h3>
+  <form action="changeCurrentWork" method="post">
+  <input type="hidden" name="key" tal:attributes="value person/key"/>
+   <h3>Short entry</h3>
   <p>This entry appears only in the staff lists at: <a href="../staff/fullist.html">Fullist</a> and the
-  lists of members of you department. Maximal 2 entries will occur there.</p>
-  <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='current_work',key_main=person.key)">
+  lists of members of you department</p>
+  <table tal:define="found2 python:person">
     <tr>
       <th />
-      <th>Priority</th>
       <th>Show</th>
     </tr>
-    <tr class="fliesstext" tal:repeat="found2 python:here.sortPriority(founds2)">
-      <td><input tal:attributes="name python:'current_work__current__'+str(found2.oid); 
-				     value found2/current" size="80" />
-      </td>
-      <td><input tal:attributes="name python:'current_work__priority__'+str(found2.oid);
-				     value found2/priority" size="3" />
+    <tr class="fliesstext">
+      <td><input tal:attributes="name python:'current_work';
+				     value python:here.decode(found2.current_work)" size="80" />
       </td>
       <td
         tal:content="structure python:here.ZSQLSelectionFromCRList(
-			     'current_work__publish__'+str(found2.oid),
+			     'publish',
 			     yes_no_list,
 			     boxType='radio',
-			     checked=found2.publish)" />
-      <td><a tal:attributes="href python:'deleteField?table=current_work&oid=%s'%found2.oid">delete</a></td>
-    </tr>
-    <tr colspan="4">
-      <td>Add new</td>
-    </tr>
-    <tr>
-      <td><input tal:attributes="name python:'current_work__current__new'" size="80"></td>
-      <td><input tal:attributes="name python:'current_work__priority__new'" size="3"></td>
-      <td
-        tal:content="structure python:here.ZSQLSelectionFromCRList(
-			     'current_work__publish__new',
-			     yes_no_list,
-			     boxType='radio',
-			     checked='yes')" />
+			     checked=found2.current_work_p)" />
     </tr>
   </table>
-  <input type="submit" value="submit">
+  <input type="submit" value="submit"/>
  
   <h3>Research interests</h3>
-  <p>This entry isn't displayed anymore, please describe your research interes in you <a href="editProfile">Profile</a></p>
-<!--  
-  <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='research_interest',key_main=person.key)">
-    <tr>
-      <th />
-      <th>Priority</th>
-      <th>Show</th>
-    </tr>
-    <tr class="fliesstext" tal:repeat="found2 python:here.sortPriority(founds2)">
-      <td><input tal:attributes="name python:'research_interest__interest__'+str(found2.oid); 
-				     value found2/interest"
-        size="80" /></td>
-      <td><input tal:attributes="name python:'research_interest__priority__'+str(found2.oid);
-				     value found2/priority"
-        size="3" /></td>
-      <td
-        tal:content="structure python:here.ZSQLSelectionFromCRList(
-			     'research_interest__published__'+str(found2.oid),
-			     yes_no_list,
-			     boxType='radio',
-			     checked=found2.published)" />
-      <td><a tal:attributes="href python:'deleteField?table=research_interest&oid=%s'%found2.oid">delete</a></td>
+  <p>This entry isn't displayed anymore, please describe your research interests in your <a href="editProfile">Profile</a></p>
 
-    </tr>
-    <tr colspan="3">
-      <td>Add new</td>
-    </tr>
-    <tr>
-      <td><input tal:attributes="name python:'research_interest__interest__new'" size="80"></td>
-      <td><input tal:attributes="name python:'research_interest__priority__new'" size="3"></td>
-      <td
-        tal:content="structure python:here.ZSQLSelectionFromCRList(
-			     'research_interest__published__new',
-			     yes_no_list,
-			     boxType='radio',
-			     checked='yes')" />
-    </tr>
-  </table>
-  -->
-  <input type="submit" value="submit">
   </form>
   <h3>Projects</h3>
   <p>Projects cannot be edited from this pages. Entries are automatically generated.</p>