Changeset 188

Timestamp:

17 Nov 2005, 08:55:12 (19 years ago)

Author:

Henrik Bettermann

Message:

minor modifications

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPLayouts.py (modified) (6 diffs)
• waeup_default/getWAeUPTypes.py (modified) (1 diff)
• waeup_student/check_admission_form.pt (modified) (1 diff)
• waeup_student/clearance_form.pt (modified) (1 diff)
• waeup_student/eligibility_form.pt (modified) (1 diff)
• waeup_student/register_level.py (modified) (2 diffs)

waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py

@@ -946 +946 @@
         },
         'jamb_aggregate': {
-            'type': 'Int Widget',
-            'data': {
-                'title': 'Agregate',
+            'type': 'String Widget',
+            'data': {
+                'title': 'Aggregate',
                 'fields': ('jamb_aggregate',),
                 'is_required': False,
-                'label': 'Score',
-                'label_edit': 'Score',
+                'label': 'JAMB Score',
+                'label_edit': 'JAMB Score',
                 'description': '',
                 'help': '',
@@ -1011 +1011 @@
     }###)
 
-    
+
 student_eligibility = { ###(
     'widgets': eli_widgets,
@@ -1019 +1019 @@
         'ncols': 1,
         'rows': [
-            [{'widget_id': 'jamb_results', 'ncols': 1},],
+            #[{'widget_id': 'jamb_results', 'ncols': 1},],
             [{'widget_id': 'jamb_aggregate', 'ncols': 1},],
             [{'widget_id': 'jamb_listing_date', 'ncols': 1},],
@@ -1036 +1036 @@
         'ncols': 1,
         'rows': [
-            [{'widget_id': 'jamb_results', 'ncols': 1},],
+            #[{'widget_id': 'jamb_results', 'ncols': 1},],
             [{'widget_id': 'jamb_aggregate', 'ncols': 1},],
-            [{'widget_id': 'jamb_listing_date', 'ncols': 1},],
+            #[{'widget_id': 'jamb_listing_date', 'ncols': 1},],
             [{'widget_id': 'faculty', 'ncols': 1},],
             [{'widget_id': 'course', 'ncols': 1},],
@@ -1130 +1130 @@
                 'fields': ('passport',),
                 'is_required': False,
-                'label': 'scanned Passport',
-                'label_edit': 'scanned Passport',
+                'label': 'Scanned Passport',
+                'label_edit': 'Scanned Passport',
                 'description': '',
                 'help': '',
@@ -1613 +1613 @@
         },
         'aggregate': {
-            'type': 'Int Widget',
+            'type': 'String Widget',
             'data': {
                 'title': 'Agregate',
                 'fields': ('aggregate',),
                 'is_required': False,
-                'label': 'Score',
-                'label_edit': 'Score',
+                'label': 'JAMB Score',
+                'label_edit': 'JAMB Score',
                 'description': '',
                 'help': '',

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -298 +298 @@
           'id'        : 'eligibility',
           'name'      : 'Eligibility Data',
-          'action'    : 'eligibility',
+          'action'    : 'ELIGIBILITY',
           'condition':  'object/memberIsOwner',
           'permission': (ModifyPortalContent,),

waeup_product/trunk/skins/waeup_student/check_admission_form.pt

@@ -16 +16 @@
         <h1> Check Your Admission Status! </h1>
         <div tal:replace="structure rendered_main" />
-          Instructions :<br />
+          <p>Instructions :</p>
           <ul>
             <li>Buy an Admission Check Scratch Card </li> 

waeup_product/trunk/skins/waeup_student/clearance_form.pt

@@ -14 +14 @@
     </metal:block>
       <metal:block fill-slot="main">
-        <h1>Clearance and Eligibility Processing </h1>
+        <h1>Start Clearance Process!</h1>
         <div tal:replace="structure rendered_main" />
-          Instructions :<br />
+          <p>Instructions :</p>
           <ul>
             <li>Buy a Clearance Scratch Card </li> 

waeup_product/trunk/skins/waeup_student/eligibility_form.pt

@@ -13 +13 @@
     </metal:block>
       <metal:block fill-slot="main">
-        <h1> Fill in your post-primary school results</h1>
         <div tal:replace="structure rendered_main" />
       </metal:block>

waeup_product/trunk/skins/waeup_student/register_level.py

@@ -26 +26 @@
 if psm == 'invalid':
     return context.register_level_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = 'Please correct your errors',
+                                 psm = "Please correct your input",
+                                 ds = ds,
                                  )
 elif psm == '':
     return context.register_level_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = psm,
+                                 psm = None,
+                                 ds = ds,
                                  )
 
@@ -43 +41 @@
     if level:
         return context.register_level_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = "You have already registered for Level %s" % voc.get(level_id)
+                                 psm = "You have already registered for Level %s" % voc.get(level_id),
+                                 ds = ds,
                                  )