From e571751c706a5541aeb421bf366d328e35e01585 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 18 Sep 2018 22:11:25 +0200 Subject: [PATCH] Fix footer and about * Rather than using href="\\host/about/" in page footer, use href="protocol://host/about/" * The old footer uses hacks to be staticly on the bottom. To make it much simpler one solution is to turn it white and use official Bootstrap code. This leads to less CSS to maintain and better cross-browser compatibility. * On re2o about page (/about/) there is some typos such as : * assocations > associations * legitlab > le gitlab * Use Bootstrap navbar-static-top rather than custom CSS. The result is the same, so we should be better using directly Bootstrap CSS. --- re2o/locale/fr/LC_MESSAGES/django.mo | Bin 5658 -> 5619 bytes re2o/locale/fr/LC_MESSAGES/django.po | 4 +- static/css/base.css | 34 +- templates/base.html | 373 +++++++++++----------- templates/locale/fr/LC_MESSAGES/django.mo | Bin 5348 -> 5886 bytes templates/locale/fr/LC_MESSAGES/django.po | 28 +- 6 files changed, 228 insertions(+), 211 deletions(-) diff --git a/re2o/locale/fr/LC_MESSAGES/django.mo b/re2o/locale/fr/LC_MESSAGES/django.mo index e51e7ad2c405c39dd7c69a5d303d5cdd7f5053c7..e3d6b8ed33926ba613cc385cae1ce79cb5766660 100644 GIT binary patch delta 425 zcmXZXJxIe)5Ww+^23k$6mipC29%|7Nr8X3CadPNVq)Qi36k~=$QBYb?#NejjAm|Xp zv2G5Q?8Q;g$w6>;62!s9LDB!Cg$KWP_wF8dS2JJs-J#)IhRBU2GASa>n8+Ny-~>kc zL^5b&3d@+l9UR7Eq*VfpU<1>5izE1qCcYzI$|vf&A5>_@#g`r~>9|M~v)GFZIEqWC z8&>fIx9|)H#)z4EHgMLB|Jlh`%w1_E0-s!&%~U%wsEj?fQ*|f0l0=mGEdFW=y%BDlC^(skT|I ixT;ujy=_u;M@<(>#k!MGd$nCv^)7PJeE61_H~#?(;5v~2 delta 432 zcmXZXF-SsT5Ww-%q+V&3yfRzzQ5l3i`g|IQQ&4k5NJL9K=naAtsBMuDMG-Z%L{ktg zP0<^gLK+$(nxY|hho**Tim3lbPQSbR?mq55(`QrHTY-8mAaWTN85faeL`2~)j-l!m znZzOv<2J_d6ytb>jLJQB;WMW26^HN}Luf`t_)-$6`%-A39hJIt6D&|La2b2h#RQg7 z5A5Lq9^(b^T1z=!sG6ZL}c_}C%x)y^B{|3OdYs>lirEeiVLS*AyE z4fO*1ID+Rmjg7V+=#VD|MKZXEI^RVbZ!w20|1J1qOcd?8is#l!8|(JGTk{H*qcVA0 qP?xVi?KJ>So0%d;Vdp6#4`ChCBEG diff --git a/re2o/locale/fr/LC_MESSAGES/django.po b/re2o/locale/fr/LC_MESSAGES/django.po index 58886a6b..67b33e5d 100644 --- a/re2o/locale/fr/LC_MESSAGES/django.po +++ b/re2o/locale/fr/LC_MESSAGES/django.po @@ -98,11 +98,11 @@ msgid "" "to contact us and come help us build the future of Re2o." msgstr "" "Re2o est un outil d'administration initié par Rézo Supélec Metz et quelques membres d'autres assocations de Rézo Supélec Metz et quelques membres d'autres associations de FedeRez autour de l'été 2016.
Il se veut " "être un outil indépendant de toute infrastructure réseau pour pouvoir être " "installé en \"quelques étapes\". Cet outil est entièrement gratuit et est " -"disponible sous license GNU Public License v2 (GPLv2) sur legitlab de FedeRez.
\n" "Les mainteneurs de Re2o sont de fiers bénévoles venant principalement " "d'écoles d'ingénieurs françaises (mais pas seulement) qui ont donné beaucoup " diff --git a/static/css/base.css b/static/css/base.css index 5748f538..168f6c81 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -1,38 +1,16 @@ -/* Sticky footer hacks */ -html, body { - height: 100%; -} - -#wrap { - min-height: 100%; -} - -#main { - overflow: auto; - padding-bottom:60px; /* this needs to be bigger than footer height*/ -} - +/* Footer */ footer { - position: relative; - margin-top: -50px; /* negative value of footer height */ - height: 50px; - clear:both; - padding-top:20px; - background-color: #222222; - /*background: -webkit-linear-gradient(left, red, red 16.6%, orange 16.6%, orange, orange 33.3%, yellow 33.3%, yellow, yellow 50%, green 50%, green, green 66.6%, blue 66.6%, blue, blue 83.3%, violet 83.3%,violet); */ - color: white; - padding: 15px; + padding-top: 3rem; + padding-bottom: 3rem; } -footer a { - color: white; - text-decoration: underline; +footer p { + margin-bottom: .25rem; } -/* Remove the navbar's default margin-bottom and rounded borders */ +/* Remove the navbar's default margin-bottom */ .navbar { margin-bottom: 0; - border-radius: 0; } /* Reduce the padding for the logo in the navbar-brand so the 32px-high logo diff --git a/templates/base.html b/templates/base.html index aeb840da..81304ad8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc., + {# Load CSS and JavaScript #} {% bootstrap_css %} @@ -60,203 +61,217 @@ with this program; if not, write to the Free Software Foundation, Inc., -
- + +
+
+
+
+
+ {% block sidebar %} + {% endblock %} +
- - -
-
-
-
-
- {% block sidebar %} - {% endblock %} -
-
-
-
- {# Display django.contrib.messages as Bootstrap alerts #} - {% bootstrap_messages %} -
- {% block content %}{% endblock %} -
-
-
- {% if request_user.is_authenticated %} -
-

{{ request_user.name }} {{ request_user.surname }}

-
- - - - - - - - - - - - - - - - - -
{% trans "Username" %}{{ request_user.pseudo }}
{% trans "Room" %}{{ request_user.room }}
{% trans "Internet access" %} - {% if request_user.has_access %} - {% blocktrans with request.user.end_access|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %} - {% else %} - {% trans "Disabled" %} - {% endif %} -
{% trans "Membership" %} - {% if request_user.is_adherent %} - {% blocktrans with request_user.end_adhesion|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %} - {% else %} - {% trans "Not a member" %} - {% endif %} -
-
- - - {% trans "View my profile" %} - -
- {% else %} -

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

- {% endif %} -
+
+ {# Display django.contrib.messages as Bootstrap alerts #} + {% bootstrap_messages %} +
+ {% block content %}{% endblock %} +
+
+
{% if request_user.is_authenticated %} -
-
-

{% blocktrans count interfaces|length as nb %}{{ nb }} active machine{% plural %}{{ nb }} active machines{% endblocktrans %}

-
- +
+

{{ request_user.name }} {{ request_user.surname }}

+ + + + + + + + + + + + + + + + + +
{% trans "Username" %}{{ request_user.pseudo }}
{% trans "Room" %}{{ request_user.room }}
{% trans "Internet access" %} + {% if request_user.has_access %} + {% blocktrans with request.user.end_access|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %} + {% else %} + {% trans "Disabled" %} + {% endif %} +
{% trans "Membership" %} + {% if request_user.is_adherent %} + {% blocktrans with request_user.end_adhesion|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %} + {% else %} + {% trans "Not a member" %} + {% endif %} +
+
+ + + {% trans "View my profile" %} + +
+ {% else %} +

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

{% endif %}
+ {% if request_user.is_authenticated %} +
+
+

{% blocktrans count interfaces|length as nb %}{{ nb }} active machine{% plural %}{{ nb }} active machines{% endblocktrans %}

+
+ +
+ {% endif %}
-