Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suppression de salles #121

Merged
merged 8 commits into from
Mar 29, 2024
Merged

Suppression de salles #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1891112
Mise au DSFR de la modale de suppression de salle
funelie Mar 14, 2024
7554cbc
Supprime le code inutilisé sur la modale de suppression de salle
funelie Mar 14, 2024
812882d
Mise au DSFR de la modale d'invitation
funelie Mar 14, 2024
5abb05c
Corrige l'alignement des boutons et retire les icones inutiles
funelie Mar 22, 2024
903f87a
Passe au DSFR les modal d'enregistrement
funelie Mar 22, 2024
62f5322
Corrige l'affichage des boutons d'action sur les enregistrments
funelie Mar 22, 2024
e827f0a
Merge branch 'main' into ux-suppression-salle
azmeuk Mar 29, 2024
7d8aa18
Corrige le fonctionnement du bouton annuler pour les modales
funelie Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions web/b3desk/static/css/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ footer{
form.delete {
display: inline-block;
text-align: center;
width: 100%;
}


Expand Down Expand Up @@ -194,6 +195,7 @@ form.delete {
#js-modal-overlay .invisible{
opacity: 0;
}

/* modal */
.scampi-modal {
left: 0;
Expand Down Expand Up @@ -292,6 +294,13 @@ color: #000091; }
overflow: scroll;
}

.fr-btn--delete {
background-color: var(--background-action-high-red-marianne) !important;
}
.fr-btn--delete:hover {
background-color: var(--background-action-high-red-marianne-hover) !important;
}

#doc > a.anchor {
display: inline;
float: left;
Expand Down
16 changes: 12 additions & 4 deletions web/b3desk/templates/meeting/files.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,17 +147,25 @@ <h2 class="fr-h3">Vous pouvez ajouter un fichier :</h2>
<div class="fr-col-12 fr-col-md-8 fr-col-lg-6">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="delete-file-{{ file.id }}" title="Fermer"></button>
<button class="fr-btn--close fr-btn" aria-controls="delete-file-{{ file.id }}" title="Fermer">Fermer</button>
</div>
<div class="fr-modal__content">
<h1 id="delete-file-{{ file.id }}-title" class="fr-modal__title">
Supprimer
</h1>
<p class="padbot">Voulez-vous vraiment supprimer le fichier <em>{{ file.short_title }}</em> ?</p>
<form action="{{ url_for("meeting_files.delete_meeting_file") }}" method="POST" onsubmit="deleteFile(event)">
</div>
<div class="fr-modal__footer">
<form class="delete" action="{{ url_for("meeting_files.delete_meeting_file") }}" method="POST" onsubmit="deleteFile(event)">
<input class="fr-input" type="hidden" name="id" value="{{ file.id }}" />
<button type="submit" class="fr-btn fr-btn--primary" >Supprimer</button>
<button type="reset" class="fr-btn fr-btn--secondary" aria-controls="delete-file-{{ file.id }}" title="Annuler">Annuler</button>
<ul class="fr-btns-group fr-btns-group--inline-reverse fr-btns-group--inline-lg fr-btns-group--right">
<li>
<button type="submit" class="fr-btn fr-btn--primary fr-btn--delete" >Supprimer</button>
</li>
<li>
<button type="reset" class="fr-btn fr-btn--secondary" aria-controls="delete-file-{{ file.id }}" title="Annuler">Annuler</button>
</li>
</ul>
{% include 'meeting/csrf.html' %}
</form>
</div>
Expand Down
59 changes: 44 additions & 15 deletions web/b3desk/templates/meeting/modals/delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,47 @@
<!-- Supprimer -->
<div class="modal-template" id="delete-{{ meeting.id }}">
<div class="modal-body modal-body--center">
<p>Voulez-vous vraiment supprimer {{ the_meeting }} <em>{{ meeting.name }}</em> ?</p>
<div class="fr-highlight warning" id="meeting-delete-video-warning">
<p>
En supprimant {{ this_meeting }} vous supprimerez aussi les enregistrements qui lui sont rattachés.
</p>
<dialog id="delete-{{ meeting.id }}" class="fr-modal" role="dialog" aria-labelledby="delete-{{ meeting.id }}-title">
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-8 fr-col-lg-6">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="delete-{{ meeting.id }}" title="Fermer">
Fermer
</button>
</div>
<div class="fr-modal__content">
<h1 id="delete-{{ meeting.id }}-title" class="fr-modal__title">
<span class="" aria-hidden="true"></span>
Supprimer "<em>{{ meeting.name }}</em>" ?
</h1>
<p>Voulez-vous vraiment supprimer {{ the_meeting }} "<em>{{ meeting.name }}</em>" ?</p>
<div class="fr-notice fr-notice--info">
<div class="fr-container">
<div class="fr-notice__body">
<p class="fr-notice__title">La suppression est définitive</p>
</div>
<p>Si vous supprimez cette salle, tous les médias (documents importés et enregistrements) qui lui sont rattachés seront supprimés.</p>
</div>
</div>
</div>
<div class="fr-modal__footer">
<form action="{{ url_for("meetings.delete_meeting") }}" method="POST" class="delete">
<ul class="fr-btns-group fr-btns-group--inline-reverse fr-btns-group--inline-lg fr-btns-group--right">
<li>
<button type="submit" class="fr-btn fr-btn--delete">
Supprimer {{ the_meeting }}
</button>
</li>
<li>
<button type="reset" class="fr-btn fr-btn--secondary" aria-controls="delete-{{ meeting.id }}" title="Annuler">{% trans %}Annuler{% endtrans %}</button>
</li>
</ul>
{% include 'meeting/id.html' %}
{% include 'meeting/csrf.html' %}
</form>
</div>
</div>
</div>
</div>

<form action="{{ url_for("meetings.delete_meeting") }}" method="POST" class="delete">
<button type="submit" class="fr-btn fr-btn--primary" >Supprimer</button>
<button type="reset" class="fr-btn fr-btn--secondary js-modal-close" >Annuler</button>
{% include 'meeting/id.html' %}
{% include 'meeting/csrf.html' %}
</form>
</div>
</div>
</dialog>
114 changes: 67 additions & 47 deletions web/b3desk/templates/meeting/modals/invite.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,72 @@
<!-- Inviter -->
<div class="modal-template" id="share-{{ meeting.id }}">
<div class="modal-body">
<h2 class="fr-h4">Inviter les modérateurs</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-moderator-url">{{ meeting.get_signin_url(Role.moderator) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-moderator-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.moderator) }}');" title="Copier le lien modérateur dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
</div>
</div>
<p>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_role", meeting=meeting, role=Role.moderator) }}">Rejoindre {{ the_meeting }} en tant que modérateur principal</a>
</p>

<h2 class="fr-h4">Inviter les participants</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-attendee-url">{{ meeting.get_signin_url(Role.attendee) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-attendee-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.attendee) }}');" title="Copier le lien participant dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
</div>
</div>
<p>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_role", meeting=meeting, role=Role.attendee) }}">Rejoindre {{ the_meeting }} en tant que participant</a>
</p>
<dialog id="share-{{ meeting.id }}" class="fr-modal" role="dialog" aria-labelledby="share-{{ meeting.id }}-title">
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-8 fr-col-lg-6">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="share-{{ meeting.id }}" title="Fermer">
Fermer
</button>
</div>
<div class="fr-modal__content">
<h2 id="share-{{ meeting.id }}-title" class="fr-modal__title">
<span class="" aria-hidden="true"></span>
Inviter les modérateurs
</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-moderator-url">{{ meeting.get_signin_url(Role.moderator) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-moderator-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.moderator) }}');" title="Copier le lien modérateur dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
</div>
</div>
<p>
<br>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_role", meeting=meeting, role=Role.moderator) }}">Rejoindre {{ the_meeting }} en tant que modérateur principal</a>
</p>
<h2 id="share-{{ meeting.id }}-title" class="fr-modal__title">
<span class="" aria-hidden="true"></span>Inviter les participants</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-attendee-url">{{ meeting.get_signin_url(Role.attendee) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-attendee-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.attendee) }}');" title="Copier le lien participant dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
</div>
</div>
<p>
<br>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_role", meeting=meeting, role=Role.attendee) }}">Rejoindre {{ the_meeting }} en tant que participant</a>
</p>

<h2 class="fr-h4">Inviter les participants authentifiés {% if config.OIDC_ATTENDEE_SERVICE_NAME %}via {{ config.OIDC_ATTENDEE_SERVICE_NAME }} {% endif %}</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-authenticated-attendee-url">{{ meeting.get_signin_url(Role.authenticated) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-authenticated-attendee-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.authenticated) }}');" title="Copier le lien participant authentifié dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
<h2 id="share-{{ meeting.id }}-title" class="fr-modal__title">
<span class="" aria-hidden="true"></span>Inviter les participants authentifiés {% if config.OIDC_ATTENDEE_SERVICE_NAME %}via {{ config.OIDC_ATTENDEE_SERVICE_NAME }} {% endif %}</h2>
<p>En leur envoyant l’adresse ci-dessous :</p>
<div class="fr-grid-row fr-text--sm">
<div class="fr-col-xs-9 fr-col-sm-10">
<code id="meeting-{{ meeting.id }}-authenticated-attendee-url">{{ meeting.get_signin_url(Role.authenticated) }}</code>
</div>
<div class="fr-col">
<button type="button" class="btn-copy fr-btn fr-btn--primary" id="meeting-{{ meeting.id }}-authenticated-attendee-copy" onclick="navigator.clipboard.writeText('{{ meeting.get_signin_url(Role.authenticated) }}');" title="Copier le lien participant authentifié dans le presse-papiers">
<span class="ri-clipboard-line"></span>
</button>
</div>
</div>
<p>
<br>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_authenticated", meeting_id=meeting.id) }}">Rejoindre {{ the_meeting }} en tant que participant authentifié</a>
</p>
</div>
</div>
</div>
</div>
<p>
<a class="fr-link" target="_blank" rel="noopener" href="{{ url_for("join.join_meeting_as_authenticated", meeting_id=meeting.id) }}">Rejoindre {{ the_meeting }} en tant que participant authentifié</a>
</p>
</div>
</div>
</dialog>
Loading
Loading