rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Homogénéisation des boutons.

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-03-17 23:52:01 +01:00
parent 9e79b117b2
commit f4a7fb7dfc
1 changed files with 95 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
users/templates/users/profil.html
View file

@ -44,14 +44,15 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
{% endif %} {% endif %}
<div class="panel-group" id="accordion"> <div class="panel-group" id="accordion">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse1"> <div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse1">
<h3 class="panel-title pull-left" > <h3 class="panel-title pull-left" >
Informations détaillées Informations détaillées
</h3> </h3>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<button class="btn btn-primary btn-sm dropdown-toggle" type="button" id="editionuser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <a class="btn btn-default btn-sm" id="editionuser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="fa fa-edit"></i> Édition<span class="caret"></span></button> <i class="fa fa-edit"></i> <span class="caret"></span>
</a>
<ul class="dropdown-menu" arialabelledby="editionuser"> <ul class="dropdown-menu" arialabelledby="editionuser">
<li> <li>
<a href="{% url 'users:edit-info' users.id %}"> <a href="{% url 'users:edit-info' users.id %}">
@ -65,24 +66,24 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
Changer le mot de passe Changer le mot de passe
</a> </a>
</li> </li>
{% can_change User state %} {% can_change User state %}
<li> <li>
<a href="{% url 'users:state' users.id %}"> <a href="{% url 'users:state' users.id %}">
<i class="fa fa-id-badge"></i> <i class="fa fa-id-badge"></i>
Changer le statut Changer le statut
</a> </a>
</li> </li>
{% acl_end %} {% acl_end %}
{% can_change User groups %} {% can_change User groups %}
<li> <li>
<a href="{% url 'users:groups' users.id %}"> <a href="{% url 'users:groups' users.id %}">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
Gérer les groupes Gérer les groupes
</a> </a>
</li> </li>
{% acl_end %} {% acl_end %}
<li> <li>
<a href="{% url 'users:history' 'user' users.id %}"> <a href="{% url 'users:history' 'user' users.id %}">
<i class="fa fa-history"></i> <i class="fa fa-history"></i>
Historique Historique
</a> </a>
@ -109,7 +110,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<th>Chambre</th> <th>Chambre</th>
<td>{{ users.room }}</td> <td>{{ users.room }}</td>
<th>Téléphone</th> <th>Téléphone</th>
<td>{{ users.telephone }}</td> <td>{{ users.telephone }}</td>
</tr> </tr>
<tr> <tr>
<th>École</th> <th>École</th>
@ -155,13 +156,13 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<tr> <tr>
<th>Accès internet</th> <th>Accès internet</th>
{% if users.has_access == True %} {% if users.has_access == True %}
<td><i class="text-success">Actif (jusqu'au {{ users.end_access }})</i></td> <td><i class="text-success">Actif (jusqu'au {{ users.end_access }})</i></td>
{% else %} {% else %}
<td><i class="text-danger">Désactivé</i></td> <td><i class="text-danger">Désactivé</i></td>
{% endif %} {% endif %}
<th>Groupes</th> <th>Groupes</th>
{% if users.groups.all %} {% if users.groups.all %}
<td>{{ users.groups.all|join:", "}}</td> <td>{{ users.groups.all|join:", "}}</td>
{% else %} {% else %}
<td>Aucun</td> <td>Aucun</td>
{% endif %} {% endif %}
@ -170,16 +171,16 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<tr> <tr>
<th>Solde</th> <th>Solde</th>
<td>{{ users.solde }} € <td>{{ users.solde }} €
<a class="btn btn-primary btn-sm" style='float:right' role="button" href="{% url 'cotisations:recharge' %}"> <a class="btn btn-primary btn-sm" style='float:right' role="button" href="{% url 'cotisations:recharge' %}">
<i class="glyphicon glyphicon-piggy-bank"></i> <i class="glyphicon glyphicon-piggy-bank"></i>
Recharger Recharger
</a> </a>
</td> </td>
{% endif %} {% endif %}
{% if users.shell %} {% if users.shell %}
<th>Shell</th> <th>Shell</th>
<td>{{ users.shell }}</td> <td>{{ users.shell }}</td>
{% endif %} {% endif %}
</tr> </tr>
</table> </table>
</div> </div>
@ -191,11 +192,18 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<h3 class="panel-title pull-left"> <h3 class="panel-title pull-left">
Gérer le club Gérer le club
</h3> </h3>
<div class="btn-group pull-right"> <div class="dropdown pull-right">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' users.club.id %}"> <a class="btn btn-default btn-sm" id="editionclub" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="fa fa-lock"></i> <i class="fa fa-edit"></i> <span class="caret"></span>
Gérer admin et membres
</a> </a>
<ul class="dropdown-menu" arialabelledby="editionclub">
<li>
<a href="{% url 'users:edit-club-admin-members' users.club.id %}">
<i class="fa fa-lock"></i>
Gérer admin et membres
</a>
</li>
</ul>
</div> </div>
</div> </div>
<div class="panel-collapse collapse" id="collapse2"> <div class="panel-collapse collapse" id="collapse2">
@ -213,7 +221,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<tr> <tr>
<td>{{ admin.surname }}</td> <td>{{ admin.surname }}</td>
<td>{{ admin.name }}</td> <td>{{ admin.name }}</td>
<td>{{ admin.pseudo }}</td> <td>{{ admin.pseudo }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
@ -230,7 +238,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<tr> <tr>
<td>{{ admin.surname }}</td> <td>{{ admin.surname }}</td>
<td>{{ admin.name }}</td> <td>{{ admin.name }}</td>
<td>{{ admin.pseudo }}</td> <td>{{ admin.pseudo }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
@ -244,7 +252,19 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
Machines Machines
<span class="badge">{{machines_list.count}}</span> <span class="badge">{{machines_list.count}}</span>
</h3> </h3>
<a class="btn btn-primary btn-sm pull-right" role="button" href="{% url 'machines:new-machine' users.id %}"><i class="fa fa-desktop"></i> Ajouter une machine</a> <div class="dropdown pull-right">
<a class="btn btn-default btn-sm" id="editionmachines" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="fa fa-edit"></i> <span class="caret"></span>
</a>
<ul class="dropdown-menu" arialabelledby="editionmachines">
<li>
<a href="{% url 'machines:new-machine' users.id %}">
<i class="fa fa-desktop"></i>
Ajouter une machine
</a>
</li>
</ul>
</div>
</div> </div>
<div id="collapse3" class="panel-collapse collapse"> <div id="collapse3" class="panel-collapse collapse">
<div class="panel-body"> <div class="panel-body">
@ -261,22 +281,34 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<h3 class="panel-title pull-left"> <h3 class="panel-title pull-left">
Cotisations Cotisations
</h3> </h3>
<div class="btn-group pull-right"> <div class="dropdown pull-right">
{% can_create Facture %} <a class="btn btn-default btn-sm" id="editionfacture" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"> <i class="fa fa-edit"></i> <span class="caret"></span>
<i class="glyphicon glyphicon-piggy-bank"></i>
Ajouter une cotisation
</a> </a>
<ul class="dropdown-menu" arialabelledby="editionfacture">
{% can_create Facture %}
<li>
<a href="{% url 'cotisations:new-facture' users.id %}">
<i class="glyphicon glyphicon-piggy-bank"></i>
Ajouter une cotisation
</a>
</li>
{% if user_solde %} {% if user_solde %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"> <li>
<i class="glyphicon glyphicon-piggy-bank"></i> <a href="{% url 'cotisations:credit-solde' users.id %}">
Modifier le solde <i class="glyphicon glyphicon-piggy-bank"></i>
</a> Modifier le solde
</a>
</li>
{% endif%}{% acl_else %} {% endif%}{% acl_else %}
{% if user_solde %} {% if user_solde %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"> <li>
<i class="glyphicon glyphicon-piggy-bank"></i> <a href="{% url 'cotisations:new_facture_solde' user.id %}">
Ajouter une cotisation par solde</a>{% endif %}{% acl_end %} <i class="glyphicon glyphicon-piggy-bank"></i>
Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}
</a>
</li>
</ul>
</div> </div>
</div> </div>
<div id="collapse4" class="panel-collapse collapse"> <div id="collapse4" class="panel-collapse collapse">
@ -294,12 +326,20 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<h3 class="panel-title pull-left"> <h3 class="panel-title pull-left">
Bannissements Bannissements
</h3> </h3>
<div class="btn-group pull-right"> <div class="dropdown pull-right">
{% can_create Ban %} <a class="btn btn-default btn-sm" id="editionban" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-ban' users.id %}"> <i class="fa fa-edit"></i> <span class="caret"></span>
<i class="fa fa-ban"></i> </a>
Ajouter un bannissement <ul class="dropdown-menu" arialabelledby="editionban">
</a>{% acl_end %} {% can_create Ban %}
<li>
<a href="{% url 'users:add-ban' users.id %}">
<i class="fa fa-ban"></i>
Ajouter un bannissement
</a>
</li>
{% acl_end %}
</ul>
</div> </div>
</div> </div>
<div id="collapse5" class="panel-collapse collapse"> <div id="collapse5" class="panel-collapse collapse">
@ -317,13 +357,20 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<h3 class="panel-title pull-left"> <h3 class="panel-title pull-left">
Accès à titre gracieux Accès à titre gracieux
</h3> </h3>
<div class="btn-group pull-right"> <div class="dropdown pull-right">
{% can_create Whitelist %} <a class="btn btn-default btn-sm" id="editionwhitelist" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-whitelist' users.id %}"> <i class="fa fa-edit"></i> <span class="caret"></span>
<i class="fa fa-check-circle"></i>
Accorder un accès à titre gracieux
</a> </a>
<ul class="dropdown-menu" arialabelledby="editionwhitelist">
{% can_create Whitelist %}
<li>
<a href="{% url 'users:add-whitelist' users.id %}">
<i class="fa fa-check-circle"></i>
Accorder un accès à titre gracieux
</a>
</li>
{% acl_end %} {% acl_end %}
</ul>
</div> </div>
</div> </div>
<div id="collapse6" class="panel-collapse collapse"> <div id="collapse6" class="panel-collapse collapse">