Mercurial > hg > MPIWGWeb

changeset 224:5d17c46ebffa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed links for thesaurus and projects.
author casties
date Tue, 29 Oct 2013 16:51:34 +0100
parents 5a24611ce4cf
children e87c1475b3d6
files MPIWGDepartment.py zpt/project/project_index_html.zpt zpt/staff/member_index_html.zpt
diffstat 3 files changed, 11 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGDepartment.py	Mon Oct 28 18:43:47 2013 +0100
+++ b/MPIWGDepartment.py	Tue Oct 29 16:51:34 2013 +0100
@@ -1,14 +1,9 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Globals import package_home
-import string
-import re
 import os
 import logging
 from OFS.Folder import Folder
-from AccessControl import ClassSecurityInfo
-
-from SrvTxtUtils import getAt
 
 import MPIWGHelper
 
@@ -229,10 +224,8 @@
     getSubSection = MPIWGHelper.getSubSection
     
 
-def manage_addMPIWGDepartmentForm(self):
-    """Form for adding a MPIWGDepartment"""
-    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/department/manage_add_MPIWGDepartment.zpt')).__of__(self)
-    return pt()
+manage_addMPIWGDepartmentForm = PageTemplateFile('zpt/department/manage_add_MPIWGDepartment', globals())
+"""Form for adding a MPIWGDepartment"""
 
 
 def manage_addMPIWGDepartment(self, id, title=None, weight=0, project_id=0, director=None, director_id=None, 
--- a/zpt/project/project_index_html.zpt	Mon Oct 28 18:43:47 2013 +0100
+++ b/zpt/project/project_index_html.zpt	Tue Oct 29 16:51:34 2013 +0100
@@ -194,14 +194,14 @@
     </div>
     <!-- sideblock -->
 	 <div class="sideblock" tal:define="tags python:here.thesaurus.getTagsAsHash(here.getId())" tal:condition="tags">
-      <h2>Tags</h2>
-      <div class="item"  tal:define="anc python:here.thesaurus.thes_quote('/en/research/projects/'+here.getId())">
-    
-      <tal:x repeat="key python:tags.keys()">
-      	<tal:y repeat="tag python:tags[key]">
-      		
-      	- <a tal:content="python:here.thesaurus.formatTag(tag)" tal:attributes="href python:'thesaurus/show_en.html?dep='+key+'&open='+here.thesaurus.thes_quote(tag)+'#'+anc">tag</a></tal:y>
-      </tal:x>
+      <h2>Keywords</h2>
+      <div class="item"  tal:define="anc python:here.thesaurus.thes_quote(here.getId())">
+        <tal:x tal:repeat="key python:tags.keys()">
+      	  <tal:y tal:repeat="tag python:tags[key]">
+      	    <tal:z tal:condition="not:repeat/key/start">- </tal:z><a tal:content="python:here.thesaurus.formatTag(tag)" 
+              tal:attributes="href python:root+'/'+secmap['research']+'/thesaurus/show_'+lang+'.html?dep='+key+'&open='+here.thesaurus.thes_quote(tag)+'#'+anc">tag</a>
+          </tal:y>
+        </tal:x>
       
       </div>
     </div>
--- a/zpt/staff/member_index_html.zpt	Mon Oct 28 18:43:47 2013 +0100
+++ b/zpt/staff/member_index_html.zpt	Tue Oct 29 16:51:34 2013 +0100
@@ -167,7 +167,7 @@
       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/')"
+        <a tal:attributes="href python:project.getUrl(baseUrl=root+'/'+secmap['research']+'/projects')"
           tal:content="project/getLabel" />
       </div>
     </div>