Skip to content

Commit d1c8f2c

Browse files
committed
Merge pull request #9 from xenophenes/master
fix
2 parents b784c44 + 6e4d672 commit d1c8f2c

File tree

2 files changed

+37
-24
lines changed

2 files changed

+37
-24
lines changed

template/invoices/userhome.html

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
{%extends "navbase.html"%}
22
{%block title%}Your invoices{%endblock%}
33
{%block content%}
4-
<h1>Your invoices</h1>
4+
<section id="main" class="wrapper">
55

6-
<p>
7-
We have the following invoices registered to your account:
8-
</p>
6+
<div class="container">
97

10-
<table border="1" cellspacing="0" cellpadding="3">
11-
<tr>
12-
<th>Number</th>
13-
<th>Title</th>
14-
<th>Status</th>
15-
<th>Due</th>
16-
<th>Receipt</th>
17-
</tr>
18-
{%for invoice in invoices %}
19-
<tr>
20-
<td>#{{invoice.id}}</td>
21-
<td><a href="{{invoice.id}}/">{{invoice.title}}</td>
22-
<td>{%if invoice.refund%}{%if invoice.refund.completed%}Refunded{%else%}Refund pending{%endif%}{%elif invoice.ispaid%}Paid{%else%}Pending{%endif%}</td>
23-
<td>{{invoice.duedate|date:"Y-m-d"}}</td>
24-
<td>{%if invoice.ispaid and not invoice.refunded%}<a href="{{invoice.id}}/receipt/">Download</a>{%endif%}</td>
25-
</tr>
26-
{%endfor%}
27-
</table>
8+
<!-- ConfReg -->
9+
<header class="major">
10+
<span class="header"><img src="/ext/{{conference.urlname}}/shared/images/policy.svg" alt="" /></span>
11+
<h2>Your Invoices</h2>
12+
</header>
13+
14+
<section>
15+
<hr>
16+
<p>We have the following invoices registered to your account:</p>
17+
</section>
18+
19+
<section>
20+
<table border="1" cellspacing="0" cellpadding="3">
21+
<tr>
22+
<th>Number</th>
23+
<th>Title</th>
24+
<th>Status</th>
25+
<th>Due</th>
26+
<th>Receipt</th>
27+
</tr>
28+
{%for invoice in invoices %}
29+
<tr>
30+
<td>#{{invoice.id}}</td>
31+
<td><a href="{{invoice.id}}/">{{invoice.title}}</td>
32+
<td>{%if invoice.refund%}{%if invoice.refund.completed%}Refunded{%else%}Refund pending{%endif%}{%elif invoice.ispaid%}Paid{%else%}Pending{%endif%}</td>
33+
<td>{{invoice.duedate|date:"Y-m-d"}}</td>
34+
<td>{%if invoice.ispaid and not invoice.refunded%}<a href="{{invoice.id}}/receipt/">Download</a>{%endif%}</td>
35+
</tr>
36+
{%endfor%}
37+
</table>
38+
</section>
39+
</div>
40+
</section>
2841

2942
{%endblock%}

template/invoices/userinvoice_spec.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</tr>
4747
{%else%}
4848
<tr>
49-
<td style="white-space: nowrap">Pay invoice:</td>
49+
<td style="white-space: nowrap" style="color:red">Pay invoice:</td>
5050
<td>
5151
<p>
5252
This invoice can be paid using one of the methods listed below. Note
@@ -58,7 +58,7 @@
5858
{%if method.ok%}
5959
<p>{{method.description}}</p>
6060
{%if method.available%}
61-
<p><a href="{{method.paymenturl}}">Proceed</a> to pay with {{method.name}}</p>
61+
<p><a href="{{method.paymenturl}}" style="color:red">Proceed</a> to pay with {{method.name}}</p>
6262
{%else%}
6363
<p><i>This method is currently not available. {{method.unavailable_reason}}</i></p>
6464
{%endif%}

0 commit comments

Comments
 (0)