diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index 227fef1e..2eff473c 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -24,10 +24,30 @@ {% include 'buttons/history.html' with href='machines:history' name='machine' id=machine.id %} -

{{ machine.user }} + {{ machine.user }} {% endif %} - {{ interface.dns }} + + {% if interface.alias_set.all %} +

+ {% else %} + {{ interface.dns }} + {% endif %} + {{ interface.type }} {{ interface.mac_address }} {{ interface.ipv4 }} diff --git a/static/css/base.css b/static/css/base.css index 8c022bff..7338fab6 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -18,6 +18,15 @@ footer { 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; +} + +footer a { + color: white; + text-decoration: underline; } /* Remove the navbar's default margin-bottom and rounded borders */ @@ -41,11 +50,17 @@ footer { vertical-align: middle; } -/* Set black background color, white text and some padding */ -footer { - background-color: #ff69b4; - color: white; - padding: 15px; +/* Pull sidebars to the bottom */ +@media (min-width: 767px) { + .row { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + } + .row > [class*='col-'] { + flex-direction: column; + } } /* On small screens, set height to 'auto' for sidenav and grid */ diff --git a/templates/base.html b/templates/base.html index b43fca28..d087b0f9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -156,7 +156,7 @@ diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index e2b1456f..5544eaf9 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -5,13 +5,33 @@ {% block content %}

Adhérent

- Editer - Changer le mot de passe - {% if is_bureau %} Changer le statut - Ajouter un droit{% endif %} - Historique -
-
+
+ + + Editer + + + + Changer le mot de passe + + {% if is_bureau %} + + + Changer le statut + + + + Ajouter un droit + + {% endif %} + + + Historique + +
+

+
+

Prénom