Ignore:
Timestamp:
Jul 7, 2014, 10:31:19 PM (11 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master
Children:
922e0e5
Parents:
56c7337
git-author:
Alex Dehnert <adehnert@…> (07/07/14 22:31:19)
git-committer:
Alex Dehnert <adehnert@…> (07/07/14 22:31:19)
Message:

Generate RFPs, not vouchers, and show better messages

File:
1 edited

Legend:

Unmodified
Added
Removed

  • remit/remit_templates/vouchers/ReimbursementRequest_review.html

    r56c7337 r638b547  
    121121
    122122
    123 {% if approve_error %}
    124 <div class='messagebox errorbox'>
    125 <h3>Approval Error</h3>
    126 <p>{{approve_error}}</p>
    127 </div>
    128 {% endif %}
    129 
    130 {% if approve_form %}
    131 <h3>Approve this reimbursement request:</h3>
    132 {% if approve_message %}
    133 <p>{{ approve_message }}</p>
    134 {% else %}
    135 {% if perms.vouchers.change_reimbursementrequest %}
    136 <p>Optionally, <a href='{% url "admin:vouchers_reimbursementrequest_change" rr.pk %}'>change this request first</a>.</p>
    137 {% endif %}
    138 <form method="post" action="">
    139 <table class='pretty-table'>
    140 {{ approve_form.as_table }}
    141 
    142 <tr>
    143     <th colspan='2'><input type="submit" name="approve" value="Approve" /></td>
    144 </tr>
    145 </table>
    146 {% csrf_token %}
    147 </form>
    148 {% endif %}
     123{% if show_approve or approve_message %}
     124    <h3>Approve this reimbursement request:</h3>
     125    {% if approve_message %}
     126        <div class='messagebox {{approve_level}}box'>
     127        <p>{{approve_message}}</p>
     128        </div>
     129    {% else %}
     130        {% if perms.vouchers.change_reimbursementrequest %}
     131            <p>Optionally, <a href='{% url "admin:vouchers_reimbursementrequest_change" rr.pk %}'>change this request first</a>.</p>
     132        {% endif %}
     133        <form method="post" action=".">
     134            <th colspan='2'><input type="submit" name="approve" value="Approve as RFP" /></td>
     135            {% csrf_token %}
     136        </form>
     137    {% endif %}
    149138{% endif %}
    150139
Note: See TracChangeset for help on using the changeset viewer.