From 28a3abf96d010db8253b53933d6ab36c4dd412d9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 19 Aug 2011 23:44:54 +0200
Subject: No need anymore to pass the project_id to the urls.

The project is now directly added to the context local g object, and injected on the fly into the urls that need it.

This commits also add ideas found while reading the flask documentation. The project can be enhanced in many ways, some ideas are stated there.
---
 budget/templates/add_bill.html     |  4 ++--
 budget/templates/add_member.html   |  2 +-
 budget/templates/edit_bill.html    |  4 ++--
 budget/templates/invitation_mail   |  4 ++--
 budget/templates/list_bills.html   | 18 +++++++++---------
 budget/templates/send_invites.html |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'budget/templates')

diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html
index d844b6a..5b3a768 100644
--- a/budget/templates/add_bill.html
+++ b/budget/templates/add_bill.html
@@ -1,14 +1,14 @@
 {% extends "layout.html" %}
 
 {% block top_menu %}
-<a href="{{ url_for('list_bills', project_id=project.id) }}">Back to the list</a>
+<a href="{{ url_for('list_bills') }}">Back to the list</a>
 {% endblock %}
 
 {% block content %}
 <h2>Add a new bill</h2>
 
 <div class="container span-24 add-bill uniForm" style="width: 400px">
-    <form action="{{ url_for('add_bill', project_id=project.id) }}" method="post" class=uniForm">
+    <form action="{{ url_for('add_bill') }}" method="post" class=uniForm">
         {{ forms.add_bill(form) }}
     </form>
 </div>
diff --git a/budget/templates/add_member.html b/budget/templates/add_member.html
index 8d24aee..5739791 100644
--- a/budget/templates/add_member.html
+++ b/budget/templates/add_member.html
@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block content %}
-    <form action="{{ url_for("add_member", project_id=project.id) }}" method="post">
+    <form action="{{ url_for("add_member") }}" method="post">
         {{ forms.add_member(form) }}
     </form>
 {% endblock %}
diff --git a/budget/templates/edit_bill.html b/budget/templates/edit_bill.html
index c78eb09..03a1a26 100644
--- a/budget/templates/edit_bill.html
+++ b/budget/templates/edit_bill.html
@@ -1,14 +1,14 @@
 {% extends "layout.html" %}
 
 {% block top_menu %}
-<a href="{{ url_for('list_bills', project_id=project.id) }}">Back to the list</a>
+<a href="{{ url_for('list_bills') }}">Back to the list</a>
 {% endblock %}
 
 {% block content %}
 <h2>Edit a bill</h2>
 
 <div class="container span-24 add-bill uniForm" style="width: 400px">
-    <form action="{{ url_for('edit_bill', project_id=project.id, bill_id=bill_id) }}" method="post" class=uniForm">
+    <form action="{{ url_for('edit_bill', bill_id=bill_id) }}" method="post" class=uniForm">
         {{ forms.add_bill(form) }}
     </form>
 </div>
diff --git a/budget/templates/invitation_mail b/budget/templates/invitation_mail
index 53991ed..83a7840 100644
--- a/budget/templates/invitation_mail
+++ b/budget/templates/invitation_mail
@@ -1,10 +1,10 @@
 Hi, 
 
-Someone using the email adress {{ email }} invited you to share your expenses for {{ project.name }} on our application.
+Someone using the email adress {{ g.project.contact_email }} invited you to share your expenses for {{ g.project.name }} on our application.
 
 It's as simple as saying what did you paid for, for who, and how much did it cost you, we are caring about the rest.
 
-You can access it here: {{ SITE_URL }}{{ url_for("list_bills", project_id=project.id) }}, the password is "{{ project.password }}".
+You can access it here: {{ SITE_URL }}{{ url_for("list_bills") }}, the password is "{{ g.project.password }}".
 
 Enjoy,
 Some weird guys
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index fe564e1..94b0f8f 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -42,24 +42,24 @@ $('.members li').hover(function(){
 {% block content %}
 <div id="leftmenu" class="span-6">
     <ul class="members">
-    {% set balance = project.get_balance() %}
-    {% for member in project.active_members %}
+    {% set balance = g.project.get_balance() %}
+    {% for member in g.project.active_members %}
     <li class="{{ loop.cycle("even", "odd") }}">
     <span class="balance {% if balance[member] > 0 %}positive{% elif balance[member] < 0 %}negative{% endif %}">{{ balance[member] }}</span>
     {{ member.name }}
-    <a class="remove" href="{{ url_for("remove_member", project_id=project.id, member_id=member.id) }}">delete</a></li>
+    <a class="remove" href="{{ url_for("remove_member", member_id=member.id) }}">delete</a></li>
     {% endfor %}
     </ul>
-    <form action="{{ url_for("add_member", project_id=project.id) }}" method="post">
+    <form action="{{ url_for("add_member") }}" method="post">
         {{ forms.add_member(member_form) }}
     </form>
 </div>
 <div id="content" class="uniForm span-18 last">
-    <a id="add_bill_button" class="awesome large green button fright" href="{{ url_for('add_bill', project_id=project.id) }}">Add a bill</a>
+    <a id="add_bill_button" class="awesome large green button fright" href="{{ url_for('add_bill') }}">Add a bill</a>
 
     <a id="hide_bill_form" class="awesome button fright" style="display: none;" href="#">Hide form</a>
 
-<form id="add_bill" action="{{ url_for('add_bill', project_id=project.id) }}" method="post" style="width: 400px; display: none">{{ forms.add_bill(bill_form) }}</form>
+<form id="add_bill" action="{{ url_for('add_bill') }}" method="post" style="width: 400px; display: none">{{ forms.add_bill(bill_form) }}</form>
 
     {% if bills.count() > 0 %}
     <table class="list_bills">
@@ -72,15 +72,15 @@ $('.members li').hover(function(){
             <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("edit_bill", bill_id=bill.id, project_id=project.id) }}">edit</a>
-                <a href="{{ url_for("delete_bill", bill_id=bill.id, project_id=project.id) }}">delete</a></td>
+            <td><a href="{{ url_for("edit_bill", bill_id=bill.id) }}">edit</a>
+                <a href="{{ url_for("delete_bill", bill_id=bill.id) }}">delete</a></td>
     </tr>
     {% endfor %}
     </tbody>
     </table>
 
     {% 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>
+    <p>Nothing to list yet. You probably want to <a href="{{ url_for("add_bill") }}">add a bill</a> ?</p>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/budget/templates/send_invites.html b/budget/templates/send_invites.html
index f618803..fa46c81 100644
--- a/budget/templates/send_invites.html
+++ b/budget/templates/send_invites.html
@@ -3,12 +3,12 @@
 <h2>Invite people to join this project</h2>
 <p>Specify a (coma separated) list of email adresses you want to notify about the 
 creation of this budget management project and we will send them an email for you.</p>
-<p>If you prefer, you can <a href="{{ url_for("list_bills", project_id=project.id) }}">skip this step</a> and notify them yourself</p>
+<p>If you prefer, you can <a href="{{ url_for("list_bills") }}">skip this step</a> and notify them yourself</p>
 
 {% include "display_errors.html" %}
 <form method="post" accept-charset="utf-8">
     {{ form.hidden_tag() }}
     <p>{{ form.emails.label }}<br /> {{ form.emails }}</p>
-    <p>{{ form.submit }} <a href="{{ url_for("list_bills", project_id=project.id) }}">No, thanks</a></p>
+    <p>{{ form.submit }} <a href="{{ url_for("list_bills") }}">No, thanks</a></p>
 </form>
 {% endblock %}
-- 
cgit v1.1