entité Presentation, MAJ filtre ViewController::SPECIAL_PAGES, table node_data non allégée pour l'instant

3 files changed, 7 insertions, 7 deletions

diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index da16758..bb99c13 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -99,7 +99,7 @@ class FooterBuilder extends AbstractBuilder
     private function makePageModifModeButton(): string
     {
         $link_edit_page = new URL(['page' => CURRENT_PAGE]);
-        if(!in_array(CURRENT_PAGE, ['article', 'new_page', 'menu_paths', 'maintenance'])) // ajouter 'user_edit' et 'connection' le jour où ces pages auront un footer
+        if(!in_array(CURRENT_PAGE, ViewController::SPECIAL_PAGES)) // cas impossibles: 'user_edit' et 'connection' qui n'ont pas de footer
         {
             if(MainBuilder::$modif_mode){
                 $link_edit_label = 'Sortir du mode modification';
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index b488703..b888a56 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -53,10 +53,10 @@ class MainBuilder extends AbstractBuilder
     }
 
     // mode modification de page uniquement
-    private function viewEditBlocks($node): void
+    private function viewEditBlocks(Node $node): void
     {
         $options = '';
-        foreach(Blocks::$blocks as $key => $value){
+        foreach(Presentation::$blocks as $key => $value){
             $options .= '<option value= "' . $key . '">' . $value . "</option>\n";
         }
         
@@ -69,7 +69,7 @@ class MainBuilder extends AbstractBuilder
             }
 
             // présentation par défaut
-            if(Blocks::hasPresentation($child_node->getName()) && $child_node->getNodeData()->getPresentation() === null){
+            if(Presentation::hasPresentation($child_node->getName()) && $child_node->getNodeData()->getPresentation() === null){
                 $child_node->getNodeData()->setPresentation('full_width'); // pas de persistence ici
             }
             
@@ -87,7 +87,7 @@ class MainBuilder extends AbstractBuilder
     private function makePresentationOptions(string $presentation): string
     {
         $options = '';
-        foreach(Blocks::$presentations as $key => $value){
+        foreach(Presentation::$presentations as $key => $value){
             $options .= '<option value="' . $key . '" ' . ($presentation === $key ? 'selected' : '') . '>' . $value . '</option>';
         }
         return $options;
diff --git a/src/view/templates/modify_block.php b/src/view/templates/modify_block.php
index d855a4a..1da3176 100644
--- a/src/view/templates/modify_block.php
+++ b/src/view/templates/modify_block.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1); ?>
 <div class="modify_one_block" id="bloc_edit_<?= $child_node->getId() ?>">
     <div class="block_options">
-        <label for="bloc_rename_<?= $child_node->getId() ?>">Type <b><?= Blocks::$blocks[$child_node->getName()] ?? '<i>erreur base de données</i>' ?></b>
+        <label for="bloc_rename_<?= $child_node->getId() ?>">Type <b><?= App\Entity\Presentation::$blocks[$child_node->getName()] ?? '<i>erreur base de données</i>' ?></b>
         </label>
         <p>
             <input type="text" id="bloc_rename_<?= $child_node->getId() ?>" name="bloc_rename_title" value="<?= $child_node->getNodeData()->getdata()['title'] ?>" required>
@@ -31,7 +31,7 @@ if($child_node->getName() === 'news_block'){
         </div>
 <?php
 }
-if(Blocks::hasPresentation($child_node->getName())){
+if(App\Entity\Presentation::hasPresentation($child_node->getName())){
 ?>
     <div class="grid_options">
         <div>