From 079defc7f939ed0a7621c7f83c17d3cca374db87 Mon Sep 17 00:00:00 2001
From: lhark <lhark@arachne>
Date: Sat, 19 Nov 2016 02:13:19 +0100
Subject: [PATCH] Misc UI improvements

---
 machines/templates/machines/aff_machines.html | 24 +++++++++++--
 static/css/base.css                           | 25 +++++++++++---
 templates/base.html                           |  2 +-
 users/templates/users/profil.html             | 34 +++++++++++++++----
 4 files changed, 70 insertions(+), 15 deletions(-)

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 %}
             </td>
             <td rowspan="{{ machine.interface_set.all|length }}">
-                <p><b>{{ machine.user }}</b</p>
+                <a href="{% url 'users:profil' userid=machine.user.id %}"><b>{{ machine.user }}</b></a>
             </td>
             {% endif %}
-            <td>{{ interface.dns }}</td>
+            <td>
+            {% if interface.alias_set.all %}
+                <div class="dropdown">
+                    <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                        {{ interface.dns }} <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="editioninterface">
+                    {% for al in interface.alias_set.all %}
+                        <li>
+                            <a href="http://{{ al }}{{ al.extension }}">
+                                {{ al }}{{ al.extension }}
+                                <i class="glyphicon glyphicon-share-alt"></i>
+                            </a>
+                        </li>
+                    {% endfor %}
+                    </ul>
+                </div>
+            {% else %}
+                {{ interface.dns }}
+            {% endif %}
+            </td>
             <td>{{ interface.type }}</td>
             <td>{{ interface.mac_address }}</td>
             <td>{{ interface.ipv4 }}</td>
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 @@
 
         <footer class="navbar">
             <div class="containerfluid text-center">
-                <p>Re2o 2016 - Goulven Kermarec, Gabriel Détraz, Augustin Lemesle</p>
+                <p>Re2o 2016 - Gabriel Détraz, <a href="https://gitlab.rezometz.org/lhark">Goulven Kermarec</a>, Augustin Lemesle</p>
             </div>
         </footer>
 
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 %}
     <h2>Adhérent</h2>
-    <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' user.id %}"><i class="glyphicon glyphicon-edit"></i> Editer</a>  
-    <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' user.id %}"><i class="glyphicon glyphicon-lock"></i> Changer le mot de passe</a>  
-    {% if is_bureau %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:state' user.id %}"><i class="glyphicon glyphicon-flash"></i> Changer le statut</a>
-    <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-right' user.id %}"><i class="glyphicon glyphicon-ok"></i> Ajouter un droit</a>{% endif %}
-    <a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' user.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a>
-    <br />
-    <br />
+    <div>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' user.id %}">
+            <i class="glyphicon glyphicon-edit"></i>
+            Editer
+        </a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' user.id %}">
+            <i class="glyphicon glyphicon-lock"></i>
+            Changer le mot de passe
+        </a>
+        {% if is_bureau %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:state' user.id %}">
+            <i class="glyphicon glyphicon-flash"></i>
+            Changer le statut
+        </a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-right' user.id %}">
+            <i class="glyphicon glyphicon-ok"></i>
+            Ajouter un droit
+        </a>
+        {% endif %}
+        <a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' user.id %}">
+            <i class="glyphicon glyphicon-time"></i>
+            Historique
+        </a>
+    </div>
+    <p>
+        <br />
+    </p>
     <table class="table table-striped">
         <tr>
             <th>Prénom</th>