8 files changed, 48 insertions, 28 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index b8af290..5cebad6 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -16,15 +16,15 @@ class ArticleController
             {
                 $id = $json['id'];
                 $director = new Director($entityManager);
+                $content = $json['content'];
 
-                // cas d'une nouvelle "news"
-                if(is_array($json['content'])){
-                        foreach($json['content'] as $one_input){
+                // nettoyage
+                if(is_array($content)){ // cas d'une nouvelle "news"
+                        foreach($content as $one_input){
                                 $one_input = Security::secureHTML($one_input);
                         }
-                        $content = $json['content'];
                 }
-                else{
+                else{ // autres cas
                         $content = Security::secureHTML($json['content']);
                 }
 
@@ -39,21 +39,25 @@ class ArticleController
                         $director->makeSectionNode();
                         $node = $director->getNode(); // = <section>
 
-                        if(is_array($content)){
+                        if(is_array($content)){ // cas d'une nouvelle "news"
                         $date = new \DateTime($content['d']);
                         $article = new Article($content['i'], $date, $content['t'], $content['p']);
                         $article_node = new Node('new', 'i' . (string)$date->getTimestamp(), [], count($node->getChildren()) + 1, $node, $node->getPage(), $article);
-
-                                // id_node tout juste généré
-                                //$article_node->getId();
                         }
-                        else{
+                        else{ // autres cas
                                 $timestamp = time();
                                 $date = new \DateTime;
                                 $date->setTimestamp($timestamp);
 
                                 $article = new Article($content, $date); // le "current" timestamp est obtenu par la BDD
-                                $article_node = new Node('post', 'i' . (string)$timestamp, [], count($node->getChildren()) + 1, $node, $node->getPage(), $article);     
+                                
+                                $placement = $json['placement'] === 'first' ? 0 : count($node->getChildren()) + 1; // 
+                                $article_node = new Node('post', 'i' . (string)$timestamp, [], $placement, $node, $node->getPage(), $article);
+
+                                if($json['placement'] === 'first'){
+                                        $node->addChild($article_node);
+                                        $node->reindexPositions(); // régénère les positions (0 devient 1, 1 devient 2...)
+                                }
                         }
 
                         $entityManager->persist($article_node);
diff --git a/src/controller/PageManagementController.php b/src/controller/PageManagementController.php
index 4528810..75967eb 100644
--- a/src/controller/PageManagementController.php
+++ b/src/controller/PageManagementController.php
@@ -286,7 +286,12 @@ class PageManagementController
                                 $director->getNode()->getNodeData()->setPresentation($presentation);
 
                                 $entityManager->flush();
-                                echo json_encode(['success' => true, 'presentation' => $json['presentation'], 'cols_min_width' => $director->getNode()->getNodeData()->getColsMinWidth()]);
+
+                                $response_data = ['success' => true, 'presentation' => $json['presentation']];
+                                if($json['presentation'] === 'grid'){
+                                        $response_data['cols_min_width'] = $director->getNode()->getNodeData()->getColsMinWidth();
+                                }
+                                echo json_encode($response_data);
                         }
                         else{
                                 echo json_encode(['success' => false]);
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index fc80cd1..b07fa81 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -85,10 +85,10 @@ class MainBuilder extends AbstractBuilder
                         <button onclick="renamePageBloc(' . $child_node->getId() . ')">Renommer</button>
                     </p>'. "\n";
             // déplacement d'un bloc
-            $bloc_edit .= '<div style="display: flex; flex-wrap: wrap;">
+            $bloc_edit .= '<div>
                     <p>
-                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'up\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-up.svg">
-                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'down\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-down.svg">
+                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'up\')" src="assets/arrow-up.svg">
+                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'down\')" src="assets/arrow-down.svg">
                     </p>' . "\n";
             // suppression d'un bloc
             $bloc_edit .= '<form method="post" action="' . new URL(['page' => CURRENT_PAGE]) . '">
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index 2d66238..332d92b 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -69,27 +69,27 @@ class NewBuilder extends AbstractBuilder
             if($_SESSION['admin'])
             {
                 if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
-                    $title_js = 'onclick="openEditor(\'' . $id_title . '\', \'article\')"';
+                    $title_js = 'onclick="openEditor(\'' . $id_title . '\')"';
                     $modify_title = '<p id="edit-' . $id_title . '"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></p>' . "\n";
-                    $close_js_title = 'onclick="closeEditor(\'' . $id_title . '\', \'article\', \'preview\')"';
+                    $close_js_title = 'onclick="closeEditor(\'' . $id_title . '\')"';
                     $close_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><button ' . $close_js_title . '>Annuler</button></p>';
-                    $submit_js_title = 'onclick="submitArticle(\'' . $id_title . '\', \'article\')"';
+                    $submit_js_title = 'onclick="submitArticle(\'' . $id_title . '\')"';
                     $submit_title = '<p id="submit-' . $id_title . '" class="hidden"><button ' . $submit_js_title . '>Valider</button></p>';
                     $title_buttons = '<div class="button_zone">' . $modify_title . $close_editor_title . $submit_title . '</div>';
 
-                    $preview_js = 'onclick="openEditor(\'' . $id_preview . '\', \'article\')"';
+                    $preview_js = 'onclick="openEditor(\'' . $id_preview . '\')"';
                     $modify_preview = '<p id="edit-' . $id_preview . '"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";
-                    $close_js_preview = 'onclick="closeEditor(\'' . $id_preview . '\', \'article\', \'preview\')"';
+                    $close_js_preview = 'onclick="closeEditor(\'' . $id_preview . '\')"';
                     $close_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><button ' . $close_js_preview . '>Annuler</button></p>';
-                    $submit_js_preview = 'onclick="submitArticle(\'' . $id_preview . '\', \'article\')"';
+                    $submit_js_preview = 'onclick="submitArticle(\'' . $id_preview . '\')"';
                     $submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><button ' . $submit_js_preview . '>Valider</button></p>';
                     $preview_buttons = '<div class="button_zone">' . $modify_preview . $close_editor_preview . $submit_preview . '</div>';
 
-                    $article_js = 'onclick="openEditor(\'' . $id . '\', \'article\')"';
+                    $article_js = 'onclick="openEditor(\'' . $id . '\')"';
                     $modify_article = '<p id="edit-' . $id . '"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></p>' . "\n";
-                    $close_js_article = 'onclick="closeEditor(\'' . $id . '\', \'article\')"';
+                    $close_js_article = 'onclick="closeEditor(\'' . $id . '\')"';
                     $close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
-                    $submit_js_article = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';
+                    $submit_js_article = 'onclick="submitArticle(\'' . $id . '\')"';
                     $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js_article . '>Valider</button></p>';
                     $article_buttons = '<div class="button_zone">' . $modify_article . $close_editor_article . $submit_article . '</div>';
 
@@ -105,7 +105,7 @@ class NewBuilder extends AbstractBuilder
                     if(self::$new_article_mode){
                         $delete_article = '';
                         // valider la création d'un nouvel article
-                        $submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
+                        $submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\')"';
                         $submit_article = '<p id="save-' . $id . '"><button ' . $submit_js . '><img class="action_icon" src="assets/edit.svg"><span class="delete_button">Tout<br>enregistrer</span></button></p>' . "\n";
                     }
                     // mode article existant
diff --git a/src/view/NewsBlockBuilder.php b/src/view/NewsBlockBuilder.php
index 861949a..4716c63 100644
--- a/src/view/NewsBlockBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -53,7 +53,7 @@ class NewsBlockBuilder extends AbstractBuilder
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
                 $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
                 
-                $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
+                $submit_js = 'onclick="submitArticle(\'' . $id . '\', clone' . $this->id_node . ')"';
                 $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
                 $html = '';
diff --git a/src/view/PostBlockBuilder.php b/src/view/PostBlockBuilder.php
index 8ad0498..017e78e 100644
--- a/src/view/PostBlockBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -29,6 +29,7 @@ class PostBlockBuilder extends AbstractBuilder
             }
 
             // ajouter un article
+            // => fait un peu double emploi avec PostBuilder
             $new_article = '';
             if($_SESSION['admin'])
             {
@@ -52,12 +53,20 @@ class PostBlockBuilder extends AbstractBuilder
 
                 $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
                 $close_editor = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js . '>Annuler</button></p>';
+
+                $position = '<div id="radio-' . $id . '" class="hidden" style="margin: 5px; font-size: 90%;">
+                        Placement:<br>
+                        <input type="radio" id="radio_first-' . $id . '" name="article_placement-' . $id . '" value="first" onchange="setArticlePlacement(\'' . $id . '\')">
+                        <label for="radio_start">en premier</label><br>
+                        <input type="radio" id="radio_last-' . $id . '" name="article_placement-' . $id . '" value="last" onchange="setArticlePlacement(\'' . $id . '\')">
+                        <label for="radio_end">en dernier</label>
+                    </div>';
                 
-                $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
+                $submit_js = 'onclick="submitArticle(\'' . $id . '\', clone' . $this->id_node . ')"';
                 $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
                 $html = '';
-                $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
+                $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article . $position;
 
                 // squelette d'un nouvel article
                 ob_start();
diff --git a/src/view/PostBuilder.php b/src/view/PostBuilder.php
index 03a6990..ae5cc9b 100644
--- a/src/view/PostBuilder.php
+++ b/src/view/PostBuilder.php
@@ -30,6 +30,7 @@ class PostBuilder extends AbstractBuilder
             $share_button = '<p class="share" ' . $share_js . '><img class="action_icon" src="assets/share.svg"></p>' . "\n";
 
             // modifier un article
+            // => fait un peu double emploi avec PostBlockBuilder
             $admin_buttons = '';
             if($_SESSION['admin'])
             {
diff --git a/src/view/templates/head.php b/src/view/templates/head.php
index b74335e..83a0e7c 100644
--- a/src/view/templates/head.php
+++ b/src/view/templates/head.php
@@ -7,6 +7,7 @@
         <link rel="icon" type="image/png" href="<?= $favicon ?>" alt="<?= $alt ?>">
         <meta name="description" content="<?= $description ?>">
         <meta name="viewport" content="width=device-width">
+        <script>window.Config = {page: "<?= CURRENT_PAGE ?>"};</script>
         <?= $css ?>
         <?= $js ?>
     </head>
\ No newline at end of file