--- a/zpt/staff/member_index_html.zpt	Tue May 14 10:36:48 2013 +0200
+++ b/zpt/staff/member_index_html.zpt	Tue May 14 17:24:30 2013 +0200
@@ -34,8 +34,8 @@
     </div>
     <!-- profile -->
     <div>
-      <tal:x tal:condition="python:not content.profile">
-        <tal:y tal:replace="structure python:member.generateProfileForPerson()" />
+      <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>
@@ -43,32 +43,24 @@
       </tal:x>
     </div>
     <!-- publications -->
-    <tal:block tal:define="publications python:here.ZDBInlineSearch(_table='publications',key_main=key,_op_key_main='eq',publish='yes')"
+    <tal:block
+      tal:define="publications python:here.ZDBInlineSearch(_table='publications',key_main=key,_op_key_main='eq',publish='yes',_op_publish='eq')"
       tal:condition="publications">
       <h2>Selected publications</h2>
-      <!--<p tal:repeat="publication python:member.sortBibliography(publications,content.publications_sort,max=5)">
-        <a tal:omit-tag="not:publication/link" tal:attributes="href publication/link"
-          tal:content="structure python:here.formatBibliography(here,publication)" />
-      </p>
-      <p tal:condition="python:len(publications)>5">
-        <a class="internal" tal:attributes="href string:$baseUrl/publications_full">more</a>
-      </p>-->
-      
       <p 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]" />
       </p>
       <p tal:condition="python:len(publications)>5">
-        <a class="internal" tal:attributes="href string:$baseUrl/publicationsFull">more</a>
+        <a class="internal" tal:attributes="href string:$baseUrl/publicationsFull">More</a>
       </p>
       <p>
-      <a target="_blank"
-          tal:attributes="href python:member.getConeId()">
-          See all publications (pubman)</a>
-       </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 python:here.ZDBInlineSearch(_table='talks',key_main=key,_op_key_main='eq',_sort='priority',published='yes')"
+    <tal:block
+      tal:define="talks python:here.ZDBInlineSearch(_table='talks',key_main=key,_op_key_main='eq',_sort='priority',published='yes')"
       tal:condition="talks">
       <h2>Talks and presentations</h2>
       <div class="namelist">
@@ -84,7 +76,7 @@
         </tal:block>
       </div>
       <p tal:condition="python:len(talks)>5">
-        <a tal:attributes="href string:$baseUrl/talks_full">more</a>
+        <a class="internal" tal:attributes="href string:$baseUrl/talks_full">More</a>
       </p>
     </tal:block>
     <!-- Teaching activities -->
@@ -104,7 +96,7 @@
           </div>
         </tal:block>
         <p tal:condition="python:len(teachings)>5">
-          <a tal:attributes="href string:$baseUrl/teaching_full">more</a>
+          <a class="internal" tal:attributes="href string:$baseUrl/teaching_full">More</a>
         </p>
       </div>
     </tal:block>
@@ -117,37 +109,30 @@
     <div class="sideblock">
       <h2>Contact</h2>
       <div class="item noline">
-        Max Planck Institute for the History of Science
-        <br />
-        Boltzmannstra&szlig;e 22
-        <br />
-        14195 Berlin
-        <br />
-        Germany
+        Max Planck Institute for the History of Science <br /> Boltzmannstra&szlig;e 22 <br /> 14195 Berlin <br /> Germany
       </div>
       <div class="item" tal:condition="python:content.telefon_p=='yes'">
-        tel.:<span tal:content="content/telefon">[FMP-Field: telefon]</span>
-        <br />
+        tel.: <span tal:content="content/telefon">[FMP-Field: telefon]</span> <br />
       </div>
       <div class="item" tal:condition="python:content.fax_p=='yes'">
-        fax:<span tal:content="content/fax">[FMP-Field: fax]</span>
-        <br />
+        fax: <span tal:content="content/fax">[FMP-Field: fax]</span> <br />
       </div>
-      <div class="item internal" tal:condition="python:content.e_mail_p=='yes'">
-        <a class="maillink" tal:attributes="href string:mailto:${content/e_mail}" tal:content="content/e_mail">[FMP-Field:
+      <div class="item" tal:condition="python:content.e_mail_p=='yes'">
+        <a class="email" tal:attributes="href string:mailto:${content/e_mail}" tal:content="content/e_mail">[FMP-Field:
           e_mail]</a>
       </div>
-      <div class="item external" tal:condition="python:content.e_mail2_p=='yes'">
-        <a class="maillink" tal:attributes="href string:mailto:${content/e_mail2}" tal:content="content/e_mail2">[FMP-Field:
+      <div class="item" tal:condition="python:content.e_mail2_p=='yes'">
+        <a class="email" tal:attributes="href string:mailto:${content/e_mail2}" tal:content="content/e_mail2">[FMP-Field:
           e_mail2]</a> (external)
       </div>
     </div>
 
-    <div class="sideblock" tal:define="projects python:here.getProjectFolder().getProjectsOfMember(key=key)" tal:condition="projects">
+    <div class="sideblock" tal:define="projects python:here.getProjectFolder().getProjectsOfMember(key=key)"
+      tal:condition="projects">
       <h2>Projects</h2>
       <div class="project" tal:repeat="project projects">
         <a tal:attributes="href python:project.getUrl(baseUrl=root+'/'+secmap['research']+'/projects/')"
-           tal:content="project/getLabel" />
+          tal:content="project/getLabel" />
       </div>
     </div>
 
@@ -157,15 +142,12 @@
         <a target="_blank" href="downloadCV">Download Curriculum Vitae</a>
       </div>
       <div class="item download" tal:condition="python:getattr(here,'publications_publish','no')=='yes'">
-        <a target="_blank" href="downloadPublications">Download Publication List</a>
-        <br />
+        <a target="_blank" href="downloadPublications">Download Publication List</a> <br />
       </div>
-      <div class="item internal">
-        <a target="_blank"
-          tal:attributes="href python:member.getConeId()">
-          See publications on pubman</a>
+      <div class="item external">
+        <a target="_blank" tal:attributes="href python:member.getConeId()"> See publications on PubMan</a>
       </div>
-      <div class="item internal"
+      <div class="item external"
         tal:repeat="addLink python:here.ZDBInlineSearch(_table='additionallink',key_main=key,_op_key_main='eq',_sort='priority',published='yes')">
         <a target="_blank" tal:content="addLink/title" tal:attributes="href addLink/link"> Daston on the History of Science
           (listen to CBC-Interview, Fall 2007)</a>