Skip to content

Commit

Permalink
add missing margin
Browse files Browse the repository at this point in the history
  • Loading branch information
@SebastienReuiller
SebastienReuiller committed Sep 25, 2024
1 parent b0de241 commit eb4801b
Show file tree
Hide file tree
Showing 4 changed files with 228 additions and 207 deletions.
6 changes: 3 additions & 3 deletions lemarche/templates/dashboard/home_siae.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{ page_title }}</h1>
</div>
</section>
{% if user.siaeuser_set.count %}
<section class="fr-mb-4v">
<section class="fr-mb-6v">
<div class="fr-container">
<div id="siaes_tabs" class="fr-grid-row">
<div class="fr-col-12">
Expand Down Expand Up @@ -79,9 +79,9 @@ <h1>{{ page_title }}</h1>
</section>
{% else %}
<section>
<div class="fr-container">
<div class="fr-container fr-pb-6v">
<div class="fr-grid-row">
<div class="fr-col-12 fr-mb-6v">{% include "dashboard/_add_siae_card.html" %}</div>
<div class="fr-col-12">{% include "dashboard/_add_siae_card.html" %}</div>
</div>
</div>
</section>
Expand Down
199 changes: 106 additions & 93 deletions lemarche/templates/dashboard/siae_users.html
View file
Original file line number Diff line number Diff line change
@@ -1,130 +1,143 @@
{% extends "layouts/base.html" %}
{% load static process_dict dsfr_tags %}

{% block page_title %}Mes collaborateurs{{ block.super }}{% endblock page_title %}

{% block page_title %}
Mes collaborateurs{{ block.super }}
{% endblock page_title %}
{% block breadcrumb %}
<section>
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12">
{% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %}
{% dsfr_breadcrumb breadcrumb_data %}
<section>
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12">
{% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %}
{% dsfr_breadcrumb breadcrumb_data %}
</div>
</div>
</div>
</div>
</section>
</section>
{% endblock breadcrumb %}

{% block content %}
<section>
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12">
<h1>
Mes collaborateurs
</h1>
<section>
<div class="fr-container fr-pb-8v">
<div class="fr-grid-row">
<div class="fr-col-12">
<h1>Mes collaborateurs</h1>
</div>
</div>
</div>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-lg-8">
{% if siae.siaeuserrequest_set.pending.count %}
<div class="fr-grid-row fr-mb-1w">
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-lg-8">
{% if siae.siaeuserrequest_set.pending.count %}
<div class="fr-grid-row fr-mb-1w">
<div class="fr-col">
<h2>En attente</h2>
</div>
</div>
{% for siaeuserrequest in siae.siaeuserrequest_set.pending %}
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col">
<div class="fr-card fr-card--sm fr-card--grey">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title fr-icon-user-fill">{{ siaeuserrequest.initiator.full_name }}</h3>
<p class="fr-card__desc">
<strong>{{ siaeuserrequest.initiator.email }}</strong>
</p>
<div class="fr-card__start">
<ul class="fr-badges-group">
<li>
<p class="fr-badge fr-badge--sm fr-badge--green-emeraude"
title="{{ siaeuserrequest.created_at|date:'d/m/Y H:i' }}">
Nouveau collaborateur
</p>
</li>
</ul>
</div>
</div>
<div class="fr-card__footer">
<ul class="fr-btns-group--right fr-btns-group fr-btns-group--inline fr-btns-group--inline-reverse">
<li>
<button class="fr-btn fr-icon-checkbox-circle-line"
data-fr-opened="false"
aria-controls="siae_user_request_confirm_modal"
data-siae-slug="{{ siae.slug }}"
data-initiator-full-name="{{ siaeuserrequest.initiator.full_name }}"
data-siae-user-request-id="{{ siaeuserrequest.id }}"
title="Confirmer la demande">
Confirmer la demande
</button>
</li>
<li>
<button class="fr-btn fr-btn--secondary fr-icon-close-circle-line"
data-fr-opened="false"
aria-controls="siae_user_request_cancel_modal"
data-siae-slug="{{ siae.slug }}"
data-initiator-full-name="{{ siaeuserrequest.initiator.full_name }}"
data-siae-user-request-id="{{ siaeuserrequest.id }}"
title="Refuser la demande">Refuser la demande</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{% endif %}
<div class="fr-grid-row fr-mt-12v">
<div class="fr-col">
<h2>En attente</h2>
<h2>Confirmés</h2>
</div>
</div>
{% for siaeuserrequest in siae.siaeuserrequest_set.pending %}
{% for siaeuser in siae.siaeuser_set.all %}
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col">
<div class="fr-card fr-card--sm fr-card--grey">
<div class="fr-card fr-card--sm">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title fr-icon-user-fill">
{{ siaeuserrequest.initiator.full_name }}
</h3>
<p class="fr-card__desc"><strong>{{ siaeuserrequest.initiator.email }}</strong></p>
<div class="fr-card__start">
<ul class="fr-badges-group">
<h3 class="fr-card__title fr-icon-user-fill">{{ siaeuser.user.full_name }}</h3>
<p class="fr-card__desc">
<strong>{{ siaeuser.user.email }}</strong>
</p>
</div>
{% if siaeuser.user != user %}
<div class="fr-card__footer">
<ul class="fr-btns-group--right fr-btns-group fr-btns-group--inline">
<li>
<p class="fr-badge fr-badge--sm fr-badge--green-emeraude" title="{{ siaeuserrequest.created_at|date:'d/m/Y H:i' }}">Nouveau collaborateur</p>
<button class="fr-btn fr-btn--secondary delete-bin-line"
data-fr-opened="false"
aria-controls="siae_user_delete_modal"
data-siae-slug="{{ siae.slug }}"
data-user-full-name="{{ siaeuser.user.full_name }}"
data-siae-user-id="{{ siaeuser.id }}"
title="Supprimer le collaborateur">
Supprimer le collaborateur
</button>
</li>
</ul>
</div>
</div>
<div class="fr-card__footer">
<ul class="fr-btns-group--right fr-btns-group fr-btns-group--inline fr-btns-group--inline-reverse">
<li>
<button class="fr-btn fr-icon-checkbox-circle-line" data-fr-opened="false" aria-controls="siae_user_request_confirm_modal" data-siae-slug="{{ siae.slug }}" data-initiator-full-name="{{ siaeuserrequest.initiator.full_name }}" data-siae-user-request-id="{{ siaeuserrequest.id }}" title="Confirmer la demande">
Confirmer la demande
</button>
</li>
<li>
<button class="fr-btn fr-btn--secondary fr-icon-close-circle-line" data-fr-opened="false" aria-controls="siae_user_request_cancel_modal" data-siae-slug="{{ siae.slug }}" data-initiator-full-name="{{ siaeuserrequest.initiator.full_name }}" data-siae-user-request-id="{{ siaeuserrequest.id }}" title="Refuser la demande">
Refuser la demande
</button>
</li>
</ul>
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endfor %}
{% endif %}

