--- MPIWGWeb/zpt/Attic/editMPIWGStaff.zpt	2005/10/18 19:37:32	1.1.2.3
+++ MPIWGWeb/zpt/Attic/editMPIWGStaff.zpt	2010/06/29 10:09:58	1.1.2.9
@@ -4,96 +4,76 @@
 <head>
 </head>
 <body>
-  <tal:block metal:fill-slot="navsel" tal:define="global selected python:'research'"/>
+<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="id_main" tal:attributes="value person/id">
-     <input type="hidden" name="main_fields" value="current_work__current,research_interest__interest">
-     <h3>Current work</h3>
-     <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='current_work',id_main=person.id)">
-        <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"/>
-	    </td>
-	    <td tal:content="structure python:here.ZSQLSelectionFromCRList(
-			     'current_work__publish__'+str(found2.oid),
+  <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</p>
+  <table tal:define="found2 python:person">
+    <tr>
+      <th />
+      <th>Show</th>
+    </tr>
+    <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(
+			     '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')"/>
-	 </tr>
-      </table>
-      <input type="submit" value="submit">
-      
-     <h3>Research interests</h3>
-     
-     <table tal:define="founds2 python:here.ZSQLInlineSearch(_table='research_interest',id_main=person.id)">
-       <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(
+			     checked=found2.current_work_p)" />
+    </tr>
+  </table>
+  <input type="submit" value="submit"/>
+ 
+  <h3>Research interests</h3>
+  <p>This entry isn't displayed anymore, please describe your research interests in your <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>
+			     checked=found2.published)" />
+      <td><a tal:attributes="href python:'deleteField?table=research_interest&oid=%s'%found2.oid">delete</a></td>
 
-	  </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(
+    </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>
+			     checked='yes')" />
+    </tr>
+  </table>
+  -->
+  </form>
+  <h3>Projects</h3>
+  <p>Projects cannot be edited from this pages. Entries are automatically generated.</p>
 </tal:block>
 </body>
 </html>
