--- a/MPIWGStaff.py	Tue May 21 17:07:48 2013 +0200
+++ b/MPIWGStaff.py	Tue May 21 18:50:05 2013 +0200
@@ -220,7 +220,9 @@
     
     # templates
     mainEditFile=PageTemplateFile('zpt/staff/edit_main', globals())    
-    
+    talks_full_html = PageTemplateFile('zpt/staff/talks_full_html', globals())
+    teaching_full_html = PageTemplateFile('zpt/staff/teaching_full_html', globals())
+
 
     def __init__(self, folder, dbresult):
         """constructor: takes parent MPIWGStaffFolder and content (DB row)"""
@@ -297,13 +299,27 @@
         
     getUrl = MPIWGHelper.getUrl
     
-    def getTalks(self):
-        return self.folder.executeZSQL("SELECT oid,* FROM talks  WHERE  key_main = %s",[self.content.key]) 
-        #return self.folder.ZSQLInlineSearch(_table='talks',key_main=self.content.key)
+    def getTalks(self, published=True, sortBy='priority'):
+        """Return the list of talks"""
+        query = "SELECT oid,* FROM talks WHERE key_main = %s"
+        if published:
+            query += " and published = 'yes'"
+            
+        if sortBy == 'priority':
+            query += " order by priority"
+            
+        return self.folder.executeZSQL(query, [self.content.key])     
     
-    
-    def getTeaching(self):
-        return self.folder.executeZSQL("SELECT oid,* FROM teaching  WHERE  key_main = %s",[self.content.key]) 
+    def getTeaching(self, published=True, sortBy='priority'):
+        """Return the list of teaching activities"""
+        query = "SELECT oid,* FROM teaching WHERE key_main = %s"
+        if published:
+            query += " AND published = 'yes'"
+            
+        if sortBy == 'priority':
+            query += " ORDER BY priority"
+            
+        return self.folder.executeZSQL("SELECT oid,* FROM teaching WHERE key_main = %s",[self.content.key]) 
     
     
     def getLastUpdateCV(self):
@@ -668,13 +684,10 @@
         return {}
     
     
-    def publicationsFull(self,REQUEST):
+    def publications_full_html(self, REQUEST):
         """show publication"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/staff/pubman','show_publications.zpt')).__of__(self)
+        pt=PageTemplateFile('zpt/staff/pubman/show_publications.zpt', globals()).__of__(self)
         return pt(member=self.content)
-        
-
-        
 
         
     def addPublicationsFromPubman(self,REQUEST):
@@ -776,7 +789,7 @@
 
     def getSelectedPublications(self):
         """hole publications aus der datenbank"""
-        query="select * from pubmanbiblio where lower(key_main) = lower(%s) order by priority DESC"
+        query="select * from pubmanbiblio where lower(key_main) = lower(%s) order by priority ASC"
         return self.executeZSQL(query,[self.getKey()])