Cleaner UI

This commit is contained in:
Thomas Forgione 2024-08-23 09:30:21 +02:00
parent e1c4d5179e
commit 38a92d4a73
3 changed files with 42 additions and 15 deletions

View File

@ -57,7 +57,11 @@
{% else %} {% else %}
<p>Il n'y a aucun projet pour le moment...</p> <p>Il n'y a aucun projet pour le moment...</p>
{% endif %} {% endif %}
<button id="add-object" class="button is-link">Ajouter un nouvel objet</button> <div class="field">
<div class="control">
<button id="add-object" class="button is-link">Ajouter un nouvel objet</button>
</div>
</div>
<div id="add-object-modal" class="modal"> <div id="add-object-modal" class="modal">
<div class="modal-background"></div> <div class="modal-background"></div>
<form action="/create-object/" method="POST"> <form action="/create-object/" method="POST">

View File

@ -4,9 +4,13 @@
<section class="section"> <section class="section">
<div class="container content"> <div class="container content">
<h1 class="title">{{ object.name }}</h1> <h1 class="title">{{ object.name }}</h1>
<div class="my-3"> <div class="field is-grouped">
<a class="button is-link mr-3" href="/download-object/tar/{{ object.id }}">Télécharger les données de l'objet (archive TAR)</a> <div class="control">
<a class="button is-link" href="/download-object/zip/{{ object.id }}">Télécharger les données de l'objet (archive ZIP)</a> <a class="button is-link" href="/download-object/tar/{{ object.id }}">Télécharger les données de l'objet (archive TAR)</a>
</div>
<div class="control">
<a class="button is-link" href="/download-object/zip/{{ object.id }}">Télécharger les données de l'objet (archive ZIP)</a>
</div>
</div> </div>
{% if object.acquisitions %} {% if object.acquisitions %}
<div class="fixed-grid has-6-cols"> <div class="fixed-grid has-6-cols">
@ -27,10 +31,22 @@
</div> </div>
{% endif %} {% endif %}
{% if calibration.state == CalibrationState.IsValidated %} <div class="field is-grouped">
<a href="/scan/{{ object.id }}" class="button is-link">Faire un scan</a> {% if calibration.state == CalibrationState.IsValidated %}
{% else %} <div class="control">
<button class="button is-link" id="scan">Faire un scan</button> <a href="/scan/{{ object.id }}" class="button is-link">Faire un scan</a>
</div>
{% else %}
<div class="control">
<button class="button is-link" id="scan">Faire un scan</button>
</div>
{% endif %}
<div class="control">
<a href="/delete-object/{{ object.id }}" class="button is-danger">Supprimer cet objet</a>
</div>
</div>
{% if calibration.state != CalibrationState.IsValidated %}
<div id="calibration-modal" class="modal"> <div id="calibration-modal" class="modal">
<div class="modal-background"></div> <div class="modal-background"></div>
<div class="modal-content"> <div class="modal-content">
@ -46,10 +62,8 @@
</div> </div>
</div> </div>
<button class="modal-close is-large" aria-label="close"></button> <button class="modal-close is-large" aria-label="close"></button>
</form> </div>
{% endif %} {% endif %}
<a href="/delete-object/{{ object.id }}" class="button is-danger">Supprimer cet objet</a>
</div>
</div> </div>
</section> </section>
{% endblock content %} {% endblock content %}

View File

@ -24,16 +24,25 @@
<progress id="progress-bar" class="progress is-link" style="display: none;" value="0" max="1000"></progress> <progress id="progress-bar" class="progress is-link" style="display: none;" value="0" max="1000"></progress>
<div id="calibrate" {% if not acquisition %}style="display: none;"{% endif %}> <div id="calibrate" {% if not acquisition %}style="display: none;"{% endif %}>
<p>Si les données acquises conviennent, appuyez sur le bouton ci-dessous pour valider l'acquisition.</p> <p>Si les données acquises conviennent, appuyez sur le bouton ci-dessous pour valider l'acquisition.</p>
<div class="field is-grouped">
{% if acquisition %} {% if acquisition %}
{% if acquisition.validated %} {% if acquisition.validated %}
<button disabled id="calibrate-button" class="button is-link">Cette acquisition a déjà été validée</button> <div class="control">
<button disabled id="calibrate-button" class="button is-link">Cette acquisition a déjà été validée</button>
</div>
{% else %} {% else %}
<a href="/validate-acquisition/{{ acquisition.id }}" id="calibrate-button" class="button is-link">Valider l'acquisition</a> <div class="control">
<a href="/validate-acquisition/{{ acquisition.id }}" id="calibrate-button" class="button is-link">Valider l'acquisition</a>
</div>
{% endif %} {% endif %}
{% else %} {% else %}
<a id="calibrate-button" class="button is-link">Valider l'acquisition</a> <div class="control">
<a id="calibrate-button" class="button is-link">Valider l'acquisition</a>
</div>
{% endif %} {% endif %}
<a id="delete-button" class="button is-danger" {% if acquisition %}href="/delete-acquisition/{{ acquisition.id }}"{% endif %}>Supprimer l'acquisition</a> <div class="control">
<a id="delete-button" class="button is-danger" {% if acquisition %}href="/delete-acquisition/{{ acquisition.id }}"{% endif %}>Supprimer l'acquisition</a>
</div>
</div> </div>
</div> </div>
</section> </section>