Changeset 1988 for WAeUP_SRP/branches/joachim-azax-branch/profiles/default

Timestamp:

5 Jul 2007, 11:14:12 (17 years ago)

Author:

joachim

Message:

merged r1979:r1987 from trunk

Location:

WAeUP_SRP/branches/joachim-azax-branch/profiles/default

Files:

• layouts/import_student.xml (modified) (5 diffs)
• schemas/import_student.xml (modified) (1 diff)
• skins.xml (modified) (1 diff)
• toolset.xml (modified) (1 diff)
• vocabularies/courselevel.xml (modified) (1 diff)
• vocabularies/entry_modes.xml (modified) (1 diff)
• vocabularies/verdicts.xml (modified) (2 diffs)

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/layouts/import_student.xml

@@ -8 +8 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
+ <widget name="reg_transition" meta_type="String Widget">
+  <property name="title">Transition after import</property>
+  <property name="fields">
+   <element value="reg_transition"/>
+  </property>
+  <property name="label">Transition</property>
+  <property name="label_edit">Transition</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="email" meta_type="Email Widget">
   <property name="title">Email</property>
@@ -164 +175 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -179 +190 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">courselevel</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -195 +206 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="vocabulary">verdicts</property>
+  <property name="sorted">True</property>
  </widget>
  <widget name="entry_session" meta_type="WAeUP Session Widget">
@@ -206 +218 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/schemas/import_student.xml

@@ -2 +2 @@
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
 <object name="import_student" meta_type="CPS Schema">
+ <field name="reg_transition" meta_type="CPS String Field"/>
  <field name="firstname" meta_type="CPS String Field"/>
  <field name="middlename" meta_type="CPS String Field"/>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/skins.xml

@@ -3 +3 @@
    cookie_persistence="False" default_skin="CPSSkins"
    request_varname="portal_skin">
+ <object name="waeup_azax" meta_type="Filesystem Directory View"
+    directory="WAeUP_SRP/skins/waeup_azax"/>
  <object name="waeup_custom" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_custom"/>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/toolset.xml

@@ -23 +23 @@
  <required tool_id="waeup_tool"
            class="Products.WAeUP_SRP.WAeUPTool.WAeUPTool"/>
+ <required tool_id="kss_tool"
+           class="Products.WAeUP_SRP.Azax.KSSTool"/>
 </tool-setup>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/courselevel.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="unknown" msgid="">unknown</item>
+ <item key="000" msgid="">N/A</item>
  <item key="100" msgid="">Year 1 (100 Level)</item>
  <item key="200" msgid="">Year 2 (200 Level)</item>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/entry_modes.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="unknown" msgid="">unknown</item>
+ <item key="unknown" msgid="">N/A</item>
  <item key="ume_ft" msgid="">UME Full Time</item>
  <item key="de_ft" msgid="">Direct Entry Full Time</item>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/verdicts.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
+ <item key="N/A" msgid="">N/A</item>
  <item key="A" msgid="">successful student</item>
  <item key="B" msgid="">student with carryover courses</item>
@@ -18 +19 @@
  <item key="K" msgid="">unregistered student</item>
  <item key="L" msgid="">referred student</item>
- <item key="N/A" msgid="">N/A</item>
 </object>