From 1e2cee519264f9ab2660540723915aec72bc2116 Mon Sep 17 00:00:00 2001
From: polo <ordipolo@gmx.fr>
Date: Mon, 20 Oct 2025 01:57:21 +0200
Subject: =?UTF-8?q?noeud=20"head"=20unique,=20noms=20fichiers=20CSS=20et?=
 =?UTF-8?q?=20JSS=20dans=20page,=20nombreux=20changements=20en=20cons?=
 =?UTF-8?q?=C3=A9quences?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/HeadBuilder.php            | 9 +++------
 src/view/HeaderBuilder.php          | 6 ------
 src/view/MainBuilder.php            | 2 +-
 src/view/NewBuilder.php             | 6 ------
 src/view/PostBuilder.php            | 6 ------
 src/view/templates/modify_block.php | 6 +++---
 6 files changed, 7 insertions(+), 28 deletions(-)

(limited to 'src/view')

diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index 4fe86ef..b1dfacb 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -14,19 +14,16 @@ class HeadBuilder extends AbstractBuilder
         if(file_exists($viewFile))
         {
             // css et js
-            if(!empty($node->getAttributes()))
-            {
-                extract($node->getAttributes());
-            }
+            $page = Model::$page_path->getLast();
 
             $css = '';
-	        foreach($css_array as $name)
+	        foreach($page->getCSS() as $name)
 			{
 				$css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";
 			}
 			
             $js = '';
-	        foreach($js_array as $name)
+	        foreach($page->getJS() as $name)
 			{
 				$js .= '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
 			}
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 1b60bc9..dc4aec4 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -41,12 +41,6 @@ class HeaderBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
-            // attributs, aucun pour l'instant
-            if(!empty($node->getAttributes()))
-            {
-                extract($node->getAttributes());
-            }
-
             // réseaux sociaux + logo dans l'entête
             $keys = array_keys($social);
             $social_networks = '';
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index a920eb4..332efa5 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -27,7 +27,7 @@ class MainBuilder extends AbstractBuilder
             if($node->getAdoptedChild() == null){
                 $date = new \DateTime;
                 $article = new Article('', $date);
-                $new = new Node('new', [], 0, null, null, $article);
+                $new = new Node('new', 0, null, null, $article);
             }
             // modification
             else{
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index ec48541..a31a1c4 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -33,12 +33,6 @@ class NewBuilder extends AbstractBuilder
             else{
                 $id = (string)$node->getId();
 
-                // id (timestamp)
-                if(!empty($node->getAttributes()))
-                {
-                    extract($node->getAttributes());
-                }
-
                 // html, date
                 $title = $node->getArticle()->getTitle();
                 $preview = $node->getArticle()->getPreview();
diff --git a/src/view/PostBuilder.php b/src/view/PostBuilder.php
index 70a2d77..de7a818 100644
--- a/src/view/PostBuilder.php
+++ b/src/view/PostBuilder.php
@@ -13,12 +13,6 @@ class PostBuilder extends AbstractBuilder
 
         if(file_exists($viewFile))
         {
-            // id (timestamp)
-            if(!empty($node->getAttributes()))
-            {
-                extract($node->getAttributes());
-            }
-
             // html
             $title = $node->getArticle()->getTitle();
             $html = $node->getArticle()->getContent();
diff --git a/src/view/templates/modify_block.php b/src/view/templates/modify_block.php
index 75cb218..6b7ceb0 100644
--- a/src/view/templates/modify_block.php
+++ b/src/view/templates/modify_block.php
@@ -44,9 +44,6 @@ if(Blocks::hasPresentation($child_node->getName())){
     		<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>
 	</div>
-<?php
-}
-?>
 	<div class="pagination_limit">
 		<label for="pagination_limit_<?= $child_node->getId() ?>">
 			Nombre max d'articles affichés
@@ -54,4 +51,7 @@ if(Blocks::hasPresentation($child_node->getName())){
 			<i>(mettre 0 désactive la pagination)</i>
 		</label>
 	</div>
+<?php
+}
+?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3