diff zpt/project/project_template.zpt @ 40:fd8e78bbc5ed

more work on projects. new member template uses new getProjectsOfMember. new isActiveMember in MPIWGStaffFolder.
author casties
date Fri, 26 Apr 2013 21:18:01 +0200
parents bbad6a092861
children 196db636a8fd
line wrap: on
line diff
--- a/zpt/project/project_template.zpt	Fri Apr 26 20:31:21 2013 +0200
+++ b/zpt/project/project_template.zpt	Fri Apr 26 21:18:01 2013 +0200
@@ -26,7 +26,7 @@
     <h1 tal:content="here/getProjectTitle">History of Scientific Objectivity, 18th-19th Cs</h1>
     <p class="maintext_authors">
       <tal:block tal:repeat="person here/getResponsibleScientistsList">
-          <a tal:omit-tag="python:not (person['username'] and here.isActiveMember(person['key']))"
+          <a tal:omit-tag="python:not (person['username'] and here.getStaffFolder().isActiveMember(key=person['key']))"
             tal:attributes="href string:$root/${secmap/staff}/members/${person/username}" tal:content="person/name"> Name of
             responsible person</a><tal:block tal:condition="not:repeat/person/end">, </tal:block>
       </tal:block>
@@ -68,7 +68,7 @@
       tal:define="parents here/getSuperProjects;" tal:condition="parents">
       <div class="project parent">
         Part of:
-        <a tal:define="parent python:parents[-1]" tal:content="parent/getProjectTitle"
+        <a tal:define="parent python:parents[-1]" tal:content="parent/getLabel"
            tal:attributes="href python:parent.getUrl(baseUrl=proBaseUrl)+test(here.isArchivedProject(),'?showArchive=yes','')" />
       </div>
       <!-- end parent -->
@@ -79,9 +79,8 @@
     <div class="sideblock" tal:define="projects here/getRelatedProjects" tal:condition="projects">
       <h2>Related Projects</h2>
       <div class="item" tal:repeat="project python:projects">
-        <a tal:attributes="href
-          python:root+'/'+secmap['research']+'/projects/'+project[1].objid"
-          tal:content="python:project[1].projectWEB_title" />
+        <a tal:attributes="href python:proBaseUrl+'/'+project.objid"
+          tal:content="python:project.projectWEB_title" />
       </div>
       <!-- end item -->
     </div>