From 4efa19d4357ab204d62397f1849e4651906e0e70 Mon Sep 17 00:00:00 2001 From: polo Date: Sat, 10 May 2025 23:51:37 +0200 Subject: =?UTF-8?q?fichiers=20manquant=20du=20commit=20pr=C3=A9c=C3=A9dent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/BreadcrumbBuilder.php | 4 ++-- src/view/GridBuilder.php | 4 ++-- src/view/HeadBuilder.php | 8 ++++++- src/view/MainBuilder.php | 47 +++++++++++++++++++++--------------------- src/view/NavBuilder.php | 4 ++-- src/view/ViewBuilder.php | 2 ++ 6 files changed, 38 insertions(+), 31 deletions(-) (limited to 'src/view') diff --git a/src/view/BreadcrumbBuilder.php b/src/view/BreadcrumbBuilder.php index fcdcd41..c042fa9 100644 --- a/src/view/BreadcrumbBuilder.php +++ b/src/view/BreadcrumbBuilder.php @@ -41,8 +41,8 @@ class BreadcrumbBuilder extends AbstractBuilder $html .= ' →' . "\n"; } - // fin du chemin - $html .= '' . $breadcrumb_array[$nb_of_entries - 1]->getPageName() . "\n"; + // fin du chemin (=> Thésée) + $html .= '' . $breadcrumb_array[$nb_of_entries - 1]->getPageName() . "\n"; $html .= "\n"; } return $html; diff --git a/src/view/GridBuilder.php b/src/view/GridBuilder.php index 6845c49..30a9040 100644 --- a/src/view/GridBuilder.php +++ b/src/view/GridBuilder.php @@ -69,8 +69,8 @@ class GridBuilder extends AbstractBuilder $content = $this->html; ob_start(); - require $viewFile; - $this->html = ob_get_clean(); // pas de concaténation ici, on écrase + require $viewFile; // utilise $content + $this->html = ob_get_clean(); // nouveau contenu } } } \ No newline at end of file diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php index 2cca757..4b913b9 100644 --- a/src/view/HeadBuilder.php +++ b/src/view/HeadBuilder.php @@ -28,12 +28,18 @@ class HeadBuilder extends AbstractBuilder { $css .= '' . "\n"; } - $js = ''; + + $js = ''; foreach($js_array as $name) { $js .= '' . "\n"; } + if(MainBuilder::$modif_mode){ + $css .= '' . "\n"; + $js .= '' . "\n"; + } + // tinymce, nécéssite un script de copie dans composer.json if($_SESSION['admin']){ $css .= '' . "\n"; diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php index 5096134..11f5c4b 100644 --- a/src/view/MainBuilder.php +++ b/src/view/MainBuilder.php @@ -14,7 +14,7 @@ class MainBuilder extends AbstractBuilder { $this->html .= "
\n"; - // cas particulier de la page article où l'article est greffé sur main + // page article: cas particulier où l'article est greffé sur main if(Director::$page_path->getLast()->getEndOfPath() === 'article'){ // pas censé arriver if(!isset($_GET['id'])){ @@ -42,14 +42,18 @@ class MainBuilder extends AbstractBuilder $this->viewEditBlocks($node); } + // cas normal $this->useChildrenBuilder($node); } $this->html .= "
\n"; } + // mode modification de page uniquement private function viewEditBlocks($node): void { + $viewFile = self::VIEWS_PATH . $node->getName() . '.php'; // mode modification uniquement + // blocs disponibles $blocs = ['Blog', 'Grille', 'Calendrier', 'Galerie']; // générer ça dynamiquement! $blocs_true_names = ['blog', 'grid', 'calendar', 'galery']; @@ -68,41 +72,36 @@ class MainBuilder extends AbstractBuilder ' . "\n";*/ - // création d'un bloc - $this->html .= '
-
-

Ajouter un bloc de page

-
-

-

-

- - -

-
-
' . "\n"; - $this->html .= '
-

Modifier un bloc

'; + //$page_id = Director::$page_path->getLast()->getId(); + $head_node = null; + foreach(ViewBuilder::$root_node->getChildren() as $first_level_node){ + if($first_level_node->getName() === 'head'){ + $head_node = $first_level_node; // normallement c'est le 1er enfant + break; + } + } + + $bloc_edit = ''; foreach($node->getChildren() as $child_node){ // renommage d'un bloc - $this->html .= '
+ $bloc_edit .= '

'. "\n"; // déplacement d'un bloc - $this->html .= ' + $bloc_edit .= ' ' . "\n"; // suppression d'un bloc - $this->html .= '

+ $bloc_edit .= '

'. "\n"; } - $this->html .= "
-
\n"; + + ob_start(); + require $viewFile; + $this->html .= ob_get_clean(); } -} +} \ No newline at end of file diff --git a/src/view/NavBuilder.php b/src/view/NavBuilder.php index f4fb651..fd5f867 100644 --- a/src/view/NavBuilder.php +++ b/src/view/NavBuilder.php @@ -53,7 +53,7 @@ class NavBuilder extends AbstractBuilder { $li_class .= $data->getParent() == null ? 'drop-down' : 'drop-right'; - $nav_html .= '
  • ' . $link . '

    ' . $data->getPageName() . '

      ' . "\n"; + $nav_html .= '
    • ' . $link . '

      ' . $data->getPageName() . '

        ' . "\n"; $level++; $nav_html .= $this->navMainHTML($data, $current); $level--; @@ -61,7 +61,7 @@ class NavBuilder extends AbstractBuilder } else { - $nav_html .= '
      • ' . $link . '

        ' . $data->getPageName() . '

        • ' . "\n"; + $nav_html .= '
      • ' . $link . '

        ' . $data->getPageName() . '

        • ' . "\n"; } } diff --git a/src/view/ViewBuilder.php b/src/view/ViewBuilder.php index acac972..2e2fea6 100644 --- a/src/view/ViewBuilder.php +++ b/src/view/ViewBuilder.php @@ -9,8 +9,10 @@ use App\Entity\Node; class ViewBuilder extends AbstractBuilder { + static public Node $root_node; public function __construct(Node $root_node) { + self::$root_node = $root_node; $this->useChildrenBuilder($root_node); } } -- cgit v1.2.3