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

diff -r 1114f55b0692 -r 87122259f888 MPIWGStaff.py
--- a/MPIWGStaff.py	Fri May 31 17:00:17 2013 +0200
+++ b/MPIWGStaff.py	Fri May 31 17:57:49 2013 +0200
@@ -18,7 +18,7 @@
 
 from Products.ZDBInterface.ZDBInterfaceFolder import ZDBInterfaceFolder
 
-from SrvTxtUtils import getHttpData, getAt, getInt, unicodify, utf8ify
+from SrvTxtUtils import getInt, unicodify, utf8ify
 import MPIWGHelper
 
 #
@@ -187,17 +187,6 @@
         return tmp
     
     
-    def getPublicationsFromPubman(self,coneId="renn",limit=None,publicationType=None):
-        
-        logging.debug("coneID:%s"%coneId)
-        try:
-            pubs=self.mpiwgPubman.getPublications(coneId,limit=limit,publicationType=publicationType)
-            
-            return pubs
-        except:
-            return []
-    
- 
     def importSortingModeFromOldStaff(self):
         """ only used for the migration to the new website """
         ret=[]
@@ -726,12 +715,13 @@
     getStaffURL = getUsername
         
     def getPublicationsFromPubman(self,limit=None,publicationType=None):
-        
+        """Return list of publications."""
         
         if self.content.publications_mode=="year": 
             coneId = self.getConeId();
             if coneId:
-                pubs= self.folder.getPublicationsFromPubman(coneId,limit=limit,publicationType=publicationType)
+                pubs = self.folder.mpiwgPubman.getPublications(coneId,limit=limit,publicationType=publicationType)
+                #pubs= self.folder.getPublicationsFromPubman(coneId,limit=limit,publicationType=publicationType)
             return pubs
         
         elif self.content.publications_mode=="priority":
@@ -752,10 +742,6 @@
                                 'http://purl.org/eprint/type/BookItem':'book-item',
                                 'http://purl.org/escidoc/metadata/ves/publication-types/article':'article'};
                 
-                
-                
-                
-                
                 if publicationType is not None: #publicaitions typ ist gesetzt 
                    
                     if not ((entry[1] == publicationType) or  (entry[1] == typesLongShort.get(publicationType,''))) : #stimmt nicht dann weiter
diff -r 1114f55b0692 -r 87122259f888 css/mpiwg.css
--- a/css/mpiwg.css	Fri May 31 17:00:17 2013 +0200
+++ b/css/mpiwg.css	Fri May 31 17:57:49 2013 +0200
@@ -5,12 +5,6 @@
  */
  
 
