From 0f7f14c1ea320b1b5c7c0e4a4f2724998ec49e5b Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Thu, 27 Sep 2018 22:23:45 +0200 Subject: [PATCH 1/4] Fix Font Awesome icons Some icons had their id changed in the Debian version (4.7.0) so their id need to be updated. Also the width of an icon in a button was reduced to make it more compact. --- cotisations/templates/cotisations/aff_cotisations.html | 2 +- cotisations/templates/cotisations/aff_custom_invoice.html | 2 +- machines/templates/machines/aff_machines.html | 2 +- static/css/base.css | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 30de85dc..93384106 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -78,7 +78,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if facture.valid %} - {% trans "PDF" %} + {% trans "PDF" %} {% else %} {% trans "Invalidated invoice" %} diff --git a/cotisations/templates/cotisations/aff_custom_invoice.html b/cotisations/templates/cotisations/aff_custom_invoice.html index 41984c2c..0f4605ad 100644 --- a/cotisations/templates/cotisations/aff_custom_invoice.html +++ b/cotisations/templates/cotisations/aff_custom_invoice.html @@ -76,7 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% acl_end %} {% history_button invoice %} - {% trans "PDF" %} + {% trans "PDF" %} diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index e3404036..76ba3451 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "No name" as tr_no_name %} {% trans "View the profile" as tr_view_the_profile %} - {{ machine.name|default:'tr_no_name' }} + {{ machine.name|default:'tr_no_name' }} {{ machine.user }} diff --git a/static/css/base.css b/static/css/base.css index ec151adb..4f5d77fc 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -12,10 +12,10 @@ footer p { .navbar { margin-bottom: 0; } .pt4 { padding-top: 1.5rem!important; } -/* Reserv space for icons and align */ +/* Reserve space for icons and align */ a > i.fa { display: inline-block; - width: 26px; + width: 16px; text-align: center; } @@ -111,6 +111,7 @@ a > i.fa { .modal-dialog { width: 1000px } +} /* For tables with long text in cells */ From 7f6e3000336541ba19dd46190e67b3a58b23fc02 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Thu, 27 Sep 2018 22:35:04 +0200 Subject: [PATCH 2/4] Fix right sidebar when user is disconnected --- templates/base.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 8b661259..b2217618 100644 --- a/templates/base.html +++ b/templates/base.html @@ -223,7 +223,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% else %} -

{% trans "You are not logged in." %}

+
+

{% trans "You are not logged in." %}

+
{% endif %} {% if request_user.is_authenticated %} From 26e68a0ac05c70edba1c74728c5a361c4c431beb Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 28 Sep 2018 12:37:23 +0200 Subject: [PATCH 3/4] Fix footer not being on footer --- static/css/base.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/static/css/base.css b/static/css/base.css index 4f5d77fc..736935b3 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -64,10 +64,9 @@ a > i.fa { } } -/* Set height of the grid so .sidenav can be 100% (adjust as needed) */ +/* Set height of the grid so footer stay on footer */ .row.content { - height: 100%; - overflow: auto; + min-height: 70vh; } /* Set gray background color */ From 129d22d7c562e76e70a7e012eff47b733b81b9e5 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 28 Sep 2018 12:37:49 +0200 Subject: [PATCH 4/4] Change Glyphicon to Font Awesome on login page --- templates/registration/login.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/registration/login.html b/templates/registration/login.html index e169c321..c34c7582 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -32,8 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% csrf_token %} {% bootstrap_form form %} - +

{% trans "Forgotten password?" %}