Changeset 2630 for WAeUP_SRP


Ignore:
Timestamp:
12 Nov 2007, 14:47:46 (17 years ago)
Author:
Henrik Bettermann
Message:

course registration design fixed

Location:
WAeUP_SRP/base/skins/waeup_student
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/base/skins/waeup_student/course_registration_slip.pt

    r2606 r2630  
    1 <metal:body use-macro="here/slip_template/macros/master">
     1  <metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getStudyLevelInfo;"
     
    6363            <tr tal:repeat="row info/carry_overs"
    6464                tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    65               <td width="72%" tal:content="row/title"></td>
     65              <td width="74%" tal:content="row/title"></td>
    6666              <td align="center" width="10%" tal:content="row/code"></td>
    6767              <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    68               <td align="center" width="2%" tal:content="row/credits"></td>
    69               <td align="center" width="14%"> <span tal:content="row/coe|nothing" /></td>
     68              <td align="center" width="4%" tal:content="row/credits"></td>
     69              <td align="center" width="10%">CO</td>
    7070            </tr>
    7171          </table>
    7272        </span>
     73       
     74        <br />
     75       
    7376        <h4>Session Courses</h4>
    7477        <br />
     
    8184        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
    8285            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    83           <td align="left" valign="middle" style="width: 5px;"
    84              tal:condition="show_check_boxes">
    85             <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    86                    tal:define="id row/id"
    87                    tal:attributes="value id;
    88                    id python:'cb_' + id;
    89                    checked python:id in info['choosen_ids'];"
    90                    />
    91           </td>
    92           <td width="71%" tal:content="row/title"></td>
     86          <td width="74%" tal:content="row/title"></td>
    9387          <td align="center" width="10%" tal:content="row/code"></td>
    9488          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    95           <td align="center" width="2%" tal:content="row/credits"></td>
     89          <td align="center" width="4%" tal:content="row/credits"></td>
    9690          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
    9791         
     
    109103        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
    110104            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    111           <td align="left" valign="middle" style="width: 5px;"
    112              tal:condition="show_check_boxes">
    113             <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    114                    tal:define="id row/id"
    115                    tal:attributes="value id;
    116                    id python:'cb_' + id;
    117                    checked python:id in info['choosen_ids'];"
    118                    />
    119           </td>
    120           <td width="71%" tal:content="row/title"></td>
     105
     106          <td width="74%" tal:content="row/title"></td>
    121107          <td align="center" width="10%" tal:content="row/code"></td>
    122108          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    123           <td align="center" width="2%" tal:content="row/credits"></td>
     109          <td align="center" width="4%" tal:content="row/credits"></td>
    124110          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
    125111         
     
    136122       
    137123          <tr>
    138             <td width="82%" colspan="2" align="right">Total Credits:</td>
     124            <td width="84%" colspan="2" align="right">Total Credits:</td>
    139125            <td width="2%">&nbsp;</td>
    140             <td width="2%" tal:content="info/credits_total"></td>
    141             <td width="14%">&nbsp;</td>
     126            <td width="4%" tal:content="info/credits_total"></td>
     127            <td width="10%">&nbsp;</td>
    142128          </tr>
    143129        </table>
  • WAeUP_SRP/base/skins/waeup_student/external_study_level_view.pt

    r2489 r2630  
    4848                     />
    4949            </td>
    50             <td width="72%" tal:content="row/title"></td>
     50            <td width="69%" tal:content="row/title"></td>
    5151            <td align="center" width="10%" tal:content="row/code"></td>
    5252            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    53             <td align="center" width="2%" tal:content="row/credits"></td>
    54             <td align="center" width="9%" tal:content="row/coe|nothing"></td>
     53            <td align="center" width="4%" tal:content="row/credits"></td>
     54            <td align="center" width="10%">CO</td>
    5555          </tr>
    5656        </table>
     
    6060        <h4>Session Courses</h4>
    6161        <br />
    62         <div class="" tal:condition="not: info/normal">
    63           Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!
    64         </div>
     62    <div class="" tal:condition="python: not (info['normal1'] or info['normal2'] or info['normal3'])">
     63      <font color="red">Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!</font>
     64      <br /><br />
     65    </div>
    6566         
    66          <table class="contentListing" width="100%" id="folder_content" tal:condition="info/normal">     
    67           <tr tal:repeat="row info/normal"
    68               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    69              
    70             <td align="left" valign="middle" width="5%" tal:condition="show_check_boxes">
    71               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    72                      tal:define="id row/id"
    73                      tal:attributes="value id;
    74                      id python:'cb_' + id;
    75                      checked python:id in info['choosen_ids'];"
    76                      />
    77             </td>
    78             <td width="72%" tal:content="row/title"></td>
    79             <td align="center" width="10%" tal:content="row/code"></td>
    80             <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    81             <td align="center" width="2%" tal:content="row/credits"></td>
    82             <td align="center" width="9%" tal:content="row/coe|nothing"></td>
    83           </tr>
     67      <table class="contentListing" width="100%" id="folder_content">
     68       
     69        <span tal:repeat="sem python:('1','2')">       
     70        <tr><th colspan="5" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" /></tr>               
     71        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
     72            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     73          <td align="left" valign="middle" style="width: 5%;"
     74             tal:condition="show_check_boxes">
     75            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
     76                   tal:define="id row/id"
     77                   tal:attributes="value id;
     78                   id python:'cb_' + id;
     79                   checked python:id in info['choosen_ids'];"
     80                   />
     81          </td>
     82          <td width="69%" tal:content="row/title"></td>
     83          <td align="center" width="10%" tal:content="row/code"></td>
     84          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
     85          <td align="center" width="4%" tal:content="row/credits"></td>
     86          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
     87         
     88          <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
     89          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
     90          target="edit"
     91          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     92          [edit]
     93          </a>
     94          </td>         
     95        </tr>
     96
     97        </span>       
     98       
     99        <tr><th colspan="5" tal:condition="info/normal3"> Combined</th></tr>               
     100        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
     101            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     102          <td align="left" valign="middle" style="width: 5%;"
     103             tal:condition="show_check_boxes">
     104            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
     105                   tal:define="id row/id"
     106                   tal:attributes="value id;
     107                   id python:'cb_' + id;
     108                   checked python:id in info['choosen_ids'];"
     109                   />
     110          </td>
     111          <td width="69%" tal:content="row/title"></td>
     112          <td align="center" width="10%" tal:content="row/code"></td>
     113          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
     114          <td align="center" width="4%" tal:content="row/credits"></td>
     115          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
     116         
     117          <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
     118          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
     119          target="edit"
     120          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     121          [edit]
     122          </a>
     123          </td>         
     124        </tr>             
     125         
     126
    84127          <tr>
    85128            <td width="5%" tal:condition="show_check_boxes">&nbsp;</td>
    86             <td width="82%" colspan="2" align="right">Total Credits:</td>
     129            <td width="80%" colspan="2" align="right">Total Credits:</td>
    87130            <td width="2%">&nbsp;</td>
    88             <td width="2%" align="center" tal:content="info/credits_total"></td>
     131            <td width="4%" align="center" tal:content="info/credits_total"></td>
    89132            <td width="9%">&nbsp;</td>
    90133          </tr>
  • WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

    r2614 r2630  
    4747            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    4848     
    49           <td align="left" valign="middle" style="width: 5px;"
     49          <td align="left" valign="middle" style="width: 5%;"
    5050              tal:condition="show_check_boxes">
    5151            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
     
    5656                   />
    5757          </td>
    58           <td width="71%" tal:content="row/title"></td>
     58          <td width="68%" tal:content="row/title"></td>
    5959          <td align="center" width="10%" tal:content="row/code"></td>
    6060          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    61           <td align="center" width="2%" tal:content="row/credits"></td>
     61          <td align="center" width="4%" tal:content="row/credits"></td>
    6262          <td align="center" width="10%"> <span tal:content="row/coe|nothing" /></td>
    6363          <td tal:condition="python:review_state == 'school_fee_paid'" align="center" width="5%">&nbsp;</td>
     
    8080        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
    8181            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    82           <td align="left" valign="middle" style="width: 5px;"
     82          <td align="left" valign="middle" style="width: 5%;"
    8383             tal:condition="show_check_boxes">
    8484            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
     
    8989                   />
    9090          </td>
    91           <td width="71%" tal:content="row/title"></td>
     91          <td width="68%" tal:content="row/title"></td>
    9292          <td align="center" width="10%" tal:content="row/code"></td>
    9393          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    94           <td align="center" width="2%" tal:content="row/credits"></td>
     94          <td align="center" width="4%" tal:content="row/credits"></td>
    9595          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
    9696         
     
    109109        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
    110110            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    111           <td align="left" valign="middle" style="width: 5px;"
     111          <td align="left" valign="middle" style="width: 5%;"
    112112             tal:condition="show_check_boxes">
    113113            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
     
    118118                   />
    119119          </td>
    120           <td width="71%" tal:content="row/title"></td>
     120          <td width="68%" tal:content="row/title"></td>
    121121          <td align="center" width="10%" tal:content="row/code"></td>
    122122          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    123           <td align="center" width="2%" tal:content="row/credits"></td>
     123          <td align="center" width="4%" tal:content="row/credits"></td>
    124124          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
    125125         
     
    141141          <td colspan="1"></td>
    142142          <th colspan="2">Total Credits:</th>
    143           <td align="center" width="2%" tal:content="info/credits_total"></td>
     143          <td align="center" width="4%" tal:content="info/credits_total"></td>
    144144        </tr>
    145145      </table>
Note: See TracChangeset for help on using the changeset viewer.