From b57df5cd368eca946e5699237a954d37fb342b07 Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Thu, 20 Aug 2015 13:44:50 +0200
Subject: UI for showing user weights in user list

---
 budget/templates/list_bills.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'budget/templates')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 899fdeb..b0ec89a 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -63,7 +63,7 @@
     {% set balance = g.project.balance %}
     {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id] != 0 %}
     <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
-        <td class="balance-name">{{ member.name }}</td>
+        <td class="balance-name">{{ member.name }} <span class="light">(x{{ member.weight }})</span></td>
         {% if member.activated %}
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
-- 
cgit v1.1


From 85abc0b1fcbee6549425fad87b3cdd55669672d2 Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Thu, 20 Aug 2015 13:45:53 +0200
Subject: Added a template filter not to show zero decimals on user weights

---
 budget/templates/list_bills.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'budget/templates')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index b0ec89a..1d8e922 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -63,7 +63,7 @@
     {% set balance = g.project.balance %}
     {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id] != 0 %}
     <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
-        <td class="balance-name">{{ member.name }} <span class="light">(x{{ member.weight }})</span></td>
+        <td class="balance-name">{{ member.name }} <span class="light">(x{{ member.weight|minimal_round(1) }})</span></td>
         {% if member.activated %}
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
-- 
cgit v1.1


From 1147f2ece8eaa868f5f0b89da583d03560ec23ee Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Sat, 22 Aug 2015 10:49:15 +0200
Subject: Ask for confirmation only for deleting users

---
 budget/templates/list_bills.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'budget/templates')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 1d8e922..2702d99 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -13,9 +13,13 @@
 
     {% if add_bill %} $('#new-bill').click(); {% endif %}
 
-    // ask for confirmation before removing an user
+    // Hide all members actions
     $('.action').each(function(){
         $(this).hide();
+    });
+
+    // ask for confirmation before removing an user
+    $('.action.delete').each(function(){
         var link = $(this).find('button');
         link.click(function(){
             if ($(this).hasClass("confirm")){
-- 
cgit v1.1


From 64c2cd56dfb58ef78936d39b2e71640cd631653e Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Sat, 22 Aug 2015 10:49:35 +0200
Subject: display an edit button on members list

---
 budget/templates/list_bills.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'budget/templates')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 2702d99..9bad344 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -71,7 +71,10 @@
         {% if member.activated %}
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
-                <button type="submit">{{ _("delete") }}</button></form></td>
+                <button type="submit">{{ _("delete") }}</button></form>
+            <form class="action edit" action="{{ url_for(".edit_member", member_id=member.id) }}" method="POST">
+                <button type="submit">{{ _("edit") }}</button></form>
+        </td>
         {% else %}
         <td>
             <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST">
-- 
cgit v1.1


From ec8fe2326b209d580922876e9b1d32cbe98646b7 Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Sat, 22 Aug 2015 01:19:27 +0200
Subject: Added member edit form

---
 budget/templates/edit_member.html | 17 +++++++++++++++++
 budget/templates/forms.html       | 14 ++++++++++++++
 budget/templates/list_bills.html  |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 budget/templates/edit_member.html

(limited to 'budget/templates')

diff --git a/budget/templates/edit_member.html b/budget/templates/edit_member.html
new file mode 100644
index 0000000..5f097f9
--- /dev/null
+++ b/budget/templates/edit_member.html
@@ -0,0 +1,17 @@
+{% extends "layout.html" %}
+
+{% block js %}
+    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
+{% endblock %}
+
+
+{% block top_menu %}
+<a href="{{ url_for(".list_bills") }}">{{ _("Back to the list") }}</a>
+{% endblock %}
+
+{% block content %}
+
+<form class="form-horizontal" method="post">
+    {{ forms.edit_member(form, edit) }}
+</form>
+{% endblock %}
diff --git a/budget/templates/forms.html b/budget/templates/forms.html
index ec73515..07e5b3d 100644
--- a/budget/templates/forms.html
+++ b/budget/templates/forms.html
@@ -95,6 +95,20 @@
 {{ form.name(placeholder=_("Type user name here")) }}<button class="btn">{{ _("Add") }}</button>
 {% endmacro %}
 
+{% macro edit_member(form, title=True) %}
+    <fieldset>
+        {% if title %}<legend>{{ _("Edit this member") }}</legend>{% endif %}
+    {% include "display_errors.html" %}
+    {{ form.hidden_tag() }}
+    {{ input(form.name) }}
+    {{ input(form.weight) }}
+    </fieldset>
+    <div class="actions">
+        {{ form.submit(class="btn btn-primary") }}
+    </div>
+{% endmacro %}
+
+
 {% macro invites(form) %}
     {{ form.hidden_tag() }}
     {{ input(form.emails) }}
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 9bad344..0e0efd8 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -72,7 +72,7 @@
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
                 <button type="submit">{{ _("delete") }}</button></form>
-            <form class="action edit" action="{{ url_for(".edit_member", member_id=member.id) }}" method="POST">
+            <form class="action edit" action="{{ url_for(".edit_member", member_id=member.id) }}" method="GET">
                 <button type="submit">{{ _("edit") }}</button></form>
         </td>
         {% else %}
-- 
cgit v1.1


From 7a630b78eae90a57033f785a2253fd490868352d Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Sun, 23 Aug 2015 11:58:27 +0200
Subject: Hide the member weights in members list if all weights are "1".

---
 budget/templates/list_bills.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'budget/templates')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 0e0efd8..f081334 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -67,7 +67,9 @@
     {% set balance = g.project.balance %}
     {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id] != 0 %}
     <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
-        <td class="balance-name">{{ member.name }} <span class="light">(x{{ member.weight|minimal_round(1) }})</span></td>
+        <td class="balance-name">{{ member.name }}
+            <span class="light{% if not g.project.uses_weights %} extra-info{% endif %}">(x{{ member.weight|minimal_round(1) }})</span>
+        </td>
         {% if member.activated %}
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
-- 
cgit v1.1