Changeset 483 for WAeUP_SRP/trunk

Timestamp:

5 Sep 2006, 20:49:31 (18 years ago)

Author:

Henrik Bettermann

Message:

stylistic modifications

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actionicons.xml (modified) (1 diff)
• profiles/default/layouts/student_application.xml (modified) (3 diffs)
• profiles/default/layouts/student_application_fe.xml (modified) (3 diffs)
• profiles/default/types/Student.xml (modified) (1 diff)
• profiles/default/types/StudentsFolder.xml (modified) (1 diff)
• skins/waeup_student/application_form.pt (modified) (1 diff)
• skins/waeup_student/application_pin_form.pt (modified) (2 diffs)
• skins/waeup_student/bell.png (added)
• skins/waeup_student/student_edit.py (modified) (4 diffs)

WAeUP_SRP/trunk/profiles/default/actionicons.xml

@@ -47 +47 @@
               title="Edit online" priority="100"
               icon_expr="actionicon_edit_online.png"/>
+ <action-icon category="object" action_id="apply_admission"
+              title="Apply for PUME" priority="100"
+              icon_expr="bell.png"/>              
  <action-icon category="folder" action_id="portlets"
               title="Manage portlets" priority="270"

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

@@ -14 +14 @@
   <property name="label">Batch</property>
   <property name="label_edit">Batch</property>
-  <property name="readonly_layout_modes"/>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
@@ -256 +258 @@
   <property
      name="help">Upload passport photograph with red background</property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
+  <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
@@ -321 +321 @@
   <row>
    <cell name="app_ac_prefix"/>
+  </row>
+  <row>
    <cell name="app_ac_batch_no"/>
+  </row>
+  <row>
    <cell name="app_ac_pin"/>
   </row>

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

@@ -14 +14 @@
   <property name="label">Batch</property>
   <property name="label_edit">Batch</property>
-  <property name="readonly_layout_modes"/>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
@@ -192 +194 @@
      name="help">Upload passport photograph with red background</property>
   <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-   <element value="create"/>
-  </property>
+  <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
   <property name="size_max">204800</property>
@@ -208 +208 @@
   <row>
    <cell name="app_ac_prefix"/>
+  </row>
+  <row>
    <cell name="app_ac_batch_no"/>
+  </row>
+  <row>
    <cell name="app_ac_pin"/>
   </row>

WAeUP_SRP/trunk/profiles/default/types/Student.xml

@@ -34 +34 @@
  <alias from="(Default)" to="academics_contents"/>
  <alias from="view" to="academics_contents"/>
- <action title="View" action_id="view" category="object"
+ <action title="Standard View" action_id="view" category="object"
     condition_expr=""
     url_expr="string:${object_url}/academics_contents" visible="True">

WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml

@@ -36 +36 @@
   <permission value="View"/>
  </action>
- <action title="Apply for PUME " action_id="apply_admission" category="object"
+ <action title="Apply for PUME" action_id="apply_admission" category="object"
     condition_expr="" url_expr="string:${object/absolute_url}/apply_admission"
     visible="True">

WAeUP_SRP/trunk/skins/waeup_student/application_form.pt

@@ -12 +12 @@
   <metal:block fill-slot="main">
       <tal:block 
-          tal:define="rendered python:context.getContent().renderEdit(
+          tal:define="rendered_pin python:context.getContent().renderEdit(
+                layout_id='pin',
+                layout_mode='edit',
+                );
+                rendered_main python:context.getContent().renderEdit(
                 layout_id='student_application_fe',
                 layout_mode='edit',
                 );">
-      <tal:block tal:content="structure rendered" />
+      <tal:block tal:content="structure rendered_pin" />
+      <tal:block tal:content="structure rendered_main" />
       </tal:block>  
   </metal:block>

WAeUP_SRP/trunk/skins/waeup_student/application_pin_form.pt

@@ -1 @@
-<tal:block define="rendered_main options/rendered;
+<tal:block define="rendered_pin options/renderes_pin
+                   rendered_main options/rendered_main;
                    portal_status_message options/psm;
                    data_storage options/ds;
@@ -15 +16 @@
       <metal:block fill-slot="main">
         <h1>Apply for the Post University Matriculation Examination! </h1>
+        <div tal:replace="structure rendered_pin" />
         <div tal:replace="structure rendered_main" />
           <p>Instructions :</p>
           <ul>
-            <li>Buy an Appliiication Scratch Card.</li> 
+            <li>Buy an Application Scratch Card.</li> 
             <li>Enter your JAMB registration number and the Application PIN above.</li> 
             <li>Upload your passport picture.</li> 

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -40 +40 @@
     if context.portal_workflow.getInfoFor(student,'review_state',None) == "application_pin_entered":
         student.content_status_modify(workflow_action="apply_for_admission")
-        is_valid, ds = doc.validate(request=REQUEST, 
-                                    proxy=context, 
+        is_valid, ds = doc.validate(request=REQUEST,
+                                    proxy=context,
                                     layout_id = "student_application_fe",
                                     layout_mode = 'edit',
                                     use_session=True)
-        
+
         action = '/application_form'
-        
+
         if is_valid:
             comments = REQUEST.get('comments')
@@ -53 +53 @@
             if cpsdocument_edit_and_view_button is not None:
                 action = ''
-            psm = 'passport image uploaded'
+            psm = 'You successfully uploaded your passport image.'
             args = {}
             action = "/view"
@@ -61 +61 @@
     else:
         args = {}
-        psm = "Application applied waiting for results"
+        psm = "You successfully applied for admission."
         action = "/view"
 else:
     is_valid, ds = doc.validate(request=REQUEST, proxy=context, cluster=cluster,
                                 use_session=True)
-    
+
     if action is None:
         ti = doc.getTypeInfo()
         action = ti.queryMethodID('edit', 'cpsdocument_edit_form')
         action = '/' + action
-    
+
     if is_valid:
         comments = REQUEST.get('comments')
@@ -82 +82 @@
         psm = 'psm_content_error'
         args = getFormUidUrlArg(REQUEST)
-    
+
 args['portal_status_message'] = psm
 url = context.absolute_url() + action + '?' + urlencode(args)