Index: WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt	(revision 1516)
+++ WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt	(revision 1516)
@@ -0,0 +1,115 @@
+<metal:html tal:define="info context/getStudyLevelInfo;
+                  is_so context/isSectionOfficer;
+                  is_ca info/is_ca;
+                  show_check_boxes info/show_check_boxes;
+		  is_student info/is_student;
+		  status_info info/status_info;
+		  review_state info/review_state;
+		  view_only info/view_only">
+  <metal:body use-macro="here/main_template/macros/master">
+    <metal:main fill-slot="main">
+      <span tal:condition="not: info">
+        <span tal:content="here/illegal_view" />
+      </span>
+      <span tal:condition="info">
+      <h3>Course Registration Slip</h3>
+      <br />
+      <table width="" cellpadding="2" cellspacing="0">
+          <tr>
+            <td valign="top"><span class="dlabel">Name</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/name" />
+            </td>      
+          </tr>
+          <tr>
+            <td valign="top"><span class="dlabel">Student Id</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/id" />
+            </td>      
+          </tr>
+          <tr>
+            <td valign="top"><span class="dlabel">Matriculation No</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/matric_no" />
+            </td>      
+          </tr>
+          <tr>
+            <td valign="top"><span class="dlabel">Faculty Id</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/faculty" />
+            </td>      
+          </tr>
+          <tr>
+            <td valign="top"><span class="dlabel">Department Id</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/department" />
+            </td>      
+          </tr>
+          <tr>
+            <td valign="top"><span class="dlabel">Course Id</span>:
+            </td>
+            <td> 
+              <span tal:content="info/student/course" />
+            </td>      
+          </tr>
+      </table>
+
+      <form action="." method="post" class="group">
+        <span tal:condition="info/carry_overs" tal:omit-tag="">
+        <h4>Carryover Courses</h4>
+        <br />
+        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">
+          <tr tal:repeat="row info/carry_overs"
+              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td width="78%" tal:content="row/title"></td>
+            <td align="center" width="10%" tal:content="row/code"></td>
+            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
+            <td align="center" width="2%" tal:content="row/credits"></td>
+            <td align="center" width="8%" tal:content="row/grade|string:"></td>
+          </tr>
+        </table>
+        </span>
+        <h4>Session Courses</h4>
+        <br />
+        <table class="contentListing" width="100%" summary="content layout" id="folder_content">      
+          <tr tal:repeat="row info/normal"
+              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td width="78%" tal:content="row/title"></td>
+            <td align="center" width="10%" tal:content="row/code"></td>
+            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
+            <td align="center" width="2%" tal:content="row/credits"></td>
+            <td align="center" width="8%" tal:content="row/coe|nothing"></td>
+          </tr>
+          <tr>
+            <td></td>
+            <th colspan="2">Total Credits:</th>
+            <td align="center" width="2%" tal:content="info/credits_total"></td>
+          </tr>
+        </table>
+      </form>
+        <span tal:condition="is_ca">   
+              <br /><br />
+              <table  width=100%>
+              <tr >
+              <td width=50%>Date:</td><td>Date:</td>
+              </tr>
+              </table>
+              
+              <br /><br /><br /><br />
+              <table  width=100%>
+              <tr >
+              <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td>
+              <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
+              </tr>
+              </table>
+         </span>              
+       </span>              
+    </metal:main>
+  </metal:body>
+</metal:html>
+  
Index: WAeUP_SRP/trunk/skins/waeup_student/courses_validated_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/courses_validated_slip.pt	(revision 1515)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<metal:html tal:define="info context/getStudyLevelInfo;
-                  is_so context/isSectionOfficer;
-                  is_ca info/is_ca;
-                  show_check_boxes info/show_check_boxes;
-		  is_student info/is_student;
-		  status_info info/status_info;
-		  review_state info/review_state;
-		  view_only info/view_only">
-  <metal:body use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
-      <span tal:condition="not: info">
-        <span tal:content="here/illegal_view" />
-      </span>
-      <span tal:condition="info">
-      <h3>Validated Courses Slip</h3>
-      <form action="." method="post" class="group">
-        <span tal:condition="info/carry_overs" tal:omit-tag="">
-        <h3>Carryover Courses</h3>
-        <br />
-        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">
-          <tr tal:repeat="row info/carry_overs"
-              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/grade|string:"></td>
-          </tr>
-        </table>
-        </span>
-        <h3>Session Courses</h3>
-        <br />
-        <table class="contentListing" width="100%" summary="content layout" id="folder_content">      
-          <tr tal:repeat="row info/normal"
-              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/coe|nothing"></td>
-          </tr>
-          <tr>
-            <td colspan="1"></td>
-            <td colspan="1"></td>
-            <th colspan="2">Total Credits:</th>
-            <td align="center" width="2%" tal:content="info/credits_total"></td>
-          </tr>
-        </table>
-      </form>
-        <span tal:condition="is_ca">   
-              <br /><br />
-              <table  width=100%>
-              <tr >
-              <td width=50%>Date:</td><td>Date:</td>
-              </tr>
-              </table>
-              
-              <br /><br /><br /><br />
-              <table  width=100%>
-              <tr >
-              <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td>
-              <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
-              </tr>
-              </table>
-         </span>              
-       </span>              
-    </metal:main>
-  </metal:body>
-</metal:html>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt	(revision 1515)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt	(revision 1516)
@@ -3,4 +3,5 @@
 <metal:block define-macro="default_view"
   tal:define="layout options/layout;
+              info context/getStudentBaseInfo;
               dm options/datastructure/getDataModel;
               widgets python:context.getRenderedWidgets(layout);
@@ -29,5 +30,5 @@
             </td>
             <td> 
-              <span tal:content="python:context.getStudentBaseInfo()['student']['name']" />
+              <span tal:content="info/student/name" />
             </td>      
           </tr>
@@ -36,5 +37,5 @@
             </td>
             <td> 
-              <span tal:content="python:context.getStudentBaseInfo()['student']['sex']" />
+              <span tal:content="info/student/sex" />
             </td>      
           </tr>          
@@ -43,5 +44,5 @@
             </td>
             <td> 
-              <span tal:content="python:context.getStudentBaseInfo()['id']" />
+              <span tal:content="info/student/id" />
             </td>      
           </tr>
Index: WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 1515)
+++ WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 1516)
@@ -17,8 +17,8 @@
               <div style="text-align: right"
              tal:condition="python:review_state == 'courses_validated'">
-        <a href="" target="slip" tal:attributes="href string:courses_validated_slip"
+        <a href="" target="slip" tal:attributes="href string:course_registration_slip"
             onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
             <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-            Validated Courses Slip
+            Course Registration Slip
         </a>
         
