From 286213026982435e6e87cdbbd5dddcd80e925b91 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 1 Feb 2017 19:41:55 +0100
Subject: Adapt to bootstrap 4 forms

- Adapt to BS4 class names and hierarchy
- Redesign some forms to have the label above the input (mobile-friendly)
- For the remaining inline form (add bill), use the grid, as BS no longer
  provides inline form alignment helpers
---
 budget/templates/list_bills.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'budget/templates/list_bills.html')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 72b9032..aacc128 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -58,7 +58,7 @@
 {% block sidebar %}
 <div id="sidebar" class="sidebar">
 
-    <form id="add-member-form" action="{{ url_for(".add_member") }}" method="post" class="form-inline input-append">
+    <form id="add-member-form" action="{{ url_for(".add_member") }}" method="post" class="form-inline">
         {{ forms.add_member(member_form) }}
     </form>
 
-- 
cgit v1.1


From a3cbede680f9623c7ab4071df9abf143dec64065 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 1 Feb 2017 20:22:25 +0100
Subject: Refactor layout based on bootstrap 4 grid

---
 budget/templates/list_bills.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'budget/templates/list_bills.html')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index aacc128..69a1692 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -1,16 +1,10 @@
-{% extends "layout.html" %}
+{% extends "sidebar_table_layout.html" %}
 
 {% block title %} - {{ g.project.name }}{% endblock %}
 {% block head %}
     <script src="{{ url_for("static", filename="js/bootstrap-datepicker.js") }}"></script>
 {% endblock %}
 {% block js %}
-
-    $(window).resize(function() {
-        $("#sidebar").height( window.innerHeight-50 );
-        $("#table_overflow").height( $("#sidebar").height()-120 );
-    });
-
     {% if add_bill %} $('#new-bill').click(); {% endif %}
 
     // Hide all members actions
@@ -56,8 +50,6 @@
 {% endblock %}
 
 {% block sidebar %}
-<div id="sidebar" class="sidebar">
-
     <form id="add-member-form" action="{{ url_for(".add_member") }}" method="post" class="form-inline">
         {{ forms.add_member(member_form) }}
     </form>
@@ -89,8 +81,6 @@
     {% endfor %}
     </table>
     </div>
-
-</div>
 {% endblock %}
 
 {% block content %}
-- 
cgit v1.1


From fe39258630e55d4a3e1297a01a1c8fd39bad3a4e Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 4 Feb 2017 00:29:10 +0100
Subject: Adapt list bills view to bootstrap 4

- modal classes and hierarchy changed since BS2
- striped tables are now handled by css3 pseudo-class rather than classes
- fix placement/alignment for the button and comment above the table
---
 budget/templates/list_bills.html | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'budget/templates/list_bills.html')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 69a1692..1eb5356 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -87,22 +87,26 @@
 <div class="identifier">{{ _("The project identifier is") }} <a href="{{ url_for(".list_bills") }}">{{ g.project.id }}</a>, {{ _("remember it!") }}</div>
 <a id="new-bill" href="{{ url_for(".add_bill") }}" class="btn btn-primary" data-toggle="modal" data-target="#bill-form">{{ _("Add a new bill") }}</a>
 
-    <div id="bill-form" class="modal hide">
-        <div class="modal-header">
-            <a href="#" class="close" data-dismiss="modal">&times;</a>
-            <h3>{{ _('Add a bill') }}</h3>
+    <div id="bill-form" class="modal fade show" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3 class="modal-title">{{ _('Add a bill') }}</h3>
+                    <a href="#" class="close" data-dismiss="modal">&times;</a>
+                </div>
+                <form action="{{ url_for(".add_bill") }}" method="post" class="modal-body container">
+                {{ forms.add_bill(bill_form, title=False) }}
+                </form>
+            </div>
         </div>
-        <form action="{{ url_for(".add_bill") }}" method="post" class="modal-body form-horizontal">
-            {{ forms.add_bill(bill_form, title=False) }}
-        </form>
     </div>
 
     {% if bills.count() > 0 %}
-    <table id="bill_table" class="table table-striped">
+    <table id="bill_table" class="col table table-striped table-hover">
         <thead><tr><th>{{ _("When?") }}</th><th>{{ _("Who paid?") }}</th><th>{{ _("For what?") }}</th><th>{{ _("For whom?") }}</th><th>{{ _("How much?") }}</th><th>{{ _("Actions") }}</th></tr></thead>
     <tbody>
     {% for bill in bills %}
-    <tr class="{{ loop.cycle("odd", "even") }}" owers={{bill.owers|join(',','id')}} payer={{bill.payer.id}}>
+    <tr owers={{bill.owers|join(',','id')}} payer={{bill.payer.id}}>
             <td>{{ bill.date }}</td>
             <td>{{ bill.payer }}</td>
             <td>{{ bill.what }}</td>
-- 
cgit v1.1


From 0aafbcc0b396aebfe1cd98ceea451b239c6c397c Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 4 Feb 2017 10:10:32 +0100
Subject: Update bootstrap-datepicker to 1.6.4

Actually switching to maintained fork at
https://github.com/uxsolutions/bootstrap-datepicker ; the original project
being unmaintained since 2012.

- Works with recent jQuery
- BS4 is not supported by bootstrap-datepicker, but actually, it works :-)

ref https://github.com/uxsolutions/bootstrap-datepicker/issues/1670
---
 budget/templates/list_bills.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'budget/templates/list_bills.html')

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 1eb5356..9421650 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -3,6 +3,7 @@
 {% block title %} - {{ g.project.name }}{% endblock %}
 {% block head %}
     <script src="{{ url_for("static", filename="js/bootstrap-datepicker.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/locales/bootstrap-datepicker.fr.min.js") }}" charset="utf-8"></script>
 {% endblock %}
 {% block js %}
     {% if add_bill %} $('#new-bill').click(); {% endif %}
-- 
cgit v1.1