From 2c450002df6f04bf52adb5e660d0b671737cabbc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Tue, 12 Jul 2022 09:58:55 +0200
Subject: [PATCH] =?UTF-8?q?Usage=20des=20icones=20de=20app=20en=20plus=20d?=
 =?UTF-8?q?es=20icones=20=C3=A0=20la=20JP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/unicaen-renderer/macro/index.phtml          | 8 ++++++--
 view/unicaen-renderer/macro/partial/filtre.phtml | 1 -
 view/unicaen-renderer/rendu/index.phtml          | 4 ++--
 view/unicaen-renderer/template/index.phtml       | 9 ++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/view/unicaen-renderer/macro/index.phtml b/view/unicaen-renderer/macro/index.phtml
index 5de6204..fad9339 100755
--- a/view/unicaen-renderer/macro/index.phtml
+++ b/view/unicaen-renderer/macro/index.phtml
@@ -47,6 +47,7 @@ $this->headTitle($title);
                 <a href="<?php echo $this->url('contenu/macro/ajouter', [], [], true); ?>"
                    class="btn btn-primary action ajax-modal" data-event="modification">
                     <span class="icon ajouter"></span>
+                    <span class="icon icon-ajouter"></span>
                     Ajouter une macro
                 </a>
             <?php endif; ?>
@@ -54,6 +55,7 @@ $this->headTitle($title);
             <a href="<?php echo $this->url('contenu/macro/generer-json', [], [], true); ?>"
                class="btn btn-primary action ajax-modal">
                 <span class="icon code"></span>
+                <span class="icon icon-code"></span>
                 Générer le JSON des macros
             </a>
     </div>
@@ -84,6 +86,8 @@ $this->headTitle($title);
                         <?php if ($macro->getDescription() !== null) : ?>
                             <span class="icon information" data-toggle="tooltip" data-html="true"
                                   title="<?php echo $macro->getDescription(); ?>"></span>
+                            <span class="icon icon-information" data-toggle="tooltip" data-html="true"
+                                  title="<?php echo $macro->getDescription(); ?>"></span>
                         <?php endif; ?>
                     </td>
                     <td>
@@ -98,14 +102,14 @@ $this->headTitle($title);
                                class="ajax-modal" data-event="modification" data-toggle="tooltip" data-html="true"
                                title="Modification de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>"
                             >
-                                <span class="icon editer"></span></a>
+                                <span class="icon editer"></span><span class="icon icon-editer"></span></a>
                         <?php endif; ?>
                         <?php if ($canSupprimer) : ?>
                             <a href="<?php echo $this->url('contenu/macro/supprimer', ['macro' => $macro->getId()], [], true); ?>"
                                class="ajax-modal" data-event="modification" data-toggle="tooltip" data-html="true"
                                title="Suppression de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>"
                             >
-                                <span class="icon detruire text-danger"></span></a>
+                                <span class="icon detruire text-danger"></span><span class="icon icon-supprimer text-danger"></span></a>
                         <?php endif; ?>
                     </td>
                 </tr>
diff --git a/view/unicaen-renderer/macro/partial/filtre.phtml b/view/unicaen-renderer/macro/partial/filtre.phtml
index e80a35d..1a3f31f 100755
--- a/view/unicaen-renderer/macro/partial/filtre.phtml
+++ b/view/unicaen-renderer/macro/partial/filtre.phtml
@@ -40,7 +40,6 @@
                             Filtrer
                         </button>
                         <button class="btn btn-primary" id="clear">
-                            <span class="icon effacer"></span>
                             Effacer
                         </button>
                     </div>
diff --git a/view/unicaen-renderer/rendu/index.phtml b/view/unicaen-renderer/rendu/index.phtml
index 8c28f55..3307fd5 100644
--- a/view/unicaen-renderer/rendu/index.phtml
+++ b/view/unicaen-renderer/rendu/index.phtml
@@ -83,7 +83,7 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume
                                title="Afficher le rendu" data-toggle="tooltip" data-html="true"
                                class="ajax-modal"
                             >
-                                <span class="icon voir"></span></a>
+                                <span class="icon voir"></span><span class="icon icon-voir"></span></a>
                         <?php endif; ?>
                         <?php if ($canSupprimer) : ?>
                             <?php /** @see \UnicaenRenderer\Controller\RenduController::supprimerAction() */ ?>
@@ -91,7 +91,7 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume
                                title="Supprimer le rendu" data-toggle="tooltip" data-html="true"
                                class="ajax-modal" data-event="modification"
                             >
-                                <span class="icon detruire text-danger"></span></a>
+                                <span class="icon detruire text-danger"></span><span class="icon icon-supprimer text-danger"></span></a>
                         <?php endif; ?>
                     </td>
                 </tr>
diff --git a/view/unicaen-renderer/template/index.phtml b/view/unicaen-renderer/template/index.phtml
index 48324b6..4aa68cc 100755
--- a/view/unicaen-renderer/template/index.phtml
+++ b/view/unicaen-renderer/template/index.phtml
@@ -45,6 +45,7 @@ $this->headTitle($title);
             <a href="<?php echo $this->url('contenu/template/ajouter', [], [], true); ?>"
                class="btn btn-primary action ajax-modal" data-event="modification">
                 <span class="icon ajouter"></span>
+                <span class="icon icon-ajouter"></span>
                 Ajouter un template
             </a>
         <?php endif; ?>
@@ -73,6 +74,8 @@ $this->headTitle($title);
                         <?php if ($template->getDescription() !== null) : ?>
                             <span class="icon information" title="<?php echo $template->getDescription(); ?>"
                                   data-toggle="tooltip" data-html="true"></span>
+                            <span class="icon icon-information" title="<?php echo $template->getDescription(); ?>"
+                                  data-toggle="tooltip" data-html="true"></span>
                         <?php endif; ?>
                     </td>
                     <td>
@@ -83,21 +86,21 @@ $this->headTitle($title);
                             <?php /** @see \UnicaenRenderer\Controller\TemplateController::afficherAction() */ ?>
                             <a href="<?php echo $this->url('contenu/template/afficher', ['template' => $template->getId()], [], true); ?>"
                                class="ajax-modal">
-                                <span class="icon voir"></span></a>
+                                <span class="icon voir"></span><span class="icon icon-voir"></span></a>
                         <?php endif; ?>
                         <?php if ($canModifier) : ?>
                             <?php /** @see \UnicaenRenderer\Controller\TemplateController::modifierAction() */ ?>
                             <a href="<?php echo $this->url('contenu/template/modifier', ['template' => $template->getId()], [], true); ?>"
                                class="ajax-modal" data-event="modification"
                             >
-                                <span class="icon editer"></span></a>
+                                <span class="icon editer"></span><span class="icon icon-editer"></span></a>
                         <?php endif; ?>
                         <?php if ($canDetruire) : ?>
                             <?php /** @see \UnicaenRenderer\Controller\TemplateController::detruireAction() */ ?>
                             <a href="<?php echo $this->url('contenu/template/detruire', ['template' => $template->getId()], [], true); ?>"
                                class="ajax-modal" data-event="modification"
                             >
-                                <span class="icon detruire text-danger"></span></a>
+                                <span class="icon detruire text-danger"></span><span class="icon icon-supprimer text-danger"></span></a>
                         <?php endif; ?>
                     </td>
                 </tr>
-- 
GitLab