From a0e94f3c116879301a2bef32fac30c232c18e386 Mon Sep 17 00:00:00 2001
From: "A.Avenel" <avenel.alexandre@gmail.com>
Date: Sun, 7 Apr 2013 23:01:32 +0200
Subject: [PATCH] bugfix : "Settle" link was not active on navbar.

---
 budget/templates/layout.html       | 2 ++
 budget/templates/settle_bills.html | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 27f5b5b0..543bcb36 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -41,8 +41,10 @@
             <h1><a class="brand" href="{{ url_for(".home") }}">#! money?</a></h1>
             {% if g.project %}
             <ul class="nav primary-nav">
+                {% block navbar %}
                 <li class="active"><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
                 <li><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
+                {% endblock %}
             </ul>
             {% endif %}
             <ul class="nav pull-right secondary-nav">
diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html
index e2041f56..29d9b26f 100644
--- a/budget/templates/settle_bills.html
+++ b/budget/templates/settle_bills.html
@@ -1,11 +1,8 @@
 {% extends "layout.html" %}
 
-{% block js %}
-    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
-{% endblock %}
 {% block navbar %}
-    <li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
-    <li class="active"><a href="{{ url_for(".settle_bills") }}">{{ _("Settle") }}</a></li>
+<li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+<li class="active"><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
 {% endblock %}
 
 {% block sidebar %}