suppression table Presentation

4 files changed, 8 insertions, 11 deletions

diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index 8a40d82..2510b08 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -55,14 +55,11 @@ class MainBuilder extends AbstractBuilder
     // mode modification de page uniquement
     private function viewEditBlocks($node): void
     {
-        $blocks = Blocks::getTypeNamePairs();
-
         $options = '';
-        for($i = 0; $i < count($blocks); $i++){
-            $options .= '<option value= "' . $blocks[$i]['type'] . '">' . $blocks[$i]['name'] . "</option>\n";
+        foreach(Blocks::$blocks as $key => $value){
+            $options .= '<option value= "' . $key . '">' . $value . "</option>\n";
         }
 
-        //$page_id = Director::$page_path->getLast()->getId();
         $head_node = null;
         foreach(ViewController::$root_node->getChildren() as $first_level_node){
             if($first_level_node->getName() === 'head'){
@@ -88,7 +85,7 @@ class MainBuilder extends AbstractBuilder
     private function makePresentationOptions(string $presentation): string
     {
         $options = '';
-        foreach(Presentation::$option_list as $key => $value){
+        foreach(Blocks::$presentations as $key => $value){
             $options .= '<option value="' . $key . '" ' . ($presentation === $key ? 'selected' : '') . '>' . $value . '</option>';
         }
         return $options;
diff --git a/src/view/NewsBlockBuilder.php b/src/view/NewsBlockBuilder.php
index e7bbec9..963afe6 100644
--- a/src/view/NewsBlockBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -22,7 +22,7 @@ class NewsBlockBuilder extends AbstractBuilder
             }
 
             // stratégie d'affichage du contenu (utilisation de méthodes ou de classe List, GridPresentation, etc)
-            $section_class = $node->getNodeData()->getPresentation()->getName(); // = list, grid , mosaic ou carousel
+            $section_class = $node->getNodeData()->getPresentation(); // = list, grid , mosaic ou carousel
             $cols_min_width = '';
             if($section_class === 'grid'){
                 $min_width = $node->getNodeData()->getColsMinWidth();
diff --git a/src/view/PostBlockBuilder.php b/src/view/PostBlockBuilder.php
index dca4fbd..ba54901 100644
--- a/src/view/PostBlockBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -22,7 +22,7 @@ class PostBlockBuilder extends AbstractBuilder
             }
 
             // stratégie d'affichage du contenu (utilisation de méthodes ou de classe List, GridPresentation, etc)
-            $section_class = $node->getNodeData()->getPresentation()->getName(); // = list, grid , mosaic ou carousel
+            $section_class = $node->getNodeData()->getPresentation(); // = list, grid , mosaic ou carousel
             $cols_min_width = '';
             if($section_class === 'grid'){
                 $min_width = $node->getNodeData()->getColsMinWidth();
diff --git a/src/view/templates/modify_block.php b/src/view/templates/modify_block.php
index 2514085..22a2932 100644
--- a/src/view/templates/modify_block.php
+++ b/src/view/templates/modify_block.php
@@ -1,6 +1,6 @@
 <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::getNameFromType($child_node->getName()) ?></b>
+        <label for="bloc_rename_<?= $child_node->getId() ?>">Type <b><?= Blocks::$blocks[$child_node->getName()] ?></b>
         </label>
         <p>
             <input type="text" id="bloc_rename_<?= $child_node->getId() ?>" name="bloc_rename_title" value="<?= $child_node->getNodeData()->getdata()['title'] ?>" required>
@@ -24,9 +24,9 @@ if($child_node->getNodeData()->getPresentation() !== null){
     <div class="grid_options"><p>
         <label for="presentation_select_<?= $child_node->getId() ?>">Présentation</label>
         <select id="presentation_select_<?= $child_node->getId() ?>" onchange="changePresentation(<?= $child_node->getId() ?>)">
-                        <?= $this->makePresentationOptions($child_node->getNodeData()->getPresentation()->getName()) ?>
+                        <?= $this->makePresentationOptions($child_node->getNodeData()->getPresentation()) ?>
         </select>
-        <div id="cols_min_width_edit_<?= $child_node->getId() ?>" class="<?= ($child_node->getNodeData()->getPresentation()->getName() === 'grid' ? '' : 'hidden') ?>">
+        <div id="cols_min_width_edit_<?= $child_node->getId() ?>" class="<?= ($child_node->getNodeData()->getPresentation() === 'grid' ? '' : 'hidden') ?>">
                 <label for="cols_min_width_select_<?= $child_node->getId() ?>">Largeur minimum </label>
                 <input type="number" id="cols_min_width_select_<?= $child_node->getId() ?>" onchange="changeColsMinWidth(<?= $child_node->getId() ?>)" min="150" max="400" value="<?= $child_node->getNodeData()->getColsMinWidth() ?>"> pixels
                 </div>