Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6362)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6363)
@@ -529,5 +529,5 @@
     grok.require('waeup.handleApplication')
     icon = 'actionicon_pdf.png'
-    text = 'Download pdf slip'
+    text = 'Application slip'
     target = 'application_slip.pdf'
 
@@ -540,8 +540,11 @@
     form_fields = grok.AutoFields(IApplicant).omit(
         'locked').omit('course_admitted')
-    #form_fields['passport'].custom_widget = ThumbnailWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
-
     prefix = 'form'
+
+    @property
+    def label(self):
+        container_title = self.context.__parent__.title
+        return '%s Application Record' % container_title
 
     def getCourseAdmitted(self):
@@ -564,5 +567,4 @@
             )
 
-    # Render a demo pdf page
     def render(self):
         from reportlab.pdfgen import canvas
@@ -570,23 +572,48 @@
         from reportlab.lib.pagesizes import A4, landscape
         from reportlab.lib.styles import getSampleStyleSheet
-        from reportlab.platypus import Frame, Paragraph, Image
+        from reportlab.platypus import (Frame, Paragraph, Image,
+            Table, Spacer)
+        from reportlab.platypus.flowables import HRFlowable
 
         pdf = canvas.Canvas('application_slip.pdf',pagesize=A4)
         width, height = A4
         style = getSampleStyleSheet()
+
         story = []
-        frame = Frame(1*cm,1*cm,width-(2*cm),height-(2*cm))
+        frame_header = Frame(1*cm,1*cm,width-(4*cm),height-(1*cm))
+        header_title = getattr(grok.getSite(), 'name', u'Sample University')
+        story.append(Paragraph(header_title, style["Heading1"]))
+        #import pdb; pdb.set_trace()
+        frame_header.addFromList(story,pdf)
+
+        story = []
+        frame_body = Frame(1*cm,1*cm,width-(4*cm),height-(3*cm))
+        story.append(Paragraph(self.label, style["Title"]))
+        story.append(HRFlowable())
+        story.append(Spacer(1, 24))
+
         self.setUpWidgets()
-        
+
+        data = []
         for widget in self.widgets:
+            f_label = '<font size=12>%s</font>' % widget.label.strip()
+            f_label = Paragraph(f_label, style["Normal"])
             if widget.name != 'form.passport':
-                ptext = widget()
-                story.append(Paragraph(ptext, style["Normal"]))
+                f_text = '<font size=12>%s</font>' % widget()
+                f_text = Paragraph(f_text, style["Normal"])
+                data.append([f_label,f_text])
             else:
-                #import pdb; pdb.set_trace()
                 filename = widget._data.file.name
                 im = Image(filename)
-                story.append(im)
-        frame.addFromList(story,pdf)
+                data.append([f_label,im])
+        f_label = '<font size=12>Admitted Course of Study</font>'
+        f_text = '<font size=12>%s</font>' % self.getCourseAdmitted()
+        f_label = Paragraph(f_label, style["Normal"])
+        f_text = Paragraph(f_text, style["Normal"])
+        data.append([f_label,f_text])
+        table = Table(data)
+        story.append(table)
+        frame_body.addFromList(story,pdf)
+
         self.response.setHeader(
             'Content-Type', 'application/pdf')
