Index: WAeUP_SRP/trunk/skins/waeup_student/application_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 911)
@@ -9,5 +9,5 @@
             
         <div style="text-align: right"
-             tal:condition="python:review_state in ('admission_applied','clearance_pin_entered','admitted',)">
+             tal:condition="python:review_state not in ('created','application_pin_entered',)">
         <a href="" target="slip" tal:attributes="href string:application_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')">
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt	(revision 911)
@@ -2,11 +2,11 @@
 <tal:block define="
            info context/getStudentInfo;
-           isSectionManager context/isSectionManager;
-           isStaff context/isStaff;
-           isClearanceOfficer context/isClearanceOfficer;
-           isStudent context/isStudent;
+           is_sm context/isSectionManager;
+           is_staff context/isStaff;
+           is_co context/isClearanceOfficer;
+           is_student context/isStudent;
            review_state info/review_state;
            clear_review_state info/clear_review_state;
-           editable python: (isStudent and clear_review_state == 'opened' or isSectionManager) and not isClearanceOfficer;
+           editable python: (is_student and clear_review_state == 'opened' or is_sm) and not is_co;
            mode python: test(editable,'edit','view');
            rendered_main python:info['clear_doc'].render(request=request,
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt	(revision 911)
@@ -4,13 +4,8 @@
 <metal:block define-macro="header">
   <!--  Administration -->
-  <tal:block condition="python: not(isStaff or isSectionManager or isStudent)">
+  <tal:block condition="python: not(is_staff or is_sm or is_student)">
     <metal:block use-macro="here/error_not_found/macros/not_found" />
   </tal:block>
-  <tal:block condition="python: isStaff or isSectionManager">
-    <a href="" tal:condition="python: 0"
-       tal:attributes="href string:${here/academicsParent}">
-      <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
-      Up one level
-    </a>
+  <tal:block condition="is_staff">
     <h3> 
       <span tal:condition="info">
@@ -21,6 +16,6 @@
     <br />    
   </tal:block>
-  <!--  Student -->
-  <tal:block condition="python: isStudent">
+  <!-- Student -->
+  <tal:block condition="python: is_student">
     <a href=""
        tal:attributes="href string:${here/academicsParent}">
@@ -34,5 +29,5 @@
 <!--  buttons -->
 <metal:block define-macro="buttons">
-  <!--  isSectionManager -->
+  <!-- SectionManager -->
   <tal:block condition="context/isSectionManager"> 
   
@@ -69,6 +64,6 @@
            tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" />
   </tal:block>
-  <!--  isClearanceOfficer -->
-  <tal:block condition="context/isClearanceOfficer"> 
+  <!--  ClearanceOfficer -->
+  <tal:block condition="is_co"> 
     <input type="submit" class="standalone" 
            name="clear_and_validate_button"
@@ -82,6 +77,6 @@
            tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" />
   </tal:block>
-  <!--  isStudent -->
-  <tal:block condition="context/isStudent"> 
+  <!--  Student -->
+  <tal:block condition="is_student"> 
   
      <div tal:condition="python:info['review_state'] == 'clearance_pin_entered'">
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt	(revision 911)
@@ -1,4 +1,4 @@
 <metal:html tal:define="info context/getStudentInfo;
-                        is_manager info/is_manager|nothing;
+                        is_so info/is_so|nothing;
                         is_student info/is_student|nothing;
                         ">
@@ -22,5 +22,5 @@
 
         <h3> 
-           <span tal:condition="python:is_manager and info">
+           <span tal:condition="python:is_so and info">
              <span tal:content="info/student/Title" />:
            </span>
Index: WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 911)
@@ -1,7 +1,4 @@
 <metal:html tal:define="member python:context.portal_membership.getAuthenticatedMember();
                         info context/getStudentInfo;
-                        is_manager info/is_manager|nothing;
-                        is_student info/is_student|nothing;
-                        is_co info/is_co|nothing;
                         ">
   <metal:body use-macro="here/main_template/macros/master">
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py	(revision 911)
@@ -21,7 +21,8 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
 info['is_student'] = context.isStudent()
 info['is_co'] = context.isClearanceOfficer()
