Changeset 833

Timestamp:

10 Nov 2006, 20:58:02 (18 years ago)

Author:

Henrik Bettermann

Message:

some vocabulary entries added
book button renamed

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_accommodation_fe.xml (modified) (3 diffs)
• profiles/default/vocabularies/exam_types.xml (modified) (1 diff)
• profiles/default/vocabularies/high_grade.xml (modified) (1 diff)
• profiles/default/vocabularies/high_qual.xml (modified) (1 diff)
• skins/waeup_student/admission_rejected_view.pt (modified) (1 diff)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)
• skins/waeup_student/widget_waeup_result_render.pt (modified) (1 diff)

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

@@ -77 +77 @@
    <element value="edit"/>
   </property>
-  <property name="hidden_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
   <property name="hidden_readonly_layout_modes"/>
   <property name="render_method">formatBed</property>
@@ -90 +92 @@
   <property name="readonly_layout_modes">
    <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
    <element value="create"/>
   </property>
-  <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
  </widget>
@@ -133 +136 @@
  </table>
 </object>
+

WAeUP_SRP/trunk/profiles/default/vocabularies/exam_types.xml

@@ -6 +6 @@
     <property name="acl_write_roles">Manager</property>
 
+    <item key="" msgid="">None</item>
     <item key="ssce" msgid="">SSCE</item>
     <item key="wasc" msgid="">WASC</item>

WAeUP_SRP/trunk/profiles/default/vocabularies/high_grade.xml

@@ -5 +5 @@
     <property name="description"></property>
 
+    <item key="" msgid="">None</item>
     <item key="upper_credit" msgid="">Upper Credit</item>
     <item key="distinction" msgid="">Distinction</item>

WAeUP_SRP/trunk/profiles/default/vocabularies/high_qual.xml

@@ -5 +5 @@
     <property name="description"></property>
     <property name="acl_write_roles">Manager</property>
-
+    
+    <item key="" msgid="">None</item>
     <item key="nce" msgid="">National Certificate Of Education</item>
     <item key="pre" msgid="">Pre Degree Programme</item>

WAeUP_SRP/trunk/skins/waeup_student/admission_rejected_view.pt

@@ -5 +5 @@
       <metal:block use-macro="here/error_not_found/macros/not_found" />
     </span>
-    <span tal:condition="info"
-          tal:define="review_state info/review_state">
-      <h2>You are not admitted to the University of Benin!</h2>
+    <span tal:condition="info">
+      <h3>You are not admitted into the University of Benin!</h3>
     </span>
     </metal:main>

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -28 +28 @@
         mode = 'edit'
 d = {}
-button = "Bookaccommodation"
+button = "Book"
 if mode == 'edit':
     info = context.getStudentInfo()

WAeUP_SRP/trunk/skins/waeup_student/widget_waeup_result_render.pt

@@ -26 +26 @@
                   tal:attributes="name string:${name}_s;
                   id string:${name}_s;">
-              <option tal:repeat="sub python:(('','----'),('Math','Math'),('English','English'))"
+              <option tal:repeat="sub python:(('','----'),('Maths','Mathematics'),('English','English'))"
                       tal:attributes="value python:sub[0]"
                       tal:content="python: sub[1]">