From 87d2dea9c8d97bc9373dd16e921606635ef6795b Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Mon, 30 Jan 2017 23:23:03 +0100
Subject: Factor navbar between list_bills and settle_bill

---
 budget/templates/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 543bcb3..ccf958f 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -42,8 +42,8 @@
             {% 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>
+                <li class="nav-item{% if current_view == 'list_bills' %} active{% endif %}"><a class="nav-link" href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+                <li class="nav-item{% if current_view == 'settle_bill' %} active{% endif %}"><a class="nav-link" href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
                 {% endblock %}
             </ul>
             {% endif %}
-- 
cgit v1.1


From 37da1db38ac17209f6ab6832a0bf5052ae81475b Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 1 Feb 2017 19:14:49 +0100
Subject: Update bootstrap dependency to bootstrap 4

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

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

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index ccf958f..7b44638 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -5,8 +5,9 @@
     <title>{{ _("Account manager") }}{% block title %}{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">
-    <script src="{{ url_for("static", filename="js/jquery-1.7.2.min.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/jquery-3.1.1.min.js") }}"></script>
     <script src="{{ url_for("static", filename="js/ihatemoney.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/tether.min.js") }}"></script>
     <script src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
     <script src="{{ url_for("static", filename="js/bootstrap-datepicker.js") }}"></script>
     {% block head %}{% endblock %}
-- 
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/layout.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 7b44638..e9adb30 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -73,25 +73,26 @@
     </div>
 </div>
 
-{% block header %}{% endblock %}
 
-{% block body %}
+</nav>
+
 <div class="container-fluid">
+{% block body %}
     {% block sidebar %}{% endblock %}
-    <div class="content">
+    <main class="content offset-1 col-10">
     {% block content %}{% endblock %}
-    </div>
+    </main>
 </div>
 {% endblock %}
 
 {% for message in get_flashed_messages() %}
-<div class="flash alert alert-success"><p>{{ message }}</p></div>
+<div class="flash alert alert-success">{{ message }}</div>
 {% endfor %}
 
 {% block footer %}
-<div id="footer">
+<footer>
     <p><a href="https://github.com/spiral-project/ihatemoney">{{ _("This is a free software") }}</a>, {{ _("you can contribute and improve it!") }}</p>
-</div>
+</footer>
 {% endblock %}
 
 </body>
-- 
cgit v1.1


From c6c5f8657e3935da98c537fe75ab2eefe8751b6c Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Thu, 2 Feb 2017 11:48:40 +0100
Subject: Adapt navigation bar to bootstrap 4

Also fixed some weird alignment issues.
I think this will need more work later (revamp the navbar layout to avoid that
sensation of thing which are floating at random places in the navbar).
---
 budget/templates/layout.html | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

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

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index e9adb30..50f3019 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -14,7 +14,7 @@
     <script type="text/javascript" charset="utf-8">
         $(document).ready(function(){
             var left = window.innerWidth/2-$('.flash').width()/2;
-            $(".flash").css({ "left": left+"px", "top":"45px" });
+            $(".flash").css({ "left": left+"px", "top":"0.6rem" });
             setTimeout(function(){
                 $(".flash").fadeOut("slow", function () {
                     $(".flash").remove();
@@ -36,42 +36,37 @@
 </head>
 <body>
 
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container-fluid">
-            <h1><a class="brand" href="{{ url_for(".home") }}">#! money?</a></h1>
+  <nav class="navbar navbar-toggleable-md navbar fixed-top navbar-inverse bg-inverse">
+  <h1 class="col-2"><a class="navbar-brand" href="{{ url_for(".home") }}">#! money?</a></h1>
+            <ul class="navbar-nav col-5 offset-md-1">
             {% if g.project %}
-            <ul class="nav primary-nav">
                 {% block navbar %}
                 <li class="nav-item{% if current_view == 'list_bills' %} active{% endif %}"><a class="nav-link" href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
                 <li class="nav-item{% if current_view == 'settle_bill' %} active{% endif %}"><a class="nav-link" href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
                 {% endblock %}
-            </ul>
             {% endif %}
-            <ul class="nav pull-right secondary-nav">
+            </ul>
+            <ul class="navbar-nav secondary-nav col-4">
             {% if g.project %}
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><strong>{{ g.project.name }}</strong> {{ _("options") }} <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="{{ url_for(".edit_project") }}">{{ _("Project settings") }}</a></li>
-                        <li class="divider"></li>
+                <li class="nav-item dropdown">
+                    <a href="#" class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><strong>{{ g.project.name }}</strong> {{ _("options") }} <b class="caret"></b></a>
+                    <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                        <li><a class="dropdown-item" href="{{ url_for(".edit_project") }}">{{ _("Project settings") }}</a></li>
+                        <li class="dropdown-divider"></li>
                         {% for id, name in session['projects'] %}
                         {% if id != g.project.id %}
-                        <li><a href="{{ url_for(".list_bills", project_id=id) }}">{{ _("switch to") }} {{ name }}</a></li>
+                        <li><a class="dropdown-item" href="{{ url_for(".list_bills", project_id=id) }}">{{ _("switch to") }} {{ name }}</a></li>
                         {% endif %}
                         {% endfor %}
-                        <li><a href="{{ url_for(".create_project") }}">{{ _("Start a new project") }}</a></li>
-                        <li class="divider"></li>
-                        <li><a href="{{ url_for(".exit") }}">{{ _("Logout") }}</a></li>
+                        <li><a class="dropdown-item" href="{{ url_for(".create_project") }}">{{ _("Start a new project") }}</a></li>
+                        <li class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="{{ url_for(".exit") }}">{{ _("Logout") }}</a></li>
                     </ul>
                 </li>
             {% endif %}
-                <li{% if g.lang == "fr" %} class="active"{% endif %}><a href="{{ url_for(".change_lang", lang="fr") }}">fr</a></li>
-                <li{% if g.lang == "en" %} class="active"{% endif %}><a href="{{ url_for(".change_lang", lang="en") }}">en</a></li>
+                <li class="nav-item{% if g.lang == "fr" %} active{% endif %}"><a class="nav-link" href="{{ url_for(".change_lang", lang="fr") }}">fr</a></li>
+                <li class="nav-item{% if g.lang == "en" %} active{% endif %}"><a class="nav-link" href="{{ url_for(".change_lang", lang="en") }}">en</a></li>
             </ul>
-        </div>
-    </div>
-</div>
 
 
 </nav>
-- 
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/layout.html | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 50f3019..979f994 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -9,7 +9,6 @@
     <script src="{{ url_for("static", filename="js/ihatemoney.js") }}"></script>
     <script src="{{ url_for("static", filename="js/tether.min.js") }}"></script>
     <script src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
-    <script src="{{ url_for("static", filename="js/bootstrap-datepicker.js") }}"></script>
     {% block head %}{% endblock %}
     <script type="text/javascript" charset="utf-8">
         $(document).ready(function(){
-- 
cgit v1.1