--- MPIWGWeb/zpt/Attic/editPublications.zpt	2005/10/20 14:04:43	1.1.2.7
+++ MPIWGWeb/zpt/Attic/editPublications.zpt	2008/08/25 10:35:02	1.1.2.11
@@ -4,31 +4,14 @@
 <body>
 <tal:block metal:fill-slot="navsel" tal:define="global menusel string:publications" />
 
-<tal:block metal:fill-slot="body" tal:define="yes_no_list python:'yes\nno';
-											sortingMode python:'year\npriority'">
+<tal:block metal:fill-slot="body"
+  tal:define="yes_no_list python:'yes\nno'; sortingMode python:'year\npriority'">
 
-  <h3><a href="addPublications">Add Publications to your list</a></h3>
-  <form action="changePublicationSelectionMode" method="post">
 
-  <h3>Select the 5 publications to be displayed at your <a src="../index.html" target="blank"> homepage</a></h3>
-  <p>Choose the first 5 of my list following the order of</p>
-  <table tal:define="sm python:here.getPublicationSelectionMode()">
-    <tr tal:condition="python:sm=='priority'">
-      <td><span><input type="radio" name="publicationSelectionMode" value="year" />year</span> <span><input checked type="radio"
-        name="publicationSelectionMode" value="priority" />priority</span></td>
-      <td><input type="submit" value="change"></td>
-    </tr>
-    <tr tal:condition="not:python:sm=='priority'">
-      <td><span><input checked type="radio" name="publicationSelectionMode" value="year" /> year</span> <span><input type="radio"
-        name="publicationSelectionMode" value="priority" /> priority</span></td>
-      <td><input type="submit" value="change"></td>
-    </tr>
-  </table>
-  </form>
 
 
   <h2>Publication list</h2>
-  <p>(You can not change entries from the institutsbibliographie here)</p>
+  <p>(You can not change entries from the <i>Institutsbibliographie</i> here)</p>
   <form action="changeSortingMode" method="post">
   <p>Sort by:</p>
   <table>
@@ -43,25 +26,31 @@
   </form>
 
   <form action="changePublications" method="post">
-  <input type="hidden" name="id_main" tal:attributes="value person/id">
-  <input type="hidden" name="main_fields" value="publications__title,publications__publish">
+  <input type="hidden" name="key_main" tal:attributes="value person/key">
+  <input type="hidden" name="main_fields"
+    value="publications__title,publications__publish">
 
   <tal:block
-    tal:define="books python:here.ZSQLSimpleSearch('select *,oid from publications where id_main=\'%s\' and lower(referencetype)in (\'book\') and publish=\'yes\' order by priority'%here.getDBId());
-			     edited_books python:here.ZSQLSimpleSearch('select *,oid from publications where id_main=\'%s\' and lower(referencetype)in (\'edited book\') and publish=\'yes\' order by priority'%here.getDBId());
-			     not_displayed python:here.ZSQLSimpleSearch('select *,oid from publications where id_main=\'%s\' and publish=\'no\' order by priority'%here.getDBId());
-			     articles python:here.ZSQLSimpleSearch('select *,oid from publications where id_main=\'%s\' and lower(referencetype) not in (\'book\',\'edited book\') and publish=\'yes\' order by priority'%here.getDBId())">
+    tal:define="books python:here.ZSQLSimpleSearch('select *,oid from publications where lower(key_main)=\'%s\' and lower(referencetype)in (\'book\') and publish=\'yes\' order by priority'%here.getKey().lower());
+			     edited_books python:here.ZSQLSimpleSearch('select *,oid from publications where lower(key_main)=\'%s\' and lower(referencetype)in (\'edited book\') and publish=\'yes\' order by priority'%here.getKey().lower());
+			     not_displayed python:here.ZSQLSimpleSearch('select *,oid from publications where lower(key_main)=\'%s\' and publish=\'no\' order by priority'%here.getKey().lower());
+			     articles python:here.ZSQLSimpleSearch('select *,oid from publications where lower(key_main)=\'%s\' and lower(referencetype) not in (\'book\',\'edited book\') and publish=\'yes\' order by priority'%here.getKey().lower())">
 
     <tal:block tal:condition="books">
-
       <h3>Books</h3>
       <table>
-        <tr><th/><th/><th>Priority</th><th align="left" width="100">Show</th></tr>
-        <tr tal:repeat="found 	python:here.sortBibliography(books)">
+        <tr>
+          <th />
+          <th />
+          <th>Priority</th>
+          <th align="left" width="100">Show</th>
+        </tr>
+        <tr tal:repeat="found python:here.sortBibliography(books)">
           <td><a tal:condition="python:found.id_gen_bib and (not found.id_gen_bib=='')"
-            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a> <a
+            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a>
+          <a
             tal:attributes="href python:'deleteField?table=publications&oid=%s'%found.oid">delete</a></td>
-          <td><span tal:replace="structure python:here.formatBibliography(here,found)" /></td>
+          <td><span tal:replace="structure python:here.formatBibliography(here,here.decode(found))" /></td>
           <td valign="top"><input
             tal:attributes="name python:'publications__priority__'+str(found.oid);
 				     value python:here.integer(found.priority)"
@@ -79,12 +68,18 @@
     <tal:block tal:condition="edited_books">
       <h3>Edited Books</h3>
       <table>
