Changeset 6723


Ignore:
Timestamp:
12 Sep 2011, 14:25:14 (13 years ago)
Author:
Henrik Bettermann
Message:

Display Id and state in student layout too. This doesn't look nice on smart phones. Have to think about another solution.

Location:
main/waeup.sirp/trunk/src/waeup/sirp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt

    r6690 r6723  
    8080                  <span tal:condition="layout/getStudentName" class="wfstatus">
    8181                  Sudent Id: <span tal:content="python:context.getStudent().student_id">Student Id</span>
    82                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
    83                   Registration State: <span tal:content="python:context.getStudent().state">State</span>
     82                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     83                  State: <span tal:content="python:context.getStudent().state">State</span>
    8484                  </span>
    8585                </div>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt

    r6693 r6723  
    7171                <div class="bd">
    7272                  <div class="actionbar">
    73                     <tal:actionbar content="structure provider:actionbar" />
     73                    <span tal:replace="structure provider:actionbar"></span>
     74                    <span tal:condition="layout/getStudentName" class="wfstatus">
     75                    Student Id:
     76                    <span tal:replace="python:context.getStudent().student_id"
     77                        class="wfstatus">Id</span>
     78                    <br />
     79                    State:
     80                    <span tal:replace="python:context.getStudent().state"
     81                        class="wfstatus">State</span>
     82                    </span>
    7483                  </div>
    7584                  <div class="alert warning ui-state-error"

  • main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

    r6722 r6723  
    1212CREATED = 'created'
    1313ADMITTED = 'admitted'
    14 CLEARANCE = 'clearance'
    15 REQUESTED = 'requested'
     14CLEARANCE = 'clearance started'
     15REQUESTED = 'clearance requested'
    1616CLEARED = 'cleared'
    1717
Note: See TracChangeset for help on using the changeset viewer.