From 7f805b63cad10b83833151460b24265608d10c3b Mon Sep 17 00:00:00 2001
From: Arnaud Bos <arnaud.tlse@gmail.com>
Date: Tue, 1 Nov 2011 12:57:12 +0100
Subject: Improvement of the sidebar look. Related to #34. Fix #52.

---
 budget/templates/forms.html      |  4 ++--
 budget/templates/list_bills.html | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'budget/templates')

diff --git a/budget/templates/forms.html b/budget/templates/forms.html
index 8c0cda3..0a06001 100644
--- a/budget/templates/forms.html
+++ b/budget/templates/forms.html
@@ -87,8 +87,8 @@
 
 {% macro add_member(form) %}
     {{ form.hidden_tag() }}
-    {{ form.name }}
-    <button class="btn">{{ _("Add a new user") }}</button>
+    {{ form.name(style="width: 141px;") }}
+    <button class="btn">{{ _("Add") }}</button>
 
 {% endmacro %}
 
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index c8e7918..c33a7e2 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -9,6 +9,11 @@
     <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
 {% endblock %}
 {% block js %}
+    $(window).resize(function() {
+        $("#sidebar").height( window.innerHeight-40 );
+        $("#table_overflow").height( $("#sidebar").height()-120 );
+    });
+
     // display the form when clicking on the "add bill" button
     var show_form = function(){
         $('#bill-form').show(70);
@@ -53,9 +58,14 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="sidebar">
-<h2>{{ _("Balance") }}</h2>
+<div id="sidebar" class="sidebar">
+    <h2>{{ _("Balance") }}</h2>
 
+    <form action="{{ url_for(".add_member") }}" method="post">
+        {{ forms.add_member(member_form) }}
+    </form>
+
+    <div id="table_overflow">
     <table class="balance">
     {% set balance = g.project.balance %}
     {% for member in g.project.members %}
@@ -70,10 +80,8 @@
     {% endif %}
     {% endfor %}
     </table>
+    </div>
 
-    <form action="{{ url_for(".add_member") }}" method="post">
-        {{ forms.add_member(member_form) }}
-    </form>
 </div>
 {% endblock %}
 
@@ -107,4 +115,8 @@
     <p>{{ _("Nothing to list yet. You probably want to") }} <a id="empty-new-bill" href="{{ url_for(".add_bill") }}">{{ _("add a bill") }}</a> ?</p>
     {% endif %}
 </div>
+<script>
+        $("#sidebar").height( window.innerHeight-40 );
+        $("#table_overflow").height( $("#sidebar").height()-120 );
+</script>
 {% endblock %}
-- 
cgit v1.1