-        <tr><th/><th/><th>Priority</th><th align="left" width="100">Show</th></tr>
+        <tr>
+          <th/>
+          <th/>
+          <th>Priority</th>
+          <th align="left" width="100">Show</th>
+        </tr>
         <tr tal:repeat="found python:here.sortBibliography(edited_books)">
           <td><a tal:condition="python:found.id_gen_bib and (not found.id_gen_bib=='')"
-            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a> <a
+            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a>
+          <a
             tal:attributes="href python:'deleteField?table=publications&oid=%s'%found.oid">delete</a></td>
-          <td><span tal:replace="structure python:here.formatBibliography(here,found)" /></td>
+          <td><span tal:replace="structure python:here.formatBibliography(here,here.decode(found))" /></td>
           <td valign="top"><input
             tal:attributes="name python:'publications__priority__'+str(found.oid);
 			   		value python:here.integer(found.priority)"
@@ -102,12 +97,18 @@
     <tal:block tal:condition="articles">
       <h3>Articles and Chapters</h3>
       <table>
-        <tr><th/><th/><th>Priority</th><th align="left" width="100">Show</th></tr>
+        <tr>
+          <th/>
+          <th/>
+          <th>Priority</th>
+          <th align="left" width="100">Show</th>
+        </tr>
         <tr tal:repeat="found python:here.sortBibliography(articles)">
           <td><a tal:condition="python:found.id_gen_bib and (not found.id_gen_bib=='')"
-            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a> <a
+            tal:attributes="href python:'editBibliography?id=%s'%found.id_gen_bib">edit</a>
+          <a
             tal:attributes="href python:'deleteField?table=publications&oid=%s'%found.oid">delete</a></td>
-          <td><span tal:replace="structure python:here.formatBibliography(here,found)" /></td>
+          <td><span tal:replace="structure python:here.formatBibliography(here,here.decode(found))" /></td>
           <td valign="top"><input
             tal:attributes="name python:'publications__priority__'+str(found.oid);
 				     value python:here.integer(found.priority)"
@@ -120,29 +121,66 @@
 			     checked=found.publish)" />
         </tr>
       </table>
-      </tal:block>
-      
-      <h3>Currently not shown</h3>
-      <table>
-        <tr><th/><th/><th>Priority</th><th align="left" width="100">Show</th></tr>
-        <tr tal:repeat="found python:here.sortBibliography(not_displayed)">
-          <td><a tal:attributes="href python:'deleteField?table=publications&oid=%s'%found.oid">delete</a></td>
-          <td><span tal:replace="structure python:here.formatBibliography(here,found)" /></td>
-          <td valign="top"><input
-            tal:attributes="name python:'publications__priority__'+str(found.oid);
+    </tal:block>
+
+  <tal:block tal:condition="not_displayed">
+    <h3>Currently not shown</h3>
+    <table>
+      <tr>
+        <th />
+        <th />
+        <th>Priority</th>
+        <th align="left" width="100">Show</th>
+      </tr>
+      <tr tal:repeat="found python:here.sortBibliography(not_displayed)">
+        <td><a
+          tal:attributes="href python:'deleteField?table=publications&oid=%s'%found.oid">delete</a></td>
+        <td><span tal:replace="structure python:here.formatBibliography(here,here.decode(found))" /></td>
+        <td valign="top"><input
+          tal:attributes="name python:'publications__priority__'+str(found.oid);
 		   				     value python:here.integer(found.priority)"
-            size="3" /></td>
-          <td valign="top"
-            tal:content="structure python:here.ZSQLSelectionFromCRList(
+          size="3" /></td>
+        <td valign="top"
+          tal:content="structure python:here.ZSQLSelectionFromCRList(
 			     'publications__publish__'+str(found.oid),
 			     yes_no_list,
 			     boxType='radio',
 			     checked=found.publish)" />
-        </tr>
-      </table>
+      </tr>
+    </table>
+    </tal:block>
+    
   </tal:block>
-  <input type="submit" value="change">
+ <!--  <input type="submit" value="change"> -->
   </form>
+
+<br/> <br/> <br/> 
+  
+  <form action="changePublicationSelectionMode" method="post">
+
+    <h3>Select the 5 publications to be displayed in the first part of your homepage</h3>
+    <p>Choose the first 5 of my list following the order of</p>
+    <table tal:define="sm python:here.getPublicationSelectionMode()">
+      <tr tal:condition="python:sm=='priority'">
+	<td><span><input type="radio" name="publicationSelectionMode" value="year" />year</span>
+	  <span><input checked type="radio" name="publicationSelectionMode" value="priority" />priority</span></td>
+	<td><input type="submit" value="change"></td>
+	</tr>
+      <tr tal:condition="not:python:sm=='priority'">
+	<td><span><input checked type="radio" name="publicationSelectionMode" value="year" />
+	    year</span> <span><input type="radio" name="publicationSelectionMode"
+				     value="priority" /> priority</span></td>
+	<td><input type="submit" value="change"></td>
+	</tr>
+      </table>
+      </form>
+      
+      <br/><br/>
+      <h2>Add Publications to your list:</h2>
+      <h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="addPublications">Add entries from the Institutsbibliographie</a></h4>
+      <h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="newBibliography">Add an entry that cannot be found in the 
+Institutsbibliographie</a></h4>
+
 </tal:block>
 </body>
 </html>
