Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6005)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6006)
@@ -1208,8 +1208,11 @@
     grok.name('addcourse')
     grok.require('waeup.manageUniversity')
-    title = u'Add course'
     label = u'Add course'
     form_fields = grok.AutoFields(ICourseAdd)
     pnav = 1
+    
+    @property
+    def title(self):
+        return self.context.longtitle()       
     
     @grok.action('Add course')
@@ -1240,9 +1243,11 @@
     grok.name('addcertificate')
     grok.require('waeup.manageUniversity')
-    title = u'Add certificate'
     label = u'Add certificate'
     form_fields = grok.AutoFields(ICertificateAdd)
     pnav = 1
     
+    @property
+    def title(self):
+        return self.context.longtitle()       
         
     @grok.action('Add certificate')
@@ -1298,8 +1303,12 @@
     grok.name('manage')
     grok.require('waeup.manageUniversity')
-    title = u'Edit course'
+    label = u'Edit course'
     pnav = 1
 
     form_fields = grok.AutoFields(ICourse)
+    
+    @property
+    def title(self):
+        return 'Course: %s (%s)' % (self.context.title, self.context.code)
 
     @grok.action('Save')
@@ -1394,8 +1403,12 @@
     grok.name('manage')
     grok.require('waeup.manageUniversity')
-    title = u'Edit certificate'
-    pnav = 1
+    pnav = 1
+    label = 'Edit certificate'
     
     form_fields = grok.AutoFields(ICertificate)
+    
+    @property
+    def title(self):
+        return "Certificate: %s (%s)" % (self.context.title, self.context.code)    
 
     #@property
@@ -1444,5 +1457,9 @@
     form_fields = grok.AutoFields(ICertificateCourseAdd)
     pnav = 1
-    title = 'Add course referrer'
+    label = 'Add course referrer'
+    
+    @property
+    def title(self):
+        return "Certificate: %s (%s)" % (self.context.title, self.context.code)
 
     @grok.action('Add course referrer')
@@ -1489,9 +1506,10 @@
     grok.require('waeup.manageUniversity')
     form_fields = grok.AutoFields(ICertificateCourse)
+    label = 'Edit course referrer'
     pnav = 1
     
     @property
     def title(self):
-        return 'Edit course referrer'
+        return 'Course Referrer: %s' % (self.context.__name__)
     
     @grok.action('Save and return')
