Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Make history tables clearer (#110)
Browse files Browse the repository at this point in the history
Now we have credit and debit columns inside gittip. I think this is more
standard and normal and clearer.
  • Loading branch information
chadwhitacre committed Jul 11, 2012
1 parent 06dcb06 commit 4117182
Showing 1 changed file with 18 additions and 17 deletions.
35 changes: 18 additions & 17 deletions www/%participant_id/history.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,16 @@
text-align: left;
border-bottom: 1px solid #614C3E;
}
TD.out {
TD.debit {
color: red;
}
.head TD.debit {
color: #614C3E;
}
TD.note {
text-align: left;
}
.fee {
border-left: 1px solid #614C3E;
}
.in-out {
border-right: 1px solid #614C3E;
text-align: right;
}
Expand All @@ -211,53 +211,54 @@ <h3>{{ participant_id == user.id and "Your" or "Their" }} balance is
({{ utils.dt2age(event['timestamp']) }})</b></th>
</tr>
<tr class="head">
<td colspan="3" class="outside">&larr; Outside</td>
<td colspan="3" class="inside">Inside Gittip &rarr;</td>
<td colspan="2" class="outside">&larr; Outside</td>
<td colspan="4" class="inside">Inside Gittip &rarr;</td>
</tr>
<tr class="head">
<td class="card">Card</td>
<td class="fee">Fee</td>
<td class="in-out">In/Out</td>
<td class="tip">Tip</td>
<td class="credit">Credit</td>
<td class="debit">Debit</td>
<td class="balance">Balance</td>
<td class="note">Note</td>
</tr>
<tr>
<td class="card"></td>
<td class="fee"></td>
<td class="in-out"></td>
<td class="tip"></td>
<td class="credit"></td>
<td class="debit"></td>
<td class="balance">{{ event['balance'] }}</td>
<td class="note"></td>
</tr>
{% elif event['event'] == 'balance' %}
<tr>
<td class="card"></td>
<td class="fee"></td>
<td class="in-out"></td>
<td class="tip"></td>
<td class="credit"></td>
<td class="debit"></td>
<td class="balance">{{ event['balance'] }}</td>
<td class="note"></td>
</tr>
{% elif event['event'] == 'exchange' %}
<tr>
<td class="card">{{ event['amount'] + event['fee'] }}</td>
<td class="fee">{{ event['fee'] }}</td>
<td class="in-out">{{ event['amount'] }}</td>
<td class="tip"></td>
<td class="credit">{{ event['amount'] }}</td>
<td class="debit"></td>
<td class="balance">{{ event['balance'] }}</td>
<td class="note"></td>
</tr>
{% elif event['event'] == 'transfer' %}
<tr>
<td class="card"></td>
<td class="fee"></td>
<td class="in-out"></td>

{% if event['tippee'] == participant_id %}
<td class="tip in">{{ event['amount'] }}</td>
<td class="credit">{{ event['amount'] }}</td>
<td class="debit"></td>
{% else %}
<td class="tip out">{{ event['amount'] }}</td>
<td class="credit"></td>
<td class="debit">{{ event['amount'] }}</td>
{% end %}

<td class="balance">{{ event['balance'] }}</td>
Expand Down

0 comments on commit 4117182

Please sign in to comment.