Changeset 781 for WAeUP_SRP

Timestamp:

2 Nov 2006, 14:33:30 (18 years ago)

Author:

Henrik Bettermann

Message:

unused state and transition in waeup_student_subobject_wf removed
prefix in atudent_application_fe changed
pume result display simplified

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actions.xml (modified) (5 diffs)
• profiles/default/layouts/student_application_fe.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_subobject_wf/definition.xml (modified) (7 diffs)
• skins/waeup_student/display_pume_result.py (modified) (1 diff)
• skins/waeup_student/display_pume_result_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -2 +2 @@
 <object name="portal_actions" meta_type="CMF Actions Tool">
  <action-provider name="portal_membership">
-  <action title="Login" action_id="login" category="user"
+  <action title="Student Login" action_id="login" category="user"
      condition_expr="not: member"
-     url_expr="string:${portal_url}/login_staff"
+     url_expr="string:${portal_url}/login_student"
      visible="True">
    <permission>View</permission>
@@ -132 +132 @@
   <action title="  " action_id="dummy2" category="object" condition_expr=""
      url_expr="" visible="True"/>
-  <action title="View PUME-Results" action_id="display_pume_result"
+  <action title="Apply for PUME" action_id="apply_admission"
+     category="student" condition_expr="not:member"
+     url_expr="string:${portal_url}/apply_admission"
+     visible="False">
+   <permission>View</permission>
+  </action>
+  <action title="View PUME Results" action_id="display_pume_result"
      category="student" condition_expr="not:member"
      url_expr="string:${portal_url}/display_pume_result"
@@ -142 +148 @@
      url_expr="string:${portal_url}/request_clearance"
      visible="True">
-   <permission>View</permission>
+   <permission>False</permission>
   </action>
   <action title="Book Hostel" action_id="reserve_accommodation"
@@ -148 +154 @@
      url_expr="string:${portal_url}/reserve_accommodation"
      visible="True">
-   <permission>View</permission>
+   <permission>False</permission>
   </action>
   <action title="Register Courses" action_id="register_courses"
@@ -154 +160 @@
      url_expr="string:${portal_url}/register_courses"
      visible="True">
-   <permission>View</permission>
-  </action>  
+   <permission>False</permission>
+  </action>
   <action title="Home" action_id="students_home" category="student_navigation"
      condition_expr="member" url_expr="string:${portal_url}" visible="True">

WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

@@ -36 +36 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="prefix">CLR</property>
+  <property name="prefix">APP</property>
   <property name="reference">jamb_reg_no</property>
   </widget>

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml

@@ -9 +9 @@
  <state state_id="closed" title="">
   <exit-transition transition_id="open"/>
-  <exit-transition transition_id="publish"/>
  </state>
  <state state_id="content_addable" title="">
@@ -55 +54 @@
   </permission-map>
  </state>
- <state state_id="public" title="">
-  <exit-transition transition_id="close"/>
-  <permission-map name="Add portal content" acquired="True">
-  </permission-map>
-  <permission-map name="Modify portal content"
-                  acquired="True">
-  </permission-map>
-  <permission-map name="View" acquired="True">
-   <permission-role>Anonymous</permission-role>
-  </permission-map>
- </state>
  <transition transition_id="close" title=""
              new_state="closed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -79 +67 @@
              new_state="content_addable" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -86 +74 @@
              new_state="created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -95 +83 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
   </guard>
@@ -103 +91 @@
              new_state="opened" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -110 +98 @@
   </guard>
  </transition>
- <transition transition_id="publish" title=""
-             new_state="public" trigger="USER"
-             before_script="" after_script="">
-  
-  <guard>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-  </guard>
- </transition>
 </cps-workflow>

WAeUP_SRP/trunk/skins/waeup_student/display_pume_result.py

@@ -26 +26 @@
                       layout_mode='create',
                       formaction = "display_pume_result",
-                      button = "do Search",
+                      button = "Search",
                       )
 if psm == 'invalid':

WAeUP_SRP/trunk/skins/waeup_student/display_pume_result_form.pt

@@ -13 +13 @@
     </metal:block>
       <metal:block fill-slot="main">
-        <h3>Display Your Post University Matriculation Examination Result! </h3>
+        <h3>Display Your Post University Matriculation Examination Results! </h3>
         <br />
         <div tal:replace="structure rendered_main" />
-          <p>Instructions :</p>
-          <ul>
-            <li>Enter your JAMB registration number above and hit search.</li> 
-        </ul>
       </metal:block>
       <metal:block fill-slot="sub">