-
-
-div.hierlist li.li_project a{
-/*	padding-left:0px;*/
-} 
-
 body {
     margin: 0;
     font-family: Verdana, Arial, sans-serif;
@@ -75,7 +69,7 @@
     color: #3b4186;
     font-size: 20px;
     font-weight: normal;
-    margin: 0.5em 0;
+    margin: 1em 0 0.5em 0;
 }
 
 h1:first-child {
@@ -87,7 +81,12 @@
     color: #3b4186;
     font-size: 16px;
     font-weight: normal;
-    margin: 0.5em 0;
+    margin: 1em 0 0.5em 0;
+}
+
+h2:first-child {
+    /* does this work correctly? */
+    margin-top: 0;
 }
 
 h3 {
@@ -116,7 +115,7 @@
 
 ul.plain {
     list-style-type: none;
-    padding-left: 0.5em;
+    padding: 0;
 }
 ul.plain > li {
     margin-top: 0.5em;
@@ -132,6 +131,10 @@
     display: inline;
 }
 
+.clear {
+    clear: both;
+}
+
 /*
  * table-like rows and columns
  */
@@ -1124,7 +1127,20 @@
 /*
  * figures (in project descriptions and features)
  */
-div.figure,
+div.figure {
+    float: left;
+    padding: 0.5em 1em 0.5em 0;
+}
+
+div.feature div.figure,
+div.project div.figure {
+    width: 230px;
+}
+div.feature div.figure img,
+div.project div.figure img {
+    width: 230px;
+}
+
 div.image_small {
     float: left;
     width: 230px;
@@ -1134,10 +1150,13 @@
     float: right;
     padding: 0.5em 0 0 1em;
 }
-div.figure div.image img,
 div.image_small img {
     width: 230px;
 }
+div.banner_large img {
+    width: 460px;
+}
+
 div.figure div.figcaption,
 div.banner_large div.caption,
 div.image_small div.caption {
@@ -1146,9 +1165,6 @@
     color: #9f917a;
     margin-top: 0.5em;
 }
-div.banner_large img {
-    width: 460px;
-}
 
 /*
  * project description and feature
diff -r 1114f55b0692 -r 87122259f888 zpt/staff/member_index_html.zpt
--- a/zpt/staff/member_index_html.zpt	Fri May 31 17:00:17 2013 +0200
+++ b/zpt/staff/member_index_html.zpt	Fri May 31 17:57:49 2013 +0200
@@ -16,9 +16,9 @@
   <div class="center" metal:fill-slot="center">
     <div>
       <!-- image -->
-      <tal:block tal:define="imgUrl member/getPublishedImageUrl" tal:condition="imgUrl">
-        <img tal:attributes="src python:'%s&dw=165'%imgUrl" style="float: left; margin-right: 22px;" />
-      </tal:block>
+      <div class="figure" tal:define="imgUrl member/getPublishedImageUrl" tal:condition="imgUrl">
+        <img tal:attributes="src string:$imgUrl&dw=165"/>
+      </div>
       <!-- name and title -->
       <h1>
         <span class="mpiwg-first_name" tal:content="content/first_name" /> 
@@ -36,43 +36,49 @@
     </div>
     
     <!-- profile -->
-    <div>
+    <div class="clear">
+      <tal:x tal:condition="content/profile">
+
+        <h2 class="line">Profile</h2>
+
+        <div class="profile" tal:content="structure content/profile"> [FMP-Field: CV] </div>
+      </tal:x>
       <tal:x tal:condition="not:content/profile">
         <tal:y tal:replace="structure member/generateProfileForPerson" />
       </tal:x>
-      <tal:x tal:condition="content/profile">
-        <h2>Profile</h2>
-        <div class="profile" tal:content="structure content/profile"> [FMP-Field: CV] </div>
-      </tal:x>
     </div>
     
     <!-- publications -->
+  <!--       tal:define="publications python:here.ZDBInlineSearch(_table='pubmanbiblio',key_main=key,_op_key_main='eq')" -->
     <tal:block
-      tal:define="publications python:here.ZDBInlineSearch(_table='pubmanbiblio',key_main=key,_op_key_main='eq')"
+      tal:define="publications python:member.getPublicationsFromPubman(limit=6)"
       tal:condition="publications">
-      <h2>Selected publications</h2>
-      <div class="reference" tal:repeat="publication python:member.getPublicationsFromPubman(limit=5)">
-        <a tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+publication[0]"
-          tal:content="structure python:publication[1]" />
-        <div  tal:condition="python:publication[2] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(publication[2])">Book page</a></div>
-        <div tal:repeat="ident python:publication[3]"><a class="external" tal:attributes="href ident">See also</a></div>
-        <div tal:repeat="ident python:publication[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
-               
-      </div>
+
+      <h2 class="line">Selected publications</h2>
+
+      <ul class="plain">
+        <li class="reference" tal:repeat="publication publications">
+          <span tal:content="structure python:publication[1]"/>
+          <a class="external" target="_blank" 
+             tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+publication[0]">More</a>
+          <span tal:condition="python:publication[2] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(publication[2])">Book page</a></span>
+          <span tal:repeat="ident python:publication[3]"><a class="external" target="_blank" tal:attributes="href ident">See also</a></span>
+          <span tal:repeat="ident python:publication[4]"><a class="external" target="_blank" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also</a></span>
+        </li>
+      </ul>
       <p tal:condition="python:len(publications)>5">
-        <a class="internal" tal:attributes="href string:$baseUrl/publications_full_html">More</a>
+        <a class="internal" tal:attributes="href string:$baseUrl/publications_full_html">More publications</a>
       </p>
-      <!-- <p>
-        <a class="external" target="_blank" tal:attributes="href member/getConeId">See all publications (PubMan)</a>
-      </p> -->
     </tal:block>
     
     <!-- Talks -->
     <tal:block tal:define="talks member/getTalks" tal:condition="talks">
-      <h2>Talks and presentations</h2>
+
+      <h2 class="line">Talks and presentations</h2>
+
       <table class="items shorter">
         <tr tal:repeat="talk python:here.ZDBSlice(talks,size=5)">
-          <td>
+          <td width="25%">
             <a tal:omit-tag="not:talk/link" tal:attributes="href talk/link" tal:content="talk/date" />
           </td>
           <td>
@@ -89,10 +95,12 @@
     
     <!-- Teaching activities -->
     <tal:block tal:define="teachings member/getTeaching" tal:condition="teachings">
-      <h2>Teaching activities</h2>
+
+      <h2 class="line">Teaching activities</h2>
+
       <table class="items shorter">
         <tr tal:repeat="teaching python:here.ZDBSlice(teachings, size=5)">
-          <td>
+          <td width="25%">
             <a tal:omit-tag="not:teaching/link" tal:attributes="href teaching/link"> <span tal:replace="teaching/date" />
             </a>
           </td>
diff -r 1114f55b0692 -r 87122259f888 zpt/staff/pubman/show_publications.zpt
--- a/zpt/staff/pubman/show_publications.zpt	Fri May 31 17:00:17 2013 +0200
+++ b/zpt/staff/pubman/show_publications.zpt	Fri May 31 17:57:49 2013 +0200
@@ -9,15 +9,16 @@
   <div class="center" metal:fill-slot="center">
 
     <h1>
-      <span tal:replace="python:options['member'].title" /> <span tal:replace="python:options['member'].first_name" /> <span
-        tal:replace="python:options['member'].last_name" />
+      <span tal:replace="options/member/title" /> 
+      <span tal:replace="options/member/first_name" /> 
+      <span tal:replace="options/member/last_name" />
     </h1>
 
     <p>
-      <a tal:attributes="href string:$root/$section/members/${here/getId}">main entry</a>
+      <a class="internal" tal:attributes="href string:$root/$section/members/${here/getId}">Main entry</a>
     </p>
 
-    <h2>Selected publications</h2>
+    <h1>Selected publications</h1>
     
     <tal:block
       tal:define="
@@ -27,53 +28,48 @@
 				">
 
       <tal:block>
-        <h3>Books</h3>
+        <h2 class="line">Books</h2>
         <ul class="plain">
-          <li class="reference" tal:repeat="book books"><div><a tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]"><span
-                tal:replace="structure python:book[1]" /> </a></div>
-                <div  tal:condition="python:book[2] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(book[2])">Book page</a></div>
-                  <div tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></div>
-        		  <div tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
-       
+          <li class="reference" tal:repeat="book books">
+            <span tal:replace="structure python:book[1]" />
+            <a class="external" target="_blank" 
+              tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]">More</a>
+            <span tal:condition="python:book[2] is not None"><a class="internal" tal:attributes="href python:'/en/resources/publications/'+here.getBookLinkFromID(book[2])">Book page</a></span>
+            <span tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></span>
+  		    <span tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also</a></span>
           </li>
         </ul>
       </tal:block>
 
       <tal:block>
-        <h3>Book Chapters</h3>
-       
+        <h2 class="line">Book Chapters</h2>      
         <ul class="plain">
-          <li class="reference" tal:repeat="book book_article"><a tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]"><span
-                tal:replace="structure python:book[1]" /></a>
-                      <div tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></div>
-        		  <div tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
-       
+          <li class="reference" tal:repeat="book book_article">
+            <span tal:replace="structure python:book[1]" />
+            <a class="external" target="_blank" tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]">More</a>
+            <span tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></span>
+            <span tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></span>
           </li>
         </ul>
       </tal:block>
 
       <tal:block>
-        <h3>Articles</h3>
+        <h2 class="line">Articles</h2>
         <ul class="plain">
-          <li class="reference" tal:repeat="book articles"><a tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]"><span
-                tal:replace="structure python:book[1]" /> </a>
-                      <div tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></div>
-        		  <div tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also:</a></div>
-       
+          <li class="reference" tal:repeat="book articles">
+            <span tal:replace="structure python:book[1]" /> 
+            <a class="external" target="_blank" tal:attributes="href python:'http://pubman.mpiwg-berlin.mpg.de/pubman/faces/viewItemFullPage.jsp?itemId='+book[0]">More</a>
+            <span tal:repeat="ident python:book[3]"><a class="external" tal:attributes="href ident">See also</a></span>
+            <span tal:repeat="ident python:book[4]"><a class="external" tal:attributes="href python:ident[1]" tal:content="python:ident[0]">See also</a></span>
           </li>
         </ul>
       </tal:block>
 
     </tal:block>
 
-    <!--
-        <p> 
-	  <a href="/institutsbiblio/FMPro?-db=personal-www&amp;-max=1&amp;-Lay=ALL&amp;-format=search_inst_bib.html&amp;ID=[FMP-Field: ID]&amp;-Error=null.html&amp;-find" target="_new"> 
-              search the institute's bibliography </a>
- -->
-<div class="item external">
-        <a target="_blank" tal:attributes="href python:options['member'].getConeId()"> More publications on PubMan</a>
-     </div>
+    <p>
+      <a class="external" target="_blank" tal:attributes="href python:options['member'].getConeId()">More publications on PubMan</a>
+    </p>
   </div>
    
 </body>