Merge pull request #65 from aavenel/master

Bug fix in order to show the calendar widget when you edit a bill.

3 files changed, 16 insertions, 16 deletions

diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html
index 6349730..b784bfd 100644
--- a/budget/templates/add_bill.html
+++ b/budget/templates/add_bill.html
@@ -1,5 +1,20 @@
 {% extends "layout.html" %}
 
+{% block head %}
+    <script src="{{ url_for("static", filename="jquery/js/jquery-ui.js") }}"></script>
+    {% if g.lang != "en" %}
+    <script src="{{ url_for("static", filename="jquery/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    {% endif %}
+    <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
+{% 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 top_menu %}
 <a href="{{ url_for(".list_bills") }}">{{ _("Back to the list") }}</a>
 {% endblock %}
diff --git a/budget/templates/edit_bill.html b/budget/templates/edit_bill.html
deleted file mode 100644
index cb55d69..0000000
--- a/budget/templates/edit_bill.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "layout.html" %}
-
-{% block top_menu %}
-<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="" method="post" class=uniForm">
-        {{ forms.add_bill(form) }}
-    </form>
-</div>
-{% endblock %}
diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index f94c421..c8f8df8 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -49,7 +49,7 @@
     <h3><a class="logo" href="{{ url_for(".home") }}">#! money?</a></h3>
     {% if g.project %}
     <ul>
-        <li class="active"><a href="">{{ _("Bills") }}</a></li>
+        <li class="active"><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
     </ul>
     <ul class="nav secondary-nav">
       <li class="menu">