Changeset 1009 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
7 Dec 2006, 21:14:03 (18 years ago)
Author:
Henrik Bettermann
Message:

pins search layout modified
part of ticket 64 solved
redirect in logged_in corrected

Location:
WAeUP_SRP/trunk/skins
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1006 r1009  
    4949
    5050if redirect_url.endswith('/logged_out'):
    51     redirect_to_portal = True   
     51    redirect_to_portal = True
    5252else:
    5353    if not is_anon:
    … …  
    113113    #if info['review_state'] == "application_pin_entered":
    114114    if s_review_state == "application_pin_entered":
    115         return response.redirect("%s/application_edit" % student.absolute_url())
     115        return response.redirect("%s/application_edit_form" % student.absolute_url())
    116116    #elif info['review_state'] == "admitted":
    117117    elif s_review_state == "admitted":
    … …  
    119119    #elif info['review_state'] == "clearance_pin_entered":
    120120    elif s_review_state == "clearance_pin_entered":
    121         return response.redirect("%s/clearance_edit" % student.absolute_url())
     121        return response.redirect("%s/clearance_edit_form" % student.absolute_url())
    122122    return response.redirect("%s/student_index" % student.absolute_url())
    123123

  • WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

    r1002 r1009  
    2626        <br />
    2727       
    28         <span tal:condition="python:member.id in ('admin','joachim')">       
    29         <h3>Unused</h3>
    30         <table>
    31           <tr tal:repeat="pin python: info['unused'][:2]">
    32             <td width="50px"> <span tal:content="pin/serial" />: </td>
    33             <td tal:content="pin/pin" />
    34           </tr>
    35         </table>
    36         </span>
     28       
    3729        <span tal:replace="structure rendered" />
    3830
    39         <h3>Results</h3>
    4031        <table>
    4132          <tr tal:repeat="pin info/used">
    … …  
    5041          </tr>
    5142        </table>
     43
     44
     45        <br />
     46
     47        <span tal:condition="python:member.id in ('admin','joachim')">       
     48        ---top secret---
     49        <table>
     50          <tr tal:repeat="pin python: info['unused'][:2]">
     51            <td width="50px"> <span tal:content="pin/serial" />: </td>
     52            <td tal:content="pin/pin" />
     53          </tr>
     54        </table>
     55        ---top secret---
     56        </span>       
     57       
     58       
    5259      </span>
    5360    </metal:main>
Note: See TracChangeset for help on using the changeset viewer.