From 801802836a648ac0865c1c932e3cf9a01e3a639e Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Fri, 9 Sep 2011 19:14:19 +0200 Subject: Start working on archive management --- budget/templates/add_bill.html | 3 +-- budget/templates/create_archive.html | 7 +++++++ budget/templates/forms.html | 16 ++++++++++++++-- budget/templates/list_bills.html | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 budget/templates/create_archive.html (limited to 'budget/templates') diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html index ec60f43..0b575d7 100644 --- a/budget/templates/add_bill.html +++ b/budget/templates/add_bill.html @@ -5,9 +5,8 @@ {% endblock %} {% block content %} -

{% if edit %}Edit a{% else %}Add a new{% endif %} bill

- {{ forms.add_bill(form) }} + {{ forms.add_bill(form, edit) }}
{% endblock %} diff --git a/budget/templates/create_archive.html b/budget/templates/create_archive.html new file mode 100644 index 0000000..ae96a30 --- /dev/null +++ b/budget/templates/create_archive.html @@ -0,0 +1,7 @@ +{% extends "layout.html" %} + +{% block content %} +
+{{ forms.create_archive(form) }} +
+{% endblock %} diff --git a/budget/templates/forms.html b/budget/templates/forms.html index 8ac458f..7b512ff 100644 --- a/budget/templates/forms.html +++ b/budget/templates/forms.html @@ -52,10 +52,10 @@ {% endmacro %} -{% macro add_bill(form) %} +{% macro add_bill(form, edit=False) %}
- Add a bill + {% if edit %}Edit this {% else %}Add a {% endif %}bill {% include "display_errors.html" %} {{ form.hidden_tag() }} {{ input(form.date) }} @@ -83,3 +83,15 @@ No, thanks {% endmacro %} + +{% macro create_archive(form) %} +
+ Create an archive + {{ form.hidden_tag() }} + {{ input(form.start_date) }} + {{ input(form.end_date) }} +
+
+ +
+{% endmacro %} diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index e9699dd..b485f81 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -78,7 +78,7 @@ {% for ower in bill.owers %}{{ ower.name }} {% endfor %} {{ bill.amount }} ({{ bill.pay_each() }} each) edit - delete + delete {% endfor %} -- cgit v1.1