+info['is_so'] = context.isSectionOfficer()
 member_id = str(member)
 if student is None:
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py	(revision 911)
@@ -18,5 +18,6 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.campus.absolute_url()
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py	(revision 911)
@@ -44,5 +44,6 @@
 student_id = pt[-(3+p)]
 level_id = pt[-(1+p)]
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.absolute_url()
Index: WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt	(revision 911)
@@ -9,5 +9,5 @@
             
         <div style="text-align: right"
-             tal:condition="python:review_state in ('admitted', 'pume_passed', 'pume_failed', 'clearance_pin_entered',)">
+            >
         <a href="" target="slip" tal:attributes="href string:pume_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')">
Index: WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py	(revision 911)
@@ -1,3 +1,3 @@
-## Script (Python) "co_searchStudents"
+## Script (Python) "searchStudents"
 ##bind container=container
 ##bind context=context
@@ -49,5 +49,4 @@
 pr = context.portal_registration
 path_info = request.get('PATH_INFO').split('/')
-is_manager = context.isSectionManager()
 validate = request.has_key("cpsdocument_edit_button")
 default = {'search_mode': 'name',
Index: WAeUP_SRP/trunk/skins/waeup_student/student_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 911)
@@ -1,4 +1,5 @@
 <metal:html tal:define="info context/getStudentInfo;
-                is_manager info/is_manager|nothing;
+                is_so info/is_so|nothing;
+                is_staff context/isStaff;
                 is_student info/is_student|nothing">
   <metal:body use-macro="here/main_template/macros/master">
@@ -11,5 +12,5 @@
                         rows python: info['items']">
 
-      <a href="" tal:condition="is_manager"
+      <a href="" tal:condition="is_staff"
          tal:attributes="href string:${here/academicsParent}">
         <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
@@ -20,5 +21,5 @@
         <br />
 
-        <table tal:condition="is_manager" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+        <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">      
           <tr tal:repeat="row rows"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
Index: WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt	(revision 911)
@@ -1,4 +1,4 @@
 <metal:html tal:define="info context/getStudyCourseInfo;
-            is_manager info/is_manager|nothing;
+            is_so info/is_so|nothing;
             s_info context/getStudentInfo;"
             >
@@ -11,5 +11,5 @@
       </a>
       <h3> 
-         <span tal:condition="python:is_manager and s_info">
+         <span tal:condition="python:is_so and s_info">
            <span tal:content="s_info/student/Title" />:
          </span>
@@ -30,7 +30,7 @@
             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_manager">
+                tal:condition="python: 0 and is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                     tal:condition="is_manager"
+                     tal:condition="is_so"
                      tal:define="id row/id"
                      tal:attributes="value id;
@@ -49,5 +49,5 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="python:0 and is_manager">
+              <span tal:condition="python:0 and is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"
Index: WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt	(revision 911)
@@ -1,4 +1,4 @@
 <metal:html tal:define="info context/getStudyLevelInfo;
-            is_manager info/is_manager|nothing;
+            is_so info/is_so|nothing;
             s_info context/getStudentInfo;"
             >
@@ -11,5 +11,5 @@
       </a>
       <h3> 
-         <span tal:condition="python:is_manager and s_info">
+         <span tal:condition="python:is_so and s_info">
            <span tal:content="s_info/student/Title" />:
          </span>
@@ -34,7 +34,7 @@
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
               <td align="left" valign="middle" style="width: 5px;" 
-                  tal:condition="python:1 and is_manager">
+                  tal:condition="python:1 and is_so">
                 <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                       tal:condition="is_manager"
+                       tal:condition="is_so"
                        tal:define="id row/id"
                        tal:attributes="value id;
@@ -48,5 +48,5 @@
                 <td tal:content="row/semester"></td>
                 <td tal:content="row/credits"></td>
-                <td tal:condition="is_manager" tal:content="row/score"></td>
+                <td tal:condition="is_so" tal:content="row/score"></td>
                 <td tal:content="row/grade"></td>
                 <td tal:content="row/weight"></td>
@@ -70,5 +70,5 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="python:1 and is_manager">
+              <span tal:condition="python:1 and is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"
Index: WAeUP_SRP/trunk/skins/waeup_student/support_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/support_form.pt	(revision 909)
+++ WAeUP_SRP/trunk/skins/waeup_student/support_form.pt	(revision 911)
@@ -1,5 +1,4 @@
 <metal:html tal:define="info context/getStudentInfo;
-                is_manager info/is_manager|nothing;
-                is_student info/is_student|nothing">
+                ">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
