Manage users creation

2 files changed, 37 insertions, 31 deletions

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 19c0e59..79240b3 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -16,16 +16,11 @@
         </div>
     </div>
     <hr>
-    <div id="content" class="span-24">
-
-	{% for message in get_flashed_messages() %}
-	    <div class=info>{{ message }}</div>
-	{% endfor %}
-
-	{% block content %}
-	{% endblock %}
-
-    </div>
+    {% for message in get_flashed_messages() %}
+        <div class=info>{{ message }}</div>
+    {% endfor %}
+    {% block content %}
+    {% endblock %}
     <div id="footer"></div>
 </div>
 </body>
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index d0f0c41..145f4f4 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -1,26 +1,37 @@
 {% extends "layout.html" %}
 {% block content %}
-{% if bills.count() > 0 %}
-<table>
-    <thead><tr><th>When ?</th><th>Who paid?</th><th>for what ?</th><th>Owers</th><th>How much ?</th><th>Actions</th></tr></thead>
-<tbody>
-{% for bill in bills %}
-<tr class="{{ loop.cycle("odd", "even") }}">
-	<td>{{ bill.date }}</td>
-	<td>{{ bill.payer }}</td>
-	<td>{{ bill.what }}</td>
-	<td>{% for ower in bill.owers %}{{ ower.name }} {% endfor %}</td>
-	<td>{{ bill.amount }} ({{ bill.pay_each() }} each)</td>
-        <td><a href="{{ url_for("delete_bill", bill_id=bill.id, project_id=project.id) }}">delete</a></td>
-</tr>
-{% endfor %}
-</tbody>
-</table>
+<div id="leftmenu" class="span-6">
+    <ul>
+    {% for member in project.members %}
+        <li>{{ member.name }}</li>
+    {% endfor %}
+    </ul>
+    {% set form=member_form %}
+    {% include "member_form.html" %}
+</div>
+<div id="content" class="span-18 last">
+    {% if bills.count() > 0 %}
+    <table>
+        <thead><tr><th>When ?</th><th>Who paid?</th><th>for what ?</th><th>Owers</th><th>How much ?</th><th>Actions</th></tr></thead>
+    <tbody>
+    {% for bill in bills %}
+    <tr class="{{ loop.cycle("odd", "even") }}">
+            <td>{{ bill.date }}</td>
+            <td>{{ bill.payer }}</td>
+            <td>{{ bill.what }}</td>
+            <td>{% for ower in bill.owers %}{{ ower.name }} {% endfor %}</td>
+            <td>{{ bill.amount }} ({{ bill.pay_each() }} each)</td>
+            <td><a href="{{ url_for("delete_bill", bill_id=bill.id, project_id=project.id) }}">delete</a></td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    </table>
 
-<a class="awesome large green button fleft" href="{{ url_for("compute_bills", project_id=project.id) }}">Compute bills</a>
-<p> Periodically (probably at the end of each month, you can compute the balance of each people, in order to reset all the debts. You can also let this "as-is" and try to find a good balance, that's up to you</p>
+    <a class="awesome large green button fleft" href="{{ url_for("compute_bills", project_id=project.id) }}">Compute bills</a>
+    <p> Periodically (probably at the end of each month, you can compute the balance of each people, in order to reset all the debts. You can also let this "as-is" and try to find a good balance, that's up to you</p>
 
-{% else %}
-<p>Nothing to list yet. You probably want to <a href="{{ url_for("add_bill", project_id=project.id) }}">add a bill</a> ?</p>
-{% endif %}
+    {% else %}
+    <p>Nothing to list yet. You probably want to <a href="{{ url_for("add_bill", project_id=project.id) }}">add a bill</a> ?</p>
+    {% endif %}
+</div>
 {% endblock %}