9 files changed, 120 insertions, 51 deletions

diff --git a/src/view/AbstractBuilder.php b/src/view/AbstractBuilder.php
index cd2b361..285ebc3 100644
--- a/src/view/AbstractBuilder.php
+++ b/src/view/AbstractBuilder.php
@@ -7,6 +7,12 @@ abstract class AbstractBuilder
 {
         protected const VIEWS_PATH = '../src/view/templates/';
         protected string $html = '';
+    protected int $id_node;
+
+    protected function __construct(Node $node)
+    {
+        $this->id_node = $node->getId();
+    }
 
     protected function useChildrenBuilder(Node $node): void
     {
diff --git a/src/view/ArticleBuilder.php b/src/view/ArticleBuilder.php
index f86f9bd..1f5dbb8 100644
--- a/src/view/ArticleBuilder.php
+++ b/src/view/ArticleBuilder.php
@@ -25,29 +25,29 @@ class ArticleBuilder extends AbstractBuilder
             // partage
             $share_link = new URL(['page' => CURRENT_PAGE], $id);
             $share_js = 'onclick="copyInClipBoard(\'' . $share_link . '\')"';
-            $share_button = '<a class="share" href="' . $share_link . '" ' . $share_js . '><img class="action_icon" src="assets/share.svg"></a>' . "\n";
+            $share_button = '<p class="share" ' . $share_js . '><img class="action_icon" src="assets/share.svg"></p>' . "\n";
 
             // modifier un article
             $admin_buttons = '';
             if($_SESSION['admin'])
             {
                 $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
-                $modify_article = '<p id="edit-' . $id . '"><a href="#"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></a></p>' . "\n";
+                $modify_article = '<p id="edit-' . $id . '"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
 
                 $up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
-                $up_button = '<p id="position_up-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></a></p>' . "\n";
+                $up_button = '<p id="position_up-' . $id . '"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
                 
                 $down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
-                $down_button = '<p id="position_down-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></a></p>' . "\n";
+                $down_button = '<p id="position_down-' . $id . '"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
                 
                 $delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
-                $delete_article = '<p id="delete-' . $id . '"><a href="#"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></a></p>' . "\n";
+                $delete_article = '<p id="delete-' . $id . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
                 
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
-                $close_editor = '<p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js . '>Annuler</button></a></p>';
+                $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
                 
                 $submit_js = 'onclick="submitArticle(\'' . $id . '\')"';
-                $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js . '>Valider</button></a></p>';
+                $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
                 $admin_buttons = $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
             }
diff --git a/src/view/BlogBuilder.php b/src/view/BlogBuilder.php
index 8c2125f..ca020b2 100644
--- a/src/view/BlogBuilder.php
+++ b/src/view/BlogBuilder.php
@@ -7,6 +7,7 @@ class BlogBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
+        parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
         
         if(file_exists($viewFile))
@@ -18,26 +19,44 @@ class BlogBuilder extends AbstractBuilder
 
             // ajouter un article
             $new_article = '';
-            $new_article_admin_buttons  = '';
             if($_SESSION['admin'])
             {
-                $id = 'new';
-
-                //$link = new URL(['page' => CURRENT_PAGE, 'action' => 'open_editor']);
+                $id = 'n' . $this->id_node;
                 $js = 'onclick="openEditor(\'' . $id . '\')"';
-                //$new_article = '<article><a href="' . $link . '"><button>Nouvel article</button></a></article>';
-                $new_article = '<article><p id="new"></p>' . "\n" . 
-                    '<p id="new-' . $id . '"><a href="#"><button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
+
+                $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
+                $html = '';
+
+                $new_button = '<p id="new-' . $id . '">' . "\n" . 
+                '<button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
+
+                $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
+                $modify_article = '<p id="edit-' . $id . '" class="hidden"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
+
+                $up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
+                $up_button = '<p id="position_up-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
+                
+                $down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
+                $down_button = '<p id="position_down-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
+                
+                $delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
+                $delete_article = '<p id="delete-' . $id . '" class="hidden"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
 
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
-                $close_editor = '<div class="article_admin_zone"><p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js . '>Annuler</button></a></p>';
+                $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
                 
-                $submit_js = 'onclick="submitArticle(\'' . $id . '\')"';
-                $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js . '>Valider</button></a></p></div></article>';
+                $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
+                $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
-                $new_article_admin_buttons = $close_editor . $submit_article;
+                $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
+
+                // squelette d'un nouvel article
+                ob_start();
+                require self::VIEWS_PATH . 'article.php';
+                $new_article = ob_get_clean();
             }
 
+            // articles existants
             $this->useChildrenBuilder($node);
             $content = $this->html;
 
diff --git a/src/view/GaleryBuilder.php b/src/view/GaleryBuilder.php
index 89be2b1..a895d70 100644
--- a/src/view/GaleryBuilder.php
+++ b/src/view/GaleryBuilder.php
@@ -7,6 +7,7 @@ class GaleryBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
+        parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
         
         if(file_exists($viewFile))
@@ -18,26 +19,44 @@ class GaleryBuilder extends AbstractBuilder
 
             // ajouter un article
             $new_article = '';
-            $new_article_admin_buttons  = '';
             if($_SESSION['admin'])
             {
-                $id = 'new';
-
-                //$link = new URL(['page' => CURRENT_PAGE, 'action' => 'open_editor']);
+                $id = 'n' . $this->id_node;
                 $js = 'onclick="openEditor(\'' . $id . '\')"';
-                //$new_article = '<article><a href="' . $link . '"><button>Nouvel article</button></a></article>';
-                $new_article = '<article><p id="new"></p>' . "\n" . 
-                    '<p id="new-' . $id . '"><a href="#"><button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
+
+                $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
+                $html = '';
+
+                $new_button = '<p id="new-' . $id . '">' . "\n" . 
+                '<button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
+
+                $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
+                $modify_article = '<p id="edit-' . $id . '" class="hidden"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
+
+                $up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
+                $up_button = '<p id="position_up-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
+                
+                $down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
+                $down_button = '<p id="position_down-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
+                
+                $delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
+                $delete_article = '<p id="delete-' . $id . '" class="hidden"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
 
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
-                $close_editor = '<div class="article_admin_zone"><p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js . '>Annuler</button></a></p>';
+                $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
                 
-                $submit_js = 'onclick="submitArticle(\'' . $id . '\')"';
-                $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js . '>Valider</button></a></p></div></article>';
+                $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
+                $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
-                $new_article_admin_buttons = $close_editor . $submit_article;
+                $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
+
+                // squelette d'un nouvel article
+                ob_start();
+                require self::VIEWS_PATH . 'article.php';
+                $new_article = ob_get_clean();
             }
 
+            // articles existants
             $this->useChildrenBuilder($node);
             $content = $this->html;
 
diff --git a/src/view/GridBuilder.php b/src/view/GridBuilder.php
index 6e16d46..e183e6f 100644
--- a/src/view/GridBuilder.php
+++ b/src/view/GridBuilder.php
@@ -7,6 +7,7 @@ class GridBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
+        parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
         
         if(file_exists($viewFile))
@@ -18,32 +19,50 @@ class GridBuilder extends AbstractBuilder
 
             // ajouter un article
             $new_article = '';
-            $new_article_admin_buttons  = '';
             if($_SESSION['admin'])
             {
-                $id = 'new';
+                $id = 'n' . $this->id_node;
                 $js = 'onclick="openEditor(\'' . $id . '\')"';
 
-                if(Director::$page_path->getLast()->getEndOfPath() === 'accueil')
-                {
-                    $new_article = '<article><p id="new"></p>' . "\n" . 
-                    '<p><a href="' . new URL(['page' => 'article']) . '"><button><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
+                $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
+                $html = '';
+
+                if(CURRENT_PAGE === 'accueil'){
+                    $new_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'article', 'id' => $id]) . '">
+                        <button><img class="action_icon" src="assets/book-open.svg">Nouvel article</button></a></p>';
                 }
-                else
-                {
-                    $new_article = '<article><p id="new"></p>' . "\n" . 
-                    '<p id="new-' . $id . '"><a href="#"><button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
+                else{
+                    $new_button = '<p id="new-' . $id . '">' . "\n" . 
+                        '<button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
                 }
+
+                $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
+                $modify_article = '<p id="edit-' . $id . '" class="hidden"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
+
+                $up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
+                $up_button = '<p id="position_up-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
                 
+                $down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
+                $down_button = '<p id="position_down-' . $id . '" class="hidden"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
+                
+                $delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
+                $delete_article = '<p id="delete-' . $id . '" class="hidden"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
+
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
-                $close_editor = '<div class="article_admin_zone"><p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js . '>Annuler</button></a></p>';
+                $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
                 
-                $submit_js = 'onclick="submitArticle(\'' . $id . '\')"';
-                $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js . '>Valider</button></a></p></div></article>';
+                $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
+                $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
-                $new_article_admin_buttons = $close_editor . $submit_article;
+                $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
+
+                // squelette d'un nouvel article
+                ob_start();
+                require self::VIEWS_PATH . 'article.php';
+                $new_article = ob_get_clean();
             }
 
+            // articles existants
             $this->useChildrenBuilder($node);
             $content = $this->html;
 
diff --git a/src/view/templates/article.php b/src/view/templates/article.php
index f3ab32f..c57c1cb 100644
--- a/src/view/templates/article.php
+++ b/src/view/templates/article.php
@@ -10,5 +10,4 @@
             <?= $admin_buttons ?>
         </div>
     </div>
-    
 </article>
\ No newline at end of file
diff --git a/src/view/templates/blog.php b/src/view/templates/blog.php
index 35cac8b..e2066c8 100644
--- a/src/view/templates/blog.php
+++ b/src/view/templates/blog.php
@@ -1,6 +1,10 @@
-<section class="blog">
+<section class="blog" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
-<?= $new_article_admin_buttons ?>
+        <script>
+                var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
+        </script>
+        <div>
 <?= $content ?>
+        </div>
 </section>
\ No newline at end of file
diff --git a/src/view/templates/galery.php b/src/view/templates/galery.php
index 306526f..246c4dd 100644
--- a/src/view/templates/galery.php
+++ b/src/view/templates/galery.php
@@ -1,9 +1,10 @@
-<section class="galery">
+<section class="galery" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
-<?= $new_article_admin_buttons ?>
+        <script>
+                var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
+        </script>
         <div class="galery_photos">
-                <a><p></p></a>
 <?= $content ?>
         </div>
         <script>enableGaleryScroller();</script>
diff --git a/src/view/templates/grid.php b/src/view/templates/grid.php
index a09ed40..f9e441d 100644
--- a/src/view/templates/grid.php
+++ b/src/view/templates/grid.php
@@ -1,7 +1,9 @@
-<section class="grid">
+<section class="grid" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
-<?= $new_article_admin_buttons ?>
+        <script>
+                var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
+        </script>
         <div class="grid_columns">
 <?= $content ?>
         </div>