Changeset 1275 for WAeUP_SRP


Ignore:
Timestamp:
11 Jan 2007, 20:53:09 (18 years ago)
Author:
Henrik Bettermann
Message:

clearance_edit_form slimmed down

Location:
WAeUP_SRP/trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/actions.xml

    r1236 r1275  
    103103  <action title="Home" action_id="home" category="navigation"
    104104     condition_expr="member" url_expr="string:${portal_url}/campus"
    105      visible="True">
     105     visible="False">
    106106   <permission>View</permission>
    107107  </action>
    … …  
    177177
    178178  <action title="Home" action_id="students_home" category="student_navigation"
    179      condition_expr="" url_expr="string:${portal_url}" visible="True">
     179     condition_expr="not:member" url_expr="string:${portal_url}" visible="True">
    180180   <permission>View</permission>
    181181  </action>
    … …  
    195195  <action title="My Payments" action_id="payments"
    196196     category="student_navigation" condition_expr="member"
    197      url_expr="string:${portal_url}/campus/students/${here/getStudentId}/payments" visible="True"/>     
     197     url_expr="string:${portal_url}/campus/students/${here/getStudentId}/payments" visible="True"/>
    198198  <action title="Register Courses" action_id="register_courses"
    199199     category="student" condition_expr="member"

  • WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

    r1270 r1275  
    3434        <a href="download"
    3535           tal:attributes="href string:hall_allocation_list">
    36           <strong>Download bedlist as csv </strong></a>
     36          <strong>Download bedlist as csv file</strong></a>
    3737      </div>
    3838      <br />
    … …  
    4040             tal:define="reserved info/reserved">
    4141        <tr>
    42           <th width="50px">Student-Id</th>
     42          <th width="100px">Student Id</th>
    4343          <th width="300px">Name</th>
    4444          <th width="200px">Bed</th>

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

    r1096 r1275  
    11<metal:block define-macro="clearance_edit_form">
    2 <metal:block tal:define="info context/getClearanceInfo">
    3   <span tal:condition="not: info">
    4     <span tal:content="here/illegal_view" />
    5   </span>
    6 <metal:block tal:condition="info">
    7 <tal:block define="
    8            is_so context/isSectionOfficer;
    9            is_staff context/isStaff;
    10            is_co context/isClearanceOfficer;
    11            is_student context/isStudent;
    12            review_state info/review_state;
    13            clear_review_state info/clear_review_state;
    14            editable python:not is_co and (is_student and clear_review_state == 'opened' or is_so);
    15            mode python: test(editable,'edit','view');
    16            layout_id python: test(is_so,'student_clearance','student_clearance_fe');
    17            rendered_main python:info['clear_doc'].render(request=request,
    18                                                layout_mode = mode,
    19                                                schema_id='student_clearance',
    20                                                layout_id=layout_id,
    21                                                use_session=True);
    22            form_action string:clearance_edit;
    23            creation python:False;
    24     ">
    25 <metal:block use-macro="here/waeup_content_master/macros/master">
    26   <metal:block fill-slot="header">
     2 <metal:block use-macro="here/waeup_content_master/macros/master">
     3  <metal:header fill-slot="header"
     4           tal:define="
     5               is_student context/isStudent;
     6               is_staff context/isStaff;
     7               is_so context/isSectionOfficer;
     8               info context/getClearanceInfo;">
    279    <metal:block use-macro="here/clearance_edit_lib/macros/header" />
    28   </metal:block>
    29   <metal:block fill-slot="main">
     10  </metal:header>
     11  <metal:main fill-slot="main"
     12           tal:define="
     13               info context/getClearanceInfo;
     14               is_so context/isSectionOfficer;
     15               is_staff context/isStaff;
     16               is_co context/isClearanceOfficer;
     17               is_student context/isStudent;
     18               review_state info/review_state;
     19               clear_review_state info/clear_review_state;
     20               editable python:not is_co and (is_student and clear_review_state == 'opened' or is_so);
     21               mode python: test(editable,'edit','view');
     22               layout_id python: test(is_so,'student_clearance','student_clearance_fe');
     23               rendered_main python:info['clear_doc'].render(request=request,
     24                                                   layout_mode = mode,
     25                                                   schema_id='student_clearance',
     26                                                   layout_id=layout_id,
     27                                                   use_session=True);
     28               form_action string:clearance_edit;
     29               creation python:False;">
     30               
    3031    <form action="ACTION" method="post" id="editForm"
    3132          enctype="multipart/form-data" class="workflow"
    … …  
    4647        ajax feedback
    4748      </div>
    48     </metal:block>
    49   </metal:block>
    50 </tal:block>
     49  </metal:main>
     50 </metal:block>
    5151</metal:block>
    52 </metal:block>
    53 </metal:block>

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

    r1233 r1275  
    1 <metal:html tal:define="info context/getClearanceInfo;
     1<metal:body use-macro="here/waeup_content_master/macros/master">
     2    <metal:main fill-slot="main"
     3                tal:define="info context/getClearanceInfo;
    24                        is_so context/isSectionOfficer;
    35                        is_student context/isStudent;
    46                        ">
    5   <span tal:condition="not: info">
    6     <span tal:content="here/illegal_view" />
    7   </span>
    8 <metal:block tal:condition="info">                         
    9   <metal:body use-macro="here/waeup_content_master/macros/master">
    10     <metal:main fill-slot="main">
    117      <span tal:condition="not: info">
    128        <metal:block use-macro="here/error_not_found/macros/not_found" />
    … …  
    4339      </span>
    4440    </metal:main>
    45   </metal:body>
    46 </metal:block>     
    47 </metal:html>
     41</metal:body>
Note: See TracChangeset for help on using the changeset viewer.