mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-27 07:02:26 +00:00
Merge branch 'buttons_amelioration' into 'master'
modification panel profil See merge request federez/re2o!109
This commit is contained in:
commit
b49866d9ee
1 changed files with 77 additions and 130 deletions
|
@ -49,49 +49,35 @@ 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" >
|
||||||
<i class="fa fa-user"></i> Informations détaillées
|
<i class="fa fa-user"></i> Informations détaillées
|
||||||
</h3>
|
</h3>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionuser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div class="panel-collapse collapse in" id="collapse1">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' users.id %}">
|
||||||
<ul class="dropdown-menu" arialabelledby="editionuser">
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'users:edit-info' users.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
<i class="fa fa-edit"></i>
|
||||||
Editer
|
Editer
|
||||||
</a>
|
</a>
|
||||||
</li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' users.id %}">
|
||||||
<li>
|
|
||||||
<a href="{% url 'users:password' users.id %}">
|
|
||||||
<i class="fa fa-lock"></i>
|
<i class="fa fa-lock"></i>
|
||||||
Changer le mot de passe
|
Changer le mot de passe
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
{% can_change User state %}
|
{% can_change User state %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" 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>
|
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
{% can_change User groups %}
|
{% can_change User groups %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" 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>
|
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" 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>
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="panel-collapse collapse in" id="collapse1">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
|
@ -194,21 +180,14 @@ 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">
|
||||||
<i class="fa fa-users"></i> Gérer le club
|
<i class="fa fa-users"></i> Gérer le club
|
||||||
</h3>
|
</h3>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionclub" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div class="panel-collapse collapse" id="collapse2">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' users.club.id %}">
|
||||||
<ul class="dropdown-menu" arialabelledby="editionclub">
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'users:edit-club-admin-members' users.club.id %}">
|
|
||||||
<i class="fa fa-lock"></i>
|
<i class="fa fa-lock"></i>
|
||||||
Gérer admin et membres
|
Gérer admin et membres
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="panel-collapse collapse" id="collapse2">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<h4>Administrateurs du club</h4>
|
<h4>Administrateurs du club</h4>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
@ -259,21 +238,14 @@ 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>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionmachines" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div id="collapse3" class="panel-collapse collapse">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
|
||||||
<ul class="dropdown-menu" arialabelledby="editionmachines">
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:new-machine' users.id %}">
|
|
||||||
<i class="fa fa-desktop"></i>
|
<i class="fa fa-desktop"></i>
|
||||||
Ajouter une machine
|
Ajouter une machine
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div id="collapse3" class="panel-collapse collapse">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if machines_list %}
|
{% if machines_list %}
|
||||||
{% include "machines/aff_machines.html" with machines_list=machines_list %}
|
{% include "machines/aff_machines.html" with machines_list=machines_list %}
|
||||||
|
@ -289,37 +261,26 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
|
||||||
<i class="fa fa-euro-sign"></i>
|
<i class="fa fa-euro-sign"></i>
|
||||||
Cotisations
|
Cotisations
|
||||||
</h3>
|
</h3>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionfacture" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div id="collapse4" class="panel-collapse collapse">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
|
||||||
<ul class="dropdown-menu" arialabelledby="editionfacture">
|
|
||||||
{% can_create Facture %}
|
{% can_create Facture %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">
|
||||||
<a href="{% url 'cotisations:new-facture' users.id %}">
|
|
||||||
<i class="fa fa-euro-sign"></i>
|
<i class="fa fa-euro-sign"></i>
|
||||||
Ajouter une cotisation
|
Ajouter une cotisation
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
{% if user_solde %}
|
{% if user_solde %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
|
||||||
<a href="{% url 'cotisations:credit-solde' users.id %}">
|
|
||||||
<i class="fa fa-euro-sign"></i>
|
<i class="fa fa-euro-sign"></i>
|
||||||
Modifier le solde
|
Modifier le solde
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
{% endif%}{% acl_else %}
|
{% endif%}{% acl_else %}
|
||||||
{% if user_solde %}
|
{% if user_solde %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}">
|
||||||
<a href="{% url 'cotisations:new_facture_solde' user.id %}">
|
|
||||||
<i class="fa fa-euro-sign"></i>
|
<i class="fa fa-euro-sign"></i>
|
||||||
Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}
|
Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div id="collapse4" class="panel-collapse collapse">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if facture_list %}
|
{% if facture_list %}
|
||||||
{% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
|
{% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
|
||||||
|
@ -335,23 +296,16 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
|
||||||
<i class="fa fa-ban"></i>
|
<i class="fa fa-ban"></i>
|
||||||
Bannissements
|
Bannissements
|
||||||
</h3>
|
</h3>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionban" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div id="collapse5" class="panel-collapse collapse">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
|
||||||
<ul class="dropdown-menu" arialabelledby="editionban">
|
|
||||||
{% can_create Ban %}
|
{% can_create Ban %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-ban' users.id %}">
|
||||||
<a href="{% url 'users:add-ban' users.id %}">
|
|
||||||
<i class="fa fa-ban"></i>
|
<i class="fa fa-ban"></i>
|
||||||
Ajouter un bannissement
|
Ajouter un bannissement
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div id="collapse5" class="panel-collapse collapse">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if ban_list %}
|
{% if ban_list %}
|
||||||
{% include "users/aff_bans.html" with ban_list=ban_list %}
|
{% include "users/aff_bans.html" with ban_list=ban_list %}
|
||||||
|
@ -367,23 +321,16 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
|
||||||
<i class="fa fa-check-circle"></i>
|
<i class="fa fa-check-circle"></i>
|
||||||
Accès à titre gracieux
|
Accès à titre gracieux
|
||||||
</h3>
|
</h3>
|
||||||
<div class="dropdown pull-right">
|
</div>
|
||||||
<a class="btn btn-default btn-sm" id="editionwhitelist" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
<div id="collapse6" class="panel-collapse collapse">
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
<div class="panel-body">
|
||||||
</a>
|
|
||||||
<ul class="dropdown-menu" arialabelledby="editionwhitelist">
|
|
||||||
{% can_create Whitelist %}
|
{% can_create Whitelist %}
|
||||||
<li>
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-whitelist' users.id %}">
|
||||||
<a href="{% url 'users:add-whitelist' users.id %}">
|
|
||||||
<i class="fa fa-check-circle"></i>
|
<i class="fa fa-check-circle"></i>
|
||||||
Accorder un accès à titre gracieux
|
Accorder un accès à titre gracieux
|
||||||
</a>
|
</a>
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div id="collapse6" class="panel-collapse collapse">
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if white_list %}
|
{% if white_list %}
|
||||||
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
||||||
|
|
Loading…
Reference in a new issue