From c68219016d287af8bf43338b19170ab7c762eaa5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Fri, 9 Dec 2022 09:15:17 +0100
Subject: [PATCH] Icones et styling
---
.../validation-instance/index.phtml | 4 ++--
.../validation-instance/partial/filtre.phtml | 15 +++++++++++----
.../validation-type/index.phtml | 4 ++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/view/unicaen-validation/validation-instance/index.phtml b/view/unicaen-validation/validation-instance/index.phtml
index 123456c..8958293 100644
--- a/view/unicaen-validation/validation-instance/index.phtml
+++ b/view/unicaen-validation/validation-instance/index.phtml
@@ -31,8 +31,8 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali
</div>
<div class="col-md-4">
<?php if ($canAfficherType) : ?>
- <a href="<?php echo $this->url('validation/type', [], [], true); ?>" class="btn btn-primary action">
- <span class="icon acceder"></span>
+ <a href="<?php echo $this->url('validation/type', [], [], true); ?>" class="btn btn-secondary action">
+ <span class="icon icon-listing"></span>
Types de validation
</a>
<?php endif; ?>
diff --git a/view/unicaen-validation/validation-instance/partial/filtre.phtml b/view/unicaen-validation/validation-instance/partial/filtre.phtml
index 369721c..49ac6a5 100644
--- a/view/unicaen-validation/validation-instance/partial/filtre.phtml
+++ b/view/unicaen-validation/validation-instance/partial/filtre.phtml
@@ -54,11 +54,11 @@ use UnicaenApp\Form\Element\SearchAndSelect;
</div>
<div class="col-md-4">
<button type="button" id="filter" class="btn btn-primary filter-action">
- <span class="icon filtrer" aria-hidden="true"></span> Filtrer
+ <span class="icon icon-filtrer" aria-hidden="true"></span> Filtrer
</button>
<br/>
<button type="button" id="reset" class="btn btn-primary filter-action">
- <span class="icon effacer" aria-hidden="true"></span> R.A.Z.
+ <span class="icon icon-gommer" aria-hidden="true"></span> R.A.Z.
</button>
</div>
</div>
@@ -81,6 +81,13 @@ use UnicaenApp\Form\Element\SearchAndSelect;
$('input[name="validateur[id]').val("<?php echo $params['etudiant']['id']; ?>");
<?php endif; ?>
-$('select#reponse option[value=<?php echo $params['reponse']; ?>]').prop('selected', true);
-$('select#type option[value=<?php echo $params['type']; ?>]').prop('selected', true);
+<?php if ($params['reponse'] !== null AND $params['reponse'] !== "") :?>
+ $('select#reponse option[value=<?php echo $params['reponse']; ?>]').prop('selected', true);
+<?php endif; ?>
+
+<?php if ($params['type'] !== null AND $params['type'] !== "") :?>
+ $('select#type option[value=<?php echo $params['type']; ?>]').prop('selected', true);
+<?php endif; ?>
+
+$('select.selectpicker').selectpicker();
</script>
\ No newline at end of file
diff --git a/view/unicaen-validation/validation-type/index.phtml b/view/unicaen-validation/validation-type/index.phtml
index 279d51a..856feae 100644
--- a/view/unicaen-validation/validation-type/index.phtml
+++ b/view/unicaen-validation/validation-type/index.phtml
@@ -27,8 +27,8 @@ $canAfficherInstance = $this->isAllowed(ValidationInstancePrivileges::getResourc
</div>
<div class="col-md-4">
<?php if ($canAfficherInstance) : ?>
- <a href="<?php echo $this->url('validation/instance', [], [], true); ?>" class="btn btn-primary action">
- <span class="icon acceder"></span>
+ <a href="<?php echo $this->url('validation/instance', [], [], true); ?>" class="btn btn-secondary action">
+ <span class="icon icon-listing"></span>
Instances de validation
</a>
<?php endif; ?>
--
GitLab