# HG changeset patch
# User casties
# Date 1370015869 -7200
# Node ID 87122259f8886835f2671a05338e215ad20ba32d
# Parent  45b7b24c8c42159455a52f72e4a7033248fb15d7# Parent  1114f55b069264c86a20579939839c20b4e01b3c
Merge with 1114f55b069264c86a20579939839c20b4e01b3c

diff -r 45b7b24c8c42 -r 87122259f888 zpt/project/pubman/show_publications.zpt
--- a/zpt/project/pubman/show_publications.zpt	Fri May 31 17:56:46 2013 +0200
+++ b/zpt/project/pubman/show_publications.zpt	Fri May 31 17:57:49 2013 +0200
@@ -50,20 +50,33 @@
         <h2>Books</h2>
         <ul class="publicationlist">
           <li tal:repeat="found3 python:publicationsSorted['book']	"><a
-            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3[0]"
-            tal:content="structure python:found3[1]" /></li>
+            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3['escidocId']"
+            tal:content="structure python:found3['citation']" />
+            <div  tal:condition="python:found3['bookId'] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(found3['bookId'])">Book page</a></div>
+                  <div tal:repeat="ident python:found3['linksIdentifier']"><a class="external" tal:attributes="href ident">See also</a></div>
+        		  <div tal:repeat="ident python:found3['linksLocator']"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
+            </li>
+            
         </ul>
         <h2>Chapters</h2>
         <ul class="publicationlist">
           <li tal:repeat="found3 python:publicationsSorted['book-item']"><a
-            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3[0]"
-            tal:content="structure python:found3[1]" /></li>
+            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3['escidocId']"
+            tal:content="structure python:found3['citation']" />
+            <div  tal:condition="python:found3['bookId'] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(found3['bookId'])">Book page</a></div>
+                  <div tal:repeat="ident python:found3['linksIdentifier']"><a class="external" tal:attributes="href ident">See also</a></div>
+        		  <div tal:repeat="ident python:found3['linksLocator']"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
+            </li>
         </ul>
         <h2>Articles</h2>
         <ul class="publicationlist">
           <li tal:repeat="found3 python:publicationsSorted['book-item']"><a
-            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3[0]"
-            tal:content="structure python:found3[1]" /></li>
+            tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+found3['escidocId']"
+            tal:content="structure python:found3['citation']" />
+            <div  tal:condition="python:found3['bookId'] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(found3['bookId'])">Book page</a></div>
+                  <div tal:repeat="ident python:found3['linksIdentifier']"><a class="external" tal:attributes="href ident">See also</a></div>
+        		  <div tal:repeat="ident python:found3['linksLocator']"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
+            </li>
         </ul>
       </tal:x>