<div class="fr-grid-row fr-mt-12v">
<div class="fr-col">
<h2>Confirmés</h2>
</div>
</div>
{% for siaeuser in siae.siaeuser_set.all %}
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col">
<div class="fr-card fr-card--sm">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title fr-icon-user-fill">
{{ siaeuser.user.full_name }}
</h3>
<p class="fr-card__desc"><strong>{{ siaeuser.user.email }}</strong></p>
</div>
{% if siaeuser.user != user %}
<div class="fr-card__footer">
<ul class="fr-btns-group--right fr-btns-group fr-btns-group--inline">
<li>
<button class="fr-btn fr-btn--secondary delete-bin-line" data-fr-opened="false" aria-controls="siae_user_delete_modal" data-siae-slug="{{ siae.slug }}" data-user-full-name="{{ siaeuser.user.full_name }}" data-siae-user-id="{{ siaeuser.id }}" title="Supprimer le collaborateur">
Supprimer le collaborateur
</button>
</li>
</ul>
</div>
{% endif %}
</div>
</div>
</div>
<div class="fr-col-12 fr-col-lg-4">
<div class="fr-callout fr-p-4v">
<h3 class="fr-callout__title fr-text--sm">
<span class="fr-icon-lightbulb-line" aria-hidden="true"></span> Collaborateurs
</h3>
<p class="fr-callout__text fr-text--sm fr-pl-7v">Gérez ici les collaborateurs liés à votre structure.</p>
</div>
{% endfor %}
</div>
<div class="fr-col-12 fr-col-lg-4">
<div class="fr-callout fr-p-4v">
<h3 class="fr-callout__title fr-text--sm"><span class="fr-icon-lightbulb-line" aria-hidden="true"></span> Collaborateurs</h3>
<p class="fr-callout__text fr-text--sm fr-pl-7v">
Gérez ici les collaborateurs liés à votre structure.
</p>
</div>
</div>
</div>
</div>
</section>
</section>
{% endblock content %}

{% block modals %}
{% include "siaes/_siae_user_request_confirm_modal.html" %}
{% include "siaes/_siae_user_request_cancel_modal.html" %}
{% include "siaes/_siae_user_delete_modal.html" %}
{% endblock modals %}

{% block extra_js %}
<script type="text/javascript" src="{% static 'js/siae_user_modals.js' %}"></script>
<script type="text/javascript" src="{% static 'js/siae_user_modals.js' %}"></script>
{% endblock extra_js %}
Loading

0 comments on commit eb4801b

Please sign in to comment.