merging

composer.json

@@ -12,8 +12,9 @@
         "unicaen/privilege": "^5.0",
         "laminas/laminas-dependency-plugin": "^2.1"
     },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
     "autoload": {
-        "psr-0": [],
         "classmap": [
             "./Module.php"
         ]

config/module.config.php

 <?php
 
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use UnicaenPrivilege\Guard\PrivilegeController;
 use UnicaenRenderer\Controller\MacroController;

readme.md

@@ -40,6 +40,7 @@ alter table unicaen_renderer_template add namespace varchar(1024);
 
 Dépendance à **UnicaenPrivilege**
 ----------------------------------
+
 1. Dans **vendor/unicaen/renderer/config/merged/index.config.php**, **vendor/unicaen/renderer/config/merged/macro.config.php**, **vendor/unicaen/renderer/config/merged/rendu.config.php**, **vendor/unicaen/renderer/config/merged/template.config.php** : `UnicaenPrivilege\Guard\PrivilegeController` pour les gardes liées aux actions.
    Peut être directement remplacer par l'equivalent fournit par `unicaen/auth`.
    

view/unicaen-renderer/rendu/index.phtml

@@ -7,17 +7,17 @@ use UnicaenRenderer\Provider\Privilege\DocumenttemplatePrivileges;
 
 /**
  * @see \UnicaenRenderer\Controller\RenduController::indexAction()
- * @var string $title
  * @var Rendu[] $rendus
+ * @var string $title
  */
 
-$this->headTitle($title);
-
-$canMacro = $this->isAllowed(DocumentmacroPrivileges::getResourceId(DocumentmacroPrivileges::DOCUMENTMACRO_INDEX));
-$canTemplate = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_INDEX));
+$this->headTitle("Index des contenus");
 
 $canVoir = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(DocumentcontenuPrivileges::DOCUMENTCONTENU_AFFICHER));
 $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(DocumentcontenuPrivileges::DOCUMENTCONTENU_SUPPRIMER));
+
+$canMacro = $this->isAllowed(DocumentmacroPrivileges::getResourceId(DocumentmacroPrivileges::DOCUMENTMACRO_INDEX));
+$canTemplate = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_INDEX));
 ?>
 
 <div class="row">
@@ -55,7 +55,7 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume
     <tbody>
     <?php foreach ($rendus as $rendu) : ?>
         <tr>
-            <td> #<?php echo $rendu->getId(); ?> </td>
+            <td>  <?php echo $rendu->getId(); ?> </td>
             <td>
                 <?php if ($rendu->getTemplate()) : ?>
                     <?php echo $rendu->getTemplate()->getCode(); ?>
@@ -63,7 +63,7 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume
             </td>
             <td> <?php echo $rendu->getDate()->format('d/m/Y à H:i:s'); ?> </td>
             <td>
-        <span title="<?php echo $rendu->getSujet(); ?>" data-bs-toggle="tooltip" data-bs-html="true">
+                <span title="<?php echo $rendu->getSujet(); ?>" data-toggle="tooltip" data-html="true">
                 <?php
                 $sujet = $rendu->getSujet();
                 if (strlen($sujet) > 50) $sujet = substr($rendu->getSujet(), 0, 46) . " ...";

view/unicaen-renderer/template/index.phtml

@@ -125,7 +125,7 @@ $this->headTitle($title);
                     <i>Aucun namespace</i>
                 <?php endif; ?>
             </td>
-            <td class="text-end">
+            <td>
                 <?php if ($canAfficher) : ?>
                     <?php /** @see \UnicaenRenderer\Controller\TemplateController::afficherAction() */ ?>
                     <a href="<?php echo $this->url('contenu/template/afficher', ['template' => $template->getId()], [], true); ?>"