Commit 079defc7 authored by lhark's avatar lhark

Misc UI improvements

parent 5acaa25c
...@@ -24,10 +24,30 @@ ...@@ -24,10 +24,30 @@
{% include 'buttons/history.html' with href='machines:history' name='machine' id=machine.id %} {% include 'buttons/history.html' with href='machines:history' name='machine' id=machine.id %}
</td> </td>
<td rowspan="{{ machine.interface_set.all|length }}"> <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> </td>
{% endif %} {% 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.type }}</td>
<td>{{ interface.mac_address }}</td> <td>{{ interface.mac_address }}</td>
<td>{{ interface.ipv4 }}</td> <td>{{ interface.ipv4 }}</td>
......
...@@ -18,6 +18,15 @@ footer { ...@@ -18,6 +18,15 @@ footer {
height: 50px; height: 50px;
clear:both; clear:both;
padding-top:20px; 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 */ /* Remove the navbar's default margin-bottom and rounded borders */
...@@ -41,11 +50,17 @@ footer { ...@@ -41,11 +50,17 @@ footer {
vertical-align: middle; vertical-align: middle;
} }
/* Set black background color, white text and some padding */ /* Pull sidebars to the bottom */
footer { @media (min-width: 767px) {
background-color: #ff69b4; .row {
color: white; display: -webkit-box;
padding: 15px; 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 */ /* On small screens, set height to 'auto' for sidenav and grid */
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<footer class="navbar"> <footer class="navbar">
<div class="containerfluid text-center"> <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> </div>
</footer> </footer>
......
...@@ -5,13 +5,33 @@ ...@@ -5,13 +5,33 @@
{% block content %} {% block content %}
<h2>Adhérent</h2> <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> <div>
<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> <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' user.id %}">
{% 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> <i class="glyphicon glyphicon-edit"></i>
<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 %} Editer
<a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' user.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a> </a>
<br /> <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' user.id %}">
<br /> <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"> <table class="table table-striped">
<tr> <tr>
<th>Prénom</th> <th>Prénom</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment