Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/change_password.py
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/change_password.py	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/change_password.py	(revision 1669)
@@ -4,4 +4,14 @@
 
 """
+
+return
+
+
+
+
+
+
+
+
 request = context.REQUEST
 import DateTime,logging
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/clearance_edit.py
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/clearance_edit.py	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/clearance_edit.py	(revision 1669)
@@ -120,5 +120,5 @@
         wftool.doActionFor(info['clear'],'open')
         wftool.doActionFor(info['student'],'reject_clearance')
-        action = "/contact_student_form"
+        action = "/external_contact_student_form"
         psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
         subject = "Clearance request rejected"
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getSessionResults.py
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getSessionResults.py	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getSessionResults.py	(revision 1669)
@@ -101,5 +101,5 @@
 #set_trace()
 verdict_voc = context.portal_vocabularies.verdicts
-verdict_code = student_from_cat.get('verdict',None)
+verdict_code = student_from_cat.verdict
 if verdict_code:
     info['verdict'] = verdict = verdict_voc.get(verdict_code,'N/A').upper()
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getStudyLevelInfo.py
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getStudyLevelInfo.py	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getStudyLevelInfo.py	(revision 1669)
@@ -40,8 +40,10 @@
     return 0.0
 
-def cmp_semester(a,b):
-    if a['semester'] == b['semester']:
+def cmp_semester_id(a,b):
+    s1 = "%(semester)s%(id)s" % a
+    s2 = "%(semester)s%(id)s" % b
+    if s1 == s2:
         return 0
-    if a['semester'] > b['semester']:
+    if s1 > s2:
         return 1
     return -1
@@ -104,7 +106,7 @@
         normal.append(d)
 info['credits_total'] = credits_total
-carry_overs.sort(cmp_semester)
+carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs
-normal.sort(cmp_semester)
+normal.sort(cmp_semester_id)
 info['normal'] = normal
 
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/layout_personal_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/layout_personal_view.pt	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/layout_personal_view.pt	(revision 1669)
@@ -9,5 +9,5 @@
       <td><span class="dlabel">Student ID</span>:
       </td>
-      <td tal:condition="nothing"> 
+      <td> 
          <span tal:replace="context/getStudentId" />
       </td>      
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/statistics_new_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/statistics_new_view.pt	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/statistics_new_view.pt	(revision 1669)
@@ -33,5 +33,5 @@
             <th align="right">CR</th>
             <th align="right">VC</th>
-            <th align="right">SFP</th>
+            <th align="right">SFP+</th>
           </tr>
           <tr tal:repeat="d departments"
@@ -74,5 +74,5 @@
         <tr><td>CR: </td> <td>Clearance requested</td></tr>
         <tr><td>VC: </td> <td>Validated and cleared</td></tr>
-        <tr><td>SFP: </td> <td>School fee paid</td></tr>
+        <tr><td>SFP+: </td> <td>School fee paid and further</td></tr>
         </table>
       </span>
Index: WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/study_course_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/study_course_view.pt	(revision 1597)
+++ WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/study_course_view.pt	(revision 1669)
@@ -58,5 +58,5 @@
         </table>        
       
-      <form action="" method="post" class="group"
+      <form action="" method="post" class="group" onsubmit="return submit_once()"
             tal:attributes="action info/action"
             tal:define="rows python: info['items'];"
@@ -66,5 +66,5 @@
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="python: 0 and is_so">
+                tal:condition="python:is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
                      tal:condition="is_so"
@@ -84,9 +84,8 @@
                summary="contents of the folder"
                class="folderButtons">
-          <tr>
+          <tr tal:condition="python: is_so and info['items']">
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="python:0 and is_so">
-                <input type="button" value="button_select_all" class="context"
+              <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"
                        i18n:attributes="value"
@@ -94,15 +93,14 @@
                        % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                        />
-                <input type="submit" name="folder_delete:method" value="button_delete"
-                       class="destructive" i18n:attributes="value"
-                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                       (cpsmcat('description_confirm_delete'), )" 
-                       />
-              </span>
+              <input type="submit" name="folder_delete:method" value="button_delete"
+                     class="destructive" i18n:attributes="value"
+                     tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                     (cpsmcat('description_confirm_delete'), )" 
+                     />
             </td>
           </tr>
         </table>
       </form>
-      <form action="" method="post" class="group"
+      <form action="" method="post" class="group" onsubmit="return submit_once()"
             tal:attributes="action string:${context/absolute_url}/create_level"
             tal:define="rows python: info['items'];"
