bouzoure/pop-camarades
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge recent UI & Postgres work into main branch #4

Merged
bouzoure merged 19 commits from postgres into main 2025-07-24 12:13:01 +02:00
Conversation 0 Commits 19 Files changed 51 +388 -382
13 changed files with 388 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 36520d7435 - Show all commits

2
views/admin.html
View file

@ -13,7 +13,6 @@
</div> </div>
<div class="row mw-900"> <div class="row mw-900">
<div class="col-12"> <div class="col-12">
<a class="dashboard-tile" href="/admin/sections"> <a class="dashboard-tile" href="/admin/sections">
<div class="alert alert-primary"> <div class="alert alert-primary">
@ -93,7 +92,6 @@
</div> </div>
</a> </a>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

4
views/field_form.html
View file

@ -36,7 +36,9 @@
{% endif %} {% endif %}
<div class="row align-items-center mb-3"> <div class="row align-items-center mb-3">
<label for="name" class="form-label mb-0 col-md-2"> Nom du champ </label> <label for="name" class="form-label mb-0 col-md-2">
Nom du champ
</label>
<div class="col-md-10"> <div class="col-md-10">
<input <input
id="name" id="name"

20
views/fields.html
View file

@ -32,11 +32,12 @@
{% if Field.PersonType == "member" %} {% if Field.PersonType == "member" %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-12 col-md-8 col-lg-6"> <div class="col-12 col-md-8 col-lg-6">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
<a href="/admin/fields/{{ Field.ID }}"> {{ Field.Name }} </a> <a href="/admin/fields/{{ Field.ID }}">
{{ Field.Name }}
</a>
</div> </div>
</div> </div>
@ -45,9 +46,7 @@
<div> <div>
{% for Key, Value in FieldTypes %} {% for Key, Value in FieldTypes %}
{% if Key == Field.FieldType %} {% if Key == Field.FieldType %}
<span class="badge text-bg-primary"> <span class="badge text-bg-primary"> {{ Value }} </span>
{{ Value }}
</span>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
@ -71,7 +70,6 @@
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
@ -86,11 +84,12 @@
{% if Field.PersonType == "contact" %} {% if Field.PersonType == "contact" %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-12 col-md-8 col-lg-6"> <div class="col-12 col-md-8 col-lg-6">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
<a href="/admin/fields/{{ Field.ID }}"> {{ Field.Name }} </a> <a href="/admin/fields/{{ Field.ID }}">
{{ Field.Name }}
</a>
</div> </div>
</div> </div>
@ -99,9 +98,7 @@
<div> <div>
{% for Key, Value in FieldTypes %} {% for Key, Value in FieldTypes %}
{% if Key == Field.FieldType %} {% if Key == Field.FieldType %}
<span class="badge text-bg-primary"> <span class="badge text-bg-primary"> {{ Value }} </span>
{{ Value }}
</span>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
@ -125,7 +122,6 @@
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}

2
views/lists.html
View file

@ -29,7 +29,6 @@
{% for List in Lists %} {% for List in Lists %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row"> <div class="row">
<div class="col-12 col-sm-8 col-md-9 col-xl-6"> <div class="col-12 col-sm-8 col-md-9 col-xl-6">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
@ -47,7 +46,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

12
views/person.html
View file

@ -10,7 +10,9 @@
{% if Person.IsMember %} {% if Person.IsMember %}
<li class="breadcrumb-item"><a href="/members">Membres</a></li> <li class="breadcrumb-item"><a href="/members">Membres</a></li>
{% else %} {% else %}
<li class="breadcrumb-item"><a href="/contacts">Sympathisants</a></li> <li class="breadcrumb-item">
<a href="/contacts">Sympathisants</a>
</li>
{% endif %} {% endif %}
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
@ -545,9 +547,13 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
{% if Person.IsMember %} {% if Person.IsMember %}
<p>Êtes-vous sûr de vouloir convertir ce membre en sympathisant ?</p> <p>
Êtes-vous sûr de vouloir convertir ce membre en sympathisant ?
</p>
{% else %} {% else %}
<p>Êtes-vous sûr de vouloir convertir ce sympathisant en membre ?</p> <p>
Êtes-vous sûr de vouloir convertir ce sympathisant en membre ?
</p>
{% endif %} {% endif %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

4
views/person_form.html
View file

@ -10,7 +10,9 @@
{% if Person.IsMember or MembersPage %} {% if Person.IsMember or MembersPage %}
<li class="breadcrumb-item"><a href="/members">Membres</a></li> <li class="breadcrumb-item"><a href="/members">Membres</a></li>
{% else %} {% else %}
<li class="breadcrumb-item"><a href="/contacts">Sympathisants</a></li> <li class="breadcrumb-item">
<a href="/contacts">Sympathisants</a>
</li>
{% endif %} {% endif %}
{% if Person.ID %} {% if Person.ID %}

8
views/role.html
View file

@ -251,7 +251,9 @@
</div> </div>
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-md-2 col-xl-3">Convertir membres en sympathisants</div> <div class="col-md-2 col-xl-3">
Convertir membres en sympathisants
</div>
<div class="col"> <div class="col">
{% if Role.ConvertMemberToContact %} {% if Role.ConvertMemberToContact %}
<div class="input-group"> <div class="input-group">
@ -506,7 +508,9 @@
</div> </div>
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-md-2 col-xl-3">Convertir sympathisants en membres</div> <div class="col-md-2 col-xl-3">
Convertir sympathisants en membres
</div>
<div class="col"> <div class="col">
{% if Role.ConvertContactToMember %} {% if Role.ConvertContactToMember %}
<div class="input-group"> <div class="input-group">

2
views/roles.html
View file

@ -29,14 +29,12 @@
{% for Role in Roles %} {% for Role in Roles %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
<a href="/admin/roles/{{ Role.ID }}"> {{ Role.Name }} </a> <a href="/admin/roles/{{ Role.ID }}"> {{ Role.Name }} </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

4
views/section_form.html
View file

@ -36,7 +36,9 @@
{% endif %} {% endif %}
<div class="row align-items-center mb-3"> <div class="row align-items-center mb-3">
<label for="name" class="form-label mb-0 col-md-2 col-xl-3"> Nom </label> <label for="name" class="form-label mb-0 col-md-2 col-xl-3">
Nom
</label>
<div class="col-md-10 col-xl-9"> <div class="col-md-10 col-xl-9">
<input <input
id="name" id="name"

14
views/sections.html
View file

@ -29,7 +29,6 @@
{% for Section in Sections %} {% for Section in Sections %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row"> <div class="row">
<div class="col-12 col-sm-8 col-md-9 col-xl-3 order-1"> <div class="col-12 col-sm-8 col-md-9 col-xl-3 order-1">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
@ -39,7 +38,9 @@
</div> </div>
</div> </div>
<div class="col-12 col-sm-8 col-md-9 col-xl-3 order-2 order-sm-3 order-xl-2"> <div
class="col-12 col-sm-8 col-md-9 col-xl-3 order-2 order-sm-3 order-xl-2"
>
<div class="text-bold fs-7 mt-xxl-0 mt-2">Section parente</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Section parente</div>
<div> <div>
{% if Section.ParentSectionID %} {% if Section.ParentSectionID %}
@ -47,12 +48,16 @@
{{ Section.ParentSection.Name }} {{ Section.ParentSection.Name }}
</a> </a>
{% else %} {% else %}
<span class="badge text-bg-danger">Pas de section parente</span> <span class="badge text-bg-danger"
>Pas de section parente</span
>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="col-12 col-sm-4 col-md-3 col-xl-3 order-3 order-sm-2 order-xl-3"> <div
class="col-12 col-sm-4 col-md-3 col-xl-3 order-3 order-sm-2 order-xl-3"
>
<div class="text-bold fs-7 mt-xxl-0 mt-2">Membres</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Membres</div>
<div> <div>
{% if Section.ContainsMembers %} {% if Section.ContainsMembers %}
@ -73,7 +78,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

6
views/users.html
View file

@ -29,7 +29,6 @@
{% for User in Users %} {% for User in Users %}
<div class="card card-body my-2 py-2 bg-body-tertiary"> <div class="card card-body my-2 py-2 bg-body-tertiary">
<div class="row"> <div class="row">
<div class="col-12 col-sm-8 col-md-9 col-xl-5 order-1"> <div class="col-12 col-sm-8 col-md-9 col-xl-5 order-1">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Nom</div>
<div> <div>
@ -39,9 +38,7 @@
<div class="col-12 col-xl-5 order-2 order-sm-3 order-xl-2"> <div class="col-12 col-xl-5 order-2 order-sm-3 order-xl-2">
<div class="text-bold fs-7 mt-xxl-0 mt-2">Email</div> <div class="text-bold fs-7 mt-xxl-0 mt-2">Email</div>
<div> <div>{{ User.Email }}</div>
{{ User.Email }}
</div>
</div> </div>
<div class="col order-3 order-sm-2 order-xl-3"> <div class="col order-3 order-sm-2 order-xl-3">
@ -54,7 +51,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}