Changeset 1596 for WAeUP_SRP/branches/joachim-event-branch/profiles/default

Timestamp:

19 Mar 2007, 21:45:44 (18 years ago)

Author:

joachim

Message:

merged changes from trunk to joachim-event-branch

Location:

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

Files:

• actionicons.xml (modified) (1 diff)
• layouts/student_accommodation.xml (modified) (1 diff)
• layouts/student_accommodation_fe.xml (modified) (1 diff)
• students_catalog.xml (modified) (4 diffs)
• themes.xml (modified) (1 diff)
• vocabularies/searchable_student_states.xml (modified) (1 diff)

WAeUP_SRP/branches/joachim-event-branch/profiles/default/actionicons.xml

@@ -57 +57 @@
               action_id="allocate_reserved_bed"
               title="Allocate Reserved Bed" priority="100"
-              icon_expr="bed_list_refresh.gif"/>              
+              icon_expr="bed_list_refresh.gif"/>
+ <action-icon category="object"
+              action_id="release_bed"
+              title="Relase Bed" priority="110"
+              icon_expr="door_out.png"/>   
  <action-icon category="folder" action_id="portlets"
               title="Manage portlets" priority="270"

WAeUP_SRP/branches/joachim-event-branch/profiles/default/layouts/student_accommodation.xml

@@ -110 +110 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="render_method">formatBed</property>
+  <property name="render_method">getFormattedBed</property>
  </widget>
  <widget name="session" meta_type="String Widget">

WAeUP_SRP/branches/joachim-event-branch/profiles/default/layouts/student_accommodation_fe.xml

@@ -79 +79 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="render_method">formatBed</property>
+  <property name="render_method">getFormattedBed</property>
  </widget>
  <widget name="session" meta_type="String Widget">

WAeUP_SRP/branches/joachim-event-branch/profiles/default/students_catalog.xml

@@ -3 +3 @@
 <object name="students_catalog" meta_type="WAeUP Table">
  <column value="id"/>
+ <column value="review_state"/>
  <column value="matric_no"/>
  <column value="jamb_reg_no"/>
  <column value="name"/>
+ <column value="name_fixed"/>
  <column value="sex"/>
  <column value="faculty"/>
  <column value="department"/>
  <column value="course"/>
+ <column value="registered_courses"/>
  <column value="email"/>
  <column value="phone"/>
@@ -15 +18 @@
  <column value="verdict"/>
  <column value="entry_mode"/>
+ <column value="entry_year"/>
  <index name="id" meta_type="FieldIndex">
   <indexed_attr value="id"/>
+ </index>
+ <index name="review_state" meta_type="FieldIndex">
+  <indexed_attr value="review_state"/>
+ </index>
+ <index name="name" meta_type="TextIndex">
+  <indexed_attr value="review_state"/>
+ </index>
+ <index name="name_fixed" meta_type="FieldIndex">
+  <indexed_attr value="review_state"/>
  </index>
  <index name="jamb_reg_no" meta_type="FieldIndex">
@@ -30 +43 @@
   <indexed_attr value="student_application:entry_mode"/>
  </index>
+ <index name="entry_year" meta_type="KeywordIndex">
+  <indexed_attr value="entry_year"/>
+ </index>
  <index name="department" meta_type="KeywordIndex">
   <indexed_attr value="department"/>
@@ -42 +58 @@
   <indexed_attr value="student_study_course:study_course"/>
  </index>
+ <index name="registered_courses" meta_type="KeywordIndex">
+  <indexed_attr value="student_study_course:study_course"/>
+ </index>
 </object>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/themes.xml

@@ -25 +25 @@
   <element key="payment_receipt" value="WAeUP_Student+Slippage"/>
   <element key="course_registration_slip" value="WAeUP_Student+Slippage"/>
+  <element key="external_study_level_view" value="WAeUP_Student+Slippage"/>
+  <element key="external_contact_student_form" value="WAeUP_Student+Slippage"/>
  </property>
  <object name="default" meta_type="Portal Theme"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/vocabularies/searchable_student_states.xml

@@ -21 +21 @@
  <item key="courses_registered" msgid="">courses registered</item>
  <item key="courses_validated" msgid="">courses validated</item>
- <item key="content_addable" msgid="">content addable</item>
 </object>