mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-22 03:13:12 +00:00
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.
This commit is contained in:
Alexandre Iooss
Alexandre IOOSS
parent
1f1063bf06
commit
e571751c70
6 changed files with 228 additions and 211 deletions
Binary file not shown.
|
|
@ -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 <a href=\"https://rezometz.org/"
|
||||
"\">Rézo Supélec Metz</a> et quelques membres d'autres assocations de <a href="
|
||||
"\">Rézo Supélec Metz</a> et quelques membres d'autres associations de <a href="
|
||||
"\"https://federez.net\">FedeRez</a> autour de l'été 2016.<br /> 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 le<a href="
|
||||
"disponible sous licence GNU Public Licence v2 (GPLv2) sur le <a href="
|
||||
"\"https://gitlab.federez.net/federez/re2o/\">gitlab de FedeRez</a>.<br />\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 "
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<meta property="og:image:alt" content="The Re2o logo"/>
|
||||
<meta property="og:description" content="{% trans "Networking managing website endorsed by FedeRez." %}" />
|
||||
<script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js"></script>
|
||||
|
||||
{# Load CSS and JavaScript #}
|
||||
{% bootstrap_css %}
|
||||
<link href="/static/css/typeaheadjs.css" rel="stylesheet">
|
||||
|
|
@ -60,8 +61,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<div id="wrap">
|
||||
<nav class="navbar navbar-inverse">
|
||||
<nav class="navbar navbar-inverse navbar-static-top">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
|
||||
|
|
@ -167,7 +167,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
</nav>
|
||||
|
||||
<div id="main" class="container-fluid text-center">
|
||||
<div class="container-fluid text-center">
|
||||
<div class="row content">
|
||||
<div class="col-sm-2 sidenav">
|
||||
<div class="panel panel-default">
|
||||
|
|
@ -250,13 +250,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="navbar">
|
||||
<div class="containerfluid text-center">
|
||||
<p> <a href="\\{{request.get_host}}/about/">Re2o 2016-2018</a> </p>
|
||||
<footer class="text-muted">
|
||||
<div class="container">
|
||||
<p class="pull-right">
|
||||
<a href="#">{% trans "Back to top" %}</a>
|
||||
</p>
|
||||
<p>{{ name_website }} {% trans "powered by" %} Re2o 2016–2018</p>
|
||||
<p>
|
||||
{% blocktrans trimmed %}
|
||||
Brought to you with <i class="fa fa-heart text-danger"></i>.
|
||||
{% endblocktrans %}
|
||||
<a href="{{ request.scheme }}://{{ request.get_host }}/about/">{% trans "About this website" %}</a>.
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans trimmed %}
|
||||
This software is under the terms of the
|
||||
<a href="http://www.gnu.org/licenses/gpl-2.0.txt" target="_blank" rel="nofollow">GPLv2</a> License.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
{# Read the documentation for more information #}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -82,11 +82,11 @@ msgstr "Statistiques"
|
|||
msgid "Administration"
|
||||
msgstr "Administration"
|
||||
|
||||
#: base.html:119
|
||||
#: base.html:112
|
||||
msgid "More information"
|
||||
msgstr "Plus d'informations"
|
||||
|
||||
#: base.html:121
|
||||
#: base.html:114
|
||||
msgid "About"
|
||||
msgstr "À propos"
|
||||
|
||||
|
|
@ -162,6 +162,30 @@ msgstr[1] "%(nb)s machines actives"
|
|||
msgid "View my machines"
|
||||
msgstr "Voir mes machines"
|
||||
|
||||
#: base.html:257
|
||||
msgid "Back to top"
|
||||
msgstr "Retour en haut"
|
||||
|
||||
#: base.html:259
|
||||
msgid "powered by"
|
||||
msgstr "propulsé par"
|
||||
|
||||
#: base.html:261
|
||||
msgid "Brought to you with <i class=\"fa fa-heart text-danger\"></i>."
|
||||
msgstr "Codé avec <i class=\"fa fa-heart text-danger\"></i>."
|
||||
|
||||
#: base.html:264
|
||||
msgid "About this website"
|
||||
msgstr "À propos de ce site"
|
||||
|
||||
#: base.html:267
|
||||
msgid ""
|
||||
"This software is under the terms of the "
|
||||
"<a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a> License."
|
||||
msgstr ""
|
||||
"Ce logiciel est sous les termes de la licence "
|
||||
"<a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a>."
|
||||
|
||||
#: buttons/add.html:27
|
||||
msgid "Add"
|
||||
msgstr "Ajouter"
|
||||
|
|
|
|||
Loading…
Reference in a new issue