Merge git://github.com/Lastpixl/ihatemoney into HEAD

Conflicts:
	budget/templates/layout.html
	budget/templates/list_bills.html

3 files changed, 42 insertions, 6 deletions

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 8e6d3b2..27f5b5b 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -42,6 +42,7 @@
             {% if g.project %}
             <ul class="nav primary-nav">
                 <li class="active"><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+                <li><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
             </ul>
             {% endif %}
             <ul class="nav pull-right secondary-nav">
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 389e73f..a39a78a 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -61,20 +61,20 @@
     <div id="table_overflow">
     <table class="balance table">
     {% set balance = g.project.balance %}
-    {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id] != 0 %}
-    <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
+    {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member] != 0 %}
+    <tr id="bal-member-{{ member }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
         <td class="balance-name">{{ member.name }}</td>
         {% if member.activated %}
         <td>
-            <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
+            <form class="action delete" action="{{ url_for(".remove_member", member_id=member) }}" method="POST">
                 <button type="submit">{{ _("delete") }}</button></form></td>
         {% else %}
         <td>
-            <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST">
+            <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member) }}" method="POST">
                 <button type="submit">{{ _("reactivate") }}</button></form></td>
         {% endif %}
-        <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
-            {% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }}
+        <td class="balance-value {% if balance[member] > 0 %}positive{% elif balance[member] < 0 %}negative{% endif %}">
+            {% if balance[member] > 0 %}+{% endif %}{{ balance[member] }}
         </td>
     </tr>
     {% endfor %}
diff --git a/budget/templates/settle_bill.html b/budget/templates/settle_bill.html
new file mode 100644
index 0000000..c91b03d
--- /dev/null
+++ b/budget/templates/settle_bill.html
@@ -0,0 +1,35 @@
+{% extends "layout.html" %}
+
+{% block head %}
+    <script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
+    {% if g.lang != "en" %}
+    <script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    {% endif %}
+{% endblock %}
+{% block js %}
+    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
+    $.datepicker.setDefaults({'dateFormat': 'yy-mm-dd'});
+    $(".datepicker").datepicker($.datepicker.regional['{{ g.lang }}']);
+
+{% endblock %}
+{% block navbar %}
+    <li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+    <li class="active"><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
+{% endblock %}
+
+
+{% block content %}
+    <table id="bill_table" class="split_bills common-table zebra-striped">
+        <thead><tr><th>{{ _("Who pays?") }}</th><th>{{ _("To whom?") }}</th><th>{{ _("How much?") }}</th></tr></thead>
+    <tbody>
+    {% for bill in bills %}
+    <tr class="{{ loop.cycle("odd", "even") }}" owers={{bill.owers|join(',','id')}} payer={{bill.payer.id}}>
+            <td>{{ bill.ower }}</td>
+            <td>{{ bill.payer }}</td>
+            <td>{{ "%0.2f"|format(bill.amount) }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    </table>
+
+{% endblock %}