Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 5962)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 5977)
@@ -1,3 +1,3 @@
-<h2 tal:content="context/course/code">TITLE</h2>
+<h2 tal:content="context/__name__">TITLE</h2>
 
 <table class="listing">
@@ -6,5 +6,5 @@
   <tbody>
     <tr class="odd">
-      <td>Reference Code:</td>
+      <td>Code:</td>
       <td tal:content="context/__name__">CODE</td>
     </tr>  
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 5962)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 5977)
@@ -1,29 +1,29 @@
 <h2 tal:content="context/title">TITLE</h2>
 
-<table class="listing">
+<table class="zebra">
   <thead>
   </thead>
   <tbody>
-    <tr class="odd">
+    <tr>
       <td>Code:</td>
       <td tal:content="context/__name__">CODE</td>
     </tr>   
-    <tr class="even">
+    <tr>
       <td>Title:</td>
       <td tal:content="context/title">THE TITLE</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Start Level:</td>
       <td tal:content="context/start_level">START_LEVEL</td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>End Level:</td>
       <td tal:content="context/end_level">END_LEVEL</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Study Mode:</td>
       <td tal:content="context/study_mode">STUDY_MODE</td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Application Category:</td>
       <td tal:content="context/application_category">APPLICATION_CATEGORY</td>
@@ -32,51 +32,41 @@
 </table>
 
-<h3>Courses</h3>
+<h3><span tal:content="context/__name__">Code</span> Course Referrers</h3>
 
+    <table class="zebra">
+      <thead>
+        <tr>
+          <th>Course Referrer</th>
+          <th>Course</th>
+          <th>Title</th>
+          <th>Level</th>
+          <th>Semester</th>
+          <th>Mandatory</th>
+          <th>&nbsp;</th>
+        </tr>      
+      </thead>    
+      <tbody>
+      <span tal:omit-tag="" tal:repeat="level python: sorted(view.getCourseList().items())">
+      <span tal:omit-tag="" tal:repeat="semester python: sorted(level[1].items())">
+      <tr tal:repeat="courseref python:semester[1]">
+        <td> <a href="" tal:attributes="href courseref/url" tal:content="courseref/code">courseref code</a></td>
+        <td> <a href="" tal:attributes="href courseref/course_url" tal:content="courseref/course/code">course code</a></td>
+        <td tal:content="courseref/title">title</td>
+        <td tal:content="python:level[0]">level</td>
+        <td tal:content="python:semester[0]">semester</td>
+        <td tal:content="courseref/mandatory">mandatory</td>
+        <td>
+            <form method="POST">
+              <input type="hidden" name="code" 
+            	 value="" tal:attributes="value courseref/course/code" />
+              <input type="hidden" name="level" 
+            	 value="" tal:attributes="value python:level[0]" />
+              <input type="submit" name="delcourse" value="delete" />
+             </form>        
+        </td>
+      </tr>
+      </span>
+      </span>
+      </tbody>
+    </table>
 
-<div tal:repeat="level python: sorted(view.getCourseList().items())">
-  <b>
-    Level <span tal:replace="python: level[0]">100</span>
-  </b>
-
-  <div tal:repeat="semester python: sorted(level[1].items())">
-    <div tal:condition="python: semester[0] == '0'">
-      &nbsp;&nbsp;Untimed courses
-    </div>
-    <div tal:condition="python: semester[0] == '1'">
-      &nbsp;&nbsp;First semester
-    </div>
-    <div tal:condition="python: semester[0] == '2'">
-      &nbsp;&nbsp;Second semester
-    </div>
-    <div tal:condition="python: semester[0] == '3'">
-      &nbsp;&nbsp;Combined
-    </div>
-    
-    <div tal:repeat="course python:semester[1]">
-      &nbsp;&nbsp;&nbsp;&nbsp;
-	<form method="POST">
-	  <input type="hidden" name="code" 
-		 value="" tal:attributes="value course/code" />
-	  <input type="hidden" name="level" 
-		 value="" tal:attributes="value python:level[0]" />
-	  <input type="submit" name="delcourse" value="delete" />
-
-      <a href="" 
-	 tal:attributes="href course/url"
-	 ><span tal:content="course/code">code</span>
-      </a>
-      <span tal:content="course/title">title</span>
-      <span tal:condition="course/mandatory">
-	[mandatory]
-      </span>
-      <span tal:condition="not: course/mandatory">
-	[optional]
-      </span>
-	</form>
-    </div>
-  </div>
-
-</div>
-
-
