Ignore:
Timestamp:
19 Mar 2007, 18:57:54 (18 years ago)
Author:
uli
Message:

Merged current trunk into uli-branch.

Location:
WAeUP_SRP/branches/uli/profiles/default
Files:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/branches/uli/profiles/default/actionicons.xml

    r1477 r1593  
    5757              action_id="allocate_reserved_bed"
    5858              title="Allocate Reserved Bed" priority="100"
    59               icon_expr="bed_list_refresh.gif"/>             
     59              icon_expr="bed_list_refresh.gif"/>
     60 <action-icon category="object"
     61              action_id="release_bed"
     62              title="Relase Bed" priority="110"
     63              icon_expr="door_out.png"/>   
    6064 <action-icon category="folder" action_id="portlets"
    6165              title="Manage portlets" priority="270"

  • WAeUP_SRP/branches/uli/profiles/default/layouts/student_accommodation.xml

    r1449 r1593  
    110110  </property>
    111111  <property name="hidden_readonly_layout_modes"/>
    112   <property name="render_method">formatBed</property>
     112  <property name="render_method">getFormattedBed</property>
    113113 </widget>
    114114 <widget name="session" meta_type="String Widget">

  • WAeUP_SRP/branches/uli/profiles/default/layouts/student_accommodation_fe.xml

    r1449 r1593  
    7979  </property>
    8080  <property name="hidden_readonly_layout_modes"/>
    81   <property name="render_method">formatBed</property>
     81  <property name="render_method">getFormattedBed</property>
    8282 </widget>
    8383 <widget name="session" meta_type="String Widget">

  • WAeUP_SRP/branches/uli/profiles/default/payments_catalog.xml

    r1403 r1593  
    11<?xml version="1.0"?>
    22<?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
    3 <object name="payments_catalog" meta_type="CMF Catalog">
     3<object name="payments_catalog" meta_type="WAeUP Table">
    44 <column value="id"/>
    55 <column value="student_id"/>

  • WAeUP_SRP/branches/uli/profiles/default/pumeresults.xml

    r1456 r1593  
    11<?xml version="1.0"?>
    22<?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
    3 <object name="portal_catalog" meta_type="WAeUP Table">
     3<object name="portal_pumeresults" meta_type="WAeUP Table">
    44 <column value="jamb_reg_no"/>
    55 <column value="name"/>

  • WAeUP_SRP/branches/uli/profiles/default/results_import.xml

    r1456 r1593  
    11<?xml version="1.0"?>
    22<?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
    3 <object name="portal_catalog" meta_type="CMF Catalog">
     3<object name="results_import" meta_type="WAeUP Table">
    44 <column value="key"/>
    55 <column value="matric_no"/>

  • WAeUP_SRP/branches/uli/profiles/default/returning_import.xml

    r1456 r1593  
    11<?xml version="1.0"?>
    22<?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
    3 <object name="portal_catalog" meta_type="CMF Catalog">
     3<object name="returning_import" meta_type="WAeUP Table">
    44 <column value="matric_no"/>
    55 <column value="Entryregno"/>

  • WAeUP_SRP/branches/uli/profiles/default/schemas/import_student_course_results.xml

    r1533 r1593  
    66 <field name="score" meta_type="CPS String Field"/>
    77</object>
    8 

  • WAeUP_SRP/branches/uli/profiles/default/themes.xml

    r1518 r1593  
    2525  <element key="payment_receipt" value="WAeUP_Student+Slippage"/>
    2626  <element key="course_registration_slip" value="WAeUP_Student+Slippage"/>
     27  <element key="external_study_level_view" value="WAeUP_Student+Slippage"/>
     28  <element key="external_contact_student_form" value="WAeUP_Student+Slippage"/>
    2729 </property>
    2830 <object name="default" meta_type="Portal Theme"/>

  • WAeUP_SRP/branches/uli/profiles/default/types/StudyLevel.xml

    r1449 r1593  
    3737  <permission value="View"/>
    3838 </action>
    39    <action title="Add Course" action_id="new_entry" category="object"
    40     condition_expr=""
    41     url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
    42     visible="True">
    43   <permission value="Modify portal content"/>
     39  <action title="Add Course" action_id="new_entry" category="object"
     40          condition_expr=""
     41          url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
     42          visible="True">
     43    <permission value="Modify portal content"/>
     44  </action>
     45  <action title="Delegate" action_id="localroles" category="object"
     46          condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
     47          visible="True">
     48    <permission value="Modify portal content"/>
    4449 </action>
     50
    4551</object>

  • WAeUP_SRP/branches/uli/profiles/default/vocabularies/searchable_student_states.xml

    r1516 r1593  
    1919 <item key="clearance_requested" msgid="">clearance requested</item>
    2020 <item key="cleared_and_validated" msgid="">cleared and validated</item>
    21  <item key="content_addable" msgid="">content addable</item>
     21 <item key="courses_registered" msgid="">courses registered</item>
     22 <item key="courses_validated" msgid="">courses validated</item>
    2223</object>
Note: See TracChangeset for help on using the changeset viewer.