Changeset 1028


Ignore:
Timestamp:
11 Dec 2006, 15:32:32 (18 years ago)
Author:
Henrik Bettermann
Message:

date labels changed
SectionReader? role can be assigned by SectionOfficers?
formaction changed in waeup_edit_form
warning added in clearance_pin_form

Location:
WAeUP_SRP/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml

    r877 r1028  
    1919  </property>
    2020  <property name="hidden_readonly_layout_modes"/>
    21   <property name="view_format">iso8601_medium_easy</property>
     21  <property name="view_format">medium</property>
    2222  <property name="hidden_empty"></property>
    2323 </widget>
    … …  
    9191  </property>
    9292  <property name="hidden_readonly_layout_modes"/>
    93   <property name="view_format">iso8601_medium_easy</property>
     93  <property name="view_format">medium</property>
    9494 </widget>
    9595 <widget name="acco_res_sc_pin" meta_type="Scratchcard Pin Widget">

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

    r877 r1028  
    2020  </property>
    2121  <property name="hidden_readonly_layout_modes"/>
    22   <property name="view_format">iso8601_medium_easy</property>
     22  <property name="view_format">medium</property>
    2323 </widget>
    2424 <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
    … …  
    5050  </property>
    5151  <property name="hidden_readonly_layout_modes"/>
    52   <property name="view_format">iso8601_medium_easy</property>
     52  <property name="view_format">medium</property>
    5353 </widget>
    5454 <widget name="acco_res_sc_pin" meta_type="Scratchcard Pin Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml

    r877 r1028  
    1717  <property name="hidden_layout_modes"/>
    1818  <property name="hidden_readonly_layout_modes"/>
    19   <property name="view_format">iso8601_medium_easy</property>
     19  <property name="view_format">medium</property>
    2020 </widget>
    2121<widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    … …  
    4949 </property>
    5050 <property name="hidden_readonly_layout_modes"/>
    51  <property name="view_format">iso8601_medium_easy</property>
     51 <property name="view_format">medium</property>
    5252</widget>
    5353 <widget name="entry_mode" meta_type="String Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

    r980 r1028  
    2121  </property>
    2222  <property name="hidden_readonly_layout_modes"/>
    23   <property name="view_format">iso8601_medium_easy</property>
     23  <property name="view_format">medium</property>
    2424 </widget>
    2525 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    … …  
    5353 </property>
    5454 <property name="hidden_readonly_layout_modes"/>
    55  <property name="view_format">iso8601_medium_easy</property>
     55 <property name="view_format">medium</property>
    5656</widget>
    5757 <widget name="entry_mode" meta_type="String Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml

    r1016 r1028  
    6363   <element value="alr_date"/>
    6464  </property>
    65   <property name="label">Exam Date</property>
    66   <property name="label_edit">Exam Date</property>
    67   <property name="readonly_layout_modes"/>
    68   <property name="hidden_layout_modes">
    69    <element value="create"/>
    70   </property>
    71   <property name="hidden_readonly_layout_modes"/>
    72   <property name="view_format">iso8601_medium_easy</property> 
     65  <property name="label">Exam Date (dd/mm/yyyy)</property>
     66  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     67  <property name="readonly_layout_modes"/>
     68  <property name="hidden_layout_modes">
     69   <element value="create"/>
     70  </property>
     71  <property name="hidden_readonly_layout_modes"/>
     72  <property name="view_format">iso8601_medium_easy</property>
    7373 </widget>
    7474 <widget name="alr_fname" meta_type="String Widget">
    … …  
    149149 </widget>
    150150 <widget name="birthday" meta_type="Date Widget">
    151   <property name="title">Day of Birth</property>
     151  <property name="title">Date of Birth</property>
    152152  <property name="fields">
    153153   <element value="birthday"/>
    154154  </property>
    155   <property name="label">Day of Birth</property>
    156   <property name="label_edit">Day of Birth</property>
    157   <property name="readonly_layout_modes"/>
    158   <property name="hidden_layout_modes">
    159    <element value="create"/>
    160   </property>
    161   <property name="hidden_readonly_layout_modes"/>
    162   <property name="view_format">iso8601_medium_easy</property> 
     155  <property name="label">Date of Birth (dd/mm/yyyy)</property>
     156  <property name="label_edit">Date of Birth (dd/mm/yyyy)</property>
     157  <property name="readonly_layout_modes"/>
     158  <property name="hidden_layout_modes">
     159   <element value="create"/>
     160  </property>
     161  <property name="hidden_readonly_layout_modes"/>
     162  <property name="view_format">iso8601_medium_easy</property>
    163163 </widget>
    164164 <widget name="cert" meta_type="Image Widget">
    … …  
    231231   <element value="entry_date"/>
    232232  </property>
    233   <property name="label">Entry Date</property>
    234   <property name="label_edit">Entry Date</property>
     233  <property name="label">Entry Date (dd/mm/yyyy)</property>
     234  <property name="label_edit">Entry Date (dd/mm/yyyy)</property>
    235235  <property name="readonly_layout_modes">
    236236   <element value="edit"/>
    … …  
    240240  </property>
    241241  <property name="hidden_readonly_layout_modes"/>
    242   <property name="view_format">iso8601_medium_easy</property> 
     242  <property name="view_format">iso8601_medium_easy</property>
    243243  </widget>
    244244 <widget name="request_date" meta_type="Date Widget">
    … …  
    247247   <element value="request_date"/>
    248248  </property>
    249   <property name="label">Request Date</property>
    250   <property name="label_edit">Request Date</property>
     249  <property name="label">Request Date (dd/mm/yyyy)</property>
     250  <property name="label_edit">Request Date (dd/mm/yyyy)</property>
    251251  <property name="readonly_layout_modes">
    252252   <element value="edit"/>
    … …  
    256256  </property>
    257257  <property name="hidden_readonly_layout_modes"/>
    258   <property name="view_format">iso8601_medium_easy</property> 
     258  <property name="view_format">iso8601_medium_easy</property>
    259259 </widget>
    260260 <widget name="cleared_date" meta_type="Date Widget">
    … …  
    263263   <element value="cleared_date"/>
    264264  </property>
    265   <property name="label">Cleared Date</property>
    266   <property name="label_edit">Cleared Date</property>
     265  <property name="label">Cleared Date (dd/mm/yyyy)</property>
     266  <property name="label_edit">Cleared Date (dd/mm/yyyy)</property>
    267267  <property name="readonly_layout_modes">
    268268   <element value="edit"/>
    … …  
    272272  </property>
    273273  <property name="hidden_readonly_layout_modes"/>
    274   <property name="view_format">iso8601_medium_easy</property> 
     274  <property name="view_format">iso8601_medium_easy</property>
    275275 </widget>
    276276 <widget name="entry_session" meta_type="String Widget">
    … …  
    323323   <element value="fst_sit_date"/>
    324324  </property>
    325   <property name="label">Exam Date</property>
    326   <property name="label_edit">Exam Date</property>
    327   <property name="readonly_layout_modes"/>
    328   <property name="hidden_layout_modes">
    329    <element value="create"/>
    330   </property>
    331   <property name="hidden_readonly_layout_modes"/>
    332   <property name="view_format">iso8601_medium_easy</property> 
     325  <property name="label">Exam Date (dd/mm/yyyy)</property>
     326  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     327  <property name="readonly_layout_modes"/>
     328  <property name="hidden_layout_modes">
     329   <element value="create"/>
     330  </property>
     331  <property name="hidden_readonly_layout_modes"/>
     332  <property name="view_format">iso8601_medium_easy</property>
    333333 </widget>
    334334 <widget name="fst_sit_fname" meta_type="String Widget">
    … …  
    637637   <element value="scd_sit_date"/>
    638638  </property>
    639   <property name="label">Exam Date</property>
    640   <property name="label_edit">Exam Date</property>
    641   <property name="readonly_layout_modes"/>
    642   <property name="hidden_layout_modes">
    643    <element value="create"/>
    644   </property>
    645   <property name="hidden_readonly_layout_modes"/>
    646   <property name="view_format">iso8601_medium_easy</property> 
     639  <property name="label">Exam Date (dd/mm/yyyy)</property>
     640  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     641  <property name="readonly_layout_modes"/>
     642  <property name="hidden_layout_modes">
     643   <element value="create"/>
     644  </property>
     645  <property name="hidden_readonly_layout_modes"/>
     646  <property name="view_format">iso8601_medium_easy</property>
    647647 </widget>
    648648 <widget name="scd_sit_fname" meta_type="String Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml

    r1016 r1028  
    7070  </property>
    7171  <property name="hidden_readonly_layout_modes"/>
    72   <property name="view_format">iso8601_medium_easy</property> 
     72  <property name="view_format">iso8601_medium_easy</property>
    7373 </widget>
    7474 <widget name="alr_fname" meta_type="String Widget">
    … …  
    149149 </widget>
    150150 <widget name="birthday" meta_type="Date Widget">
    151   <property name="title">Day of Birth</property>
     151  <property name="title">Date of Birth</property>
    152152  <property name="fields">
    153153   <element value="birthday"/>
    154154  </property>
    155   <property name="label">Day of Birth</property>
    156   <property name="label_edit">Day of Birth</property>
    157   <property name="readonly_layout_modes"/>
    158   <property name="hidden_layout_modes">
    159    <element value="create"/>
    160   </property>
    161   <property name="hidden_readonly_layout_modes"/>
    162   <property name="view_format">iso8601_medium_easy</property> 
     155  <property name="label">Date of Birth (dd/mm/yyyy)</property>
     156  <property name="label_edit">Date of Birth (dd/mm/yyyy)</property>
     157  <property name="readonly_layout_modes"/>
     158  <property name="hidden_layout_modes">
     159   <element value="create"/>
     160  </property>
     161  <property name="hidden_readonly_layout_modes"/>
     162  <property name="view_format">iso8601_medium_easy</property>
    163163 </widget>
    164164 <widget name="cert" meta_type="Image Widget">
    … …  
    231231   <element value="entry_date"/>
    232232  </property>
    233   <property name="label">Entry Date</property>
    234   <property name="label_edit">Entry Date</property>
     233  <property name="label">Entry Date (dd/mm/yyyy)</property>
     234  <property name="label_edit">Entry Date (dd/mm/yyyy)</property>
    235235  <property name="readonly_layout_modes">
    236236   <element value="edit"/>
    … …  
    240240  </property>
    241241  <property name="hidden_readonly_layout_modes"/>
    242   <property name="view_format">iso8601_medium_easy</property> 
     242  <property name="view_format">iso8601_medium_easy</property>
    243243 </widget>
    244244 <widget name="request_date" meta_type="Date Widget">
    … …  
    247247   <element value="request_date"/>
    248248  </property>
    249   <property name="label">Request Date</property>
    250   <property name="label_edit">Request Date</property>
     249  <property name="label">Request Date (dd/mm/yyyy)</property>
     250  <property name="label_edit">Request Date (dd/mm/yyyy)</property>
    251251  <property name="readonly_layout_modes">
    252252   <element value="edit"/>
    … …  
    256256  </property>
    257257  <property name="hidden_readonly_layout_modes"/>
    258   <property name="view_format">iso8601_medium_easy</property> 
     258  <property name="view_format">iso8601_medium_easy</property>
    259259 </widget>
    260260 <widget name="cleared_date" meta_type="Date Widget">
    … …  
    263263   <element value="cleared_date"/>
    264264  </property>
    265   <property name="label">Cleared Date</property>
    266   <property name="label_edit">Cleared Date</property>
     265  <property name="label">Cleared Date (dd/mm/yyyy)</property>
     266  <property name="label_edit">Cleared Date (dd/mm/yyyy)</property>
    267267  <property name="readonly_layout_modes">
    268268   <element value="edit"/>
    … …  
    272272  </property>
    273273  <property name="hidden_readonly_layout_modes"/>
    274   <property name="view_format">iso8601_medium_easy</property> 
     274  <property name="view_format">iso8601_medium_easy</property>
    275275 </widget>
    276276 <widget name="entry_session" meta_type="String Widget">
    … …  
    324324   <element value="fst_sit_date"/>
    325325  </property>
    326   <property name="label">Exam Date</property>
    327   <property name="label_edit">Exam Date</property>
    328   <property name="readonly_layout_modes"/>
    329   <property name="hidden_layout_modes">
    330    <element value="create"/>
    331   </property>
    332   <property name="hidden_readonly_layout_modes"/>
    333   <property name="view_format">iso8601_medium_easy</property> 
     326  <property name="label">Exam Date (dd/mm/yyyy)</property>
     327  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     328  <property name="readonly_layout_modes"/>
     329  <property name="hidden_layout_modes">
     330   <element value="create"/>
     331  </property>
     332  <property name="hidden_readonly_layout_modes"/>
     333  <property name="view_format">iso8601_medium_easy</property>
    334334 </widget>
    335335 <widget name="fst_sit_fname" meta_type="String Widget">
    … …  
    641641   <element value="scd_sit_date"/>
    642642  </property>
    643   <property name="label">Exam Date</property>
    644   <property name="label_edit">Exam Date</property>
    645   <property name="readonly_layout_modes"/>
    646   <property name="hidden_layout_modes">
    647    <element value="create"/>
    648   </property>
    649   <property name="hidden_readonly_layout_modes"/>
    650   <property name="view_format">iso8601_medium_easy</property> 
     643  <property name="label">Exam Date (dd/mm/yyyy)</property>
     644  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
     645  <property name="readonly_layout_modes"/>
     646  <property name="hidden_layout_modes">
     647   <element value="create"/>
     648  </property>
     649  <property name="hidden_readonly_layout_modes"/>
     650  <property name="view_format">iso8601_medium_easy</property>
    651651 </widget>
    652652 <widget name="scd_sit_fname" meta_type="String Widget">

  • WAeUP_SRP/trunk/skins/waeup_custom/getCPSCandidateLocalRoles.py

    r924 r1028  
    2525if member.id in ("admin","perry"):
    2626    return ['SectionReader','SectionManager','ClearanceOfficer', 'SectionOfficer']
    27 return ['ClearanceOfficer', 'SectionOfficer']
     27return ['SectionReader', 'ClearanceOfficer', 'SectionOfficer']

  • WAeUP_SRP/trunk/skins/waeup_default/external_edit_form.pt

    r913 r1028  
    55           use_session=True,
    66           no_form=True);
    7     form_action string:external_edit;
    8     form_type string:external;
    9     is_allowed context/isSectionOfficer;
    10     creation python:False;
    11     metadata metadata|nothing;"
     7           form_action string:external_edit;
     8           form_type string:external;
     9           is_allowed context/isSectionOfficer;
     10           creation python:False;
     11           metadata metadata|nothing;"
    1212    >
    1313  <metal:block use-macro="context/waeup_edit_form/macros/edit_form" />

  • WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt

    r913 r1028  
    55           use_session=True,
    66           no_form=True);
    7            form_action string:cpsdocument_edit;
     7           form_action string:waeup_edit;
    88           form_type string:waeup;
    99           creation python:False;

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_pin_form.pt

    r805 r1028  
    1717        <br />
    1818        <div tal:replace="structure rendered_main" />
     19        <br />
     20        <font color="red">Processing your request may take a while. Please do not press the 'Start' button twice!</font>
     21        <br />
    1922      </metal:block>
    2023      <metal:block fill-slot="sub">
Note: See TracChangeset for help on using the changeset viewer.