1 files changed, 39 insertions, 24 deletions
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index acde8b4..a862a08 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -5,7 +5,7 @@ use App\Entity\Node;
 class NewBuilder extends AbstractBuilder
 {
-    public function __construct(Node $node)
+    public function __construct(Node $node, )
    {
        $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
@@ -50,10 +50,15 @@ class NewBuilder extends AbstractBuilder
            //$date = str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));
            // partage
-            $share_link = new URL(['page' => CURRENT_PAGE], $id);
+            $share_link = new URL(['page' => 'article', 'id' => $id]);
-            isset($_GET['id']) ? $share_link->addParams(['id' => $_GET['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";
+            if(isset($_GET['id']) && $_GET['id'][0] === 'n'){
+                $class = 'class="share hidden"';
+            }
+            else{
+                $class = 'class="share"';
+            }
+            $share_button = '<p ' . $class . ' ' . $share_js . '><img class="action_icon" src="assets/share.svg"></p>' . "\n";
            // modifier un article
            $title_buttons = '';
@@ -65,53 +70,64 @@ class NewBuilder extends AbstractBuilder
            {
                if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
                    $title_js = 'onclick="openEditor(\'' . $id_title . '\', \'article\')"';
-                    $modify_title = '<p id="edit-' . $id_title . '"><a href="#"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></a></p>' . "\n";
+                    $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_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><a href="#"><button ' . $close_js_title . '>Annuler</button></a></p>';
+                    $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_title = '<p id="submit-' . $id_title . '" class="hidden"><a href="#"><button ' . $submit_js_title . '>Valider</button></a></p>';
+                    $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\')"';
-                    $modify_preview = '<p id="edit-' . $id_preview . '"><a href="#"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";
+                    $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_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><a href="#"><button ' . $close_js_preview . '>Annuler</button></a></p>';
+                    $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_preview = '<p id="submit-' . $id_preview . '" class="hidden"><a href="#"><button ' . $submit_js_preview . '>Valider</button></a></p>';
+                    $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\')"';
-                    $modify_article = '<p id="edit-' . $id . '"><a href="#"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></a></p>' . "\n";
+                    $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_editor_article = '<p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js_article . '>Annuler</button></a></p>';
+                    $close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
                    $submit_js_article = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';
-                    $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js_article . '>Valider</button></a></p>';
+                    $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>';
                    $date_js = 'onclick="changeDate(\'' . $id_date . '\', \'article\');';
-                    $modify_date = '<p id="edit-' . $id_date . '"><a href="#"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></a></p>' . "\n";
+                    $modify_date = '<p id="edit-' . $id_date . '"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></p>' . "\n";
                    $close_js_date = 'onclick="closeInput(\'' . $id_date . '\')"';
-                    $close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><a href="#"><button ' . $close_js_date . '>Annuler</button></a></p>';
+                    $close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><button ' . $close_js_date . '>Annuler</button></p>';
                    $submit_js_date = 'onclick="submitDate(\'' . $id_date . '\')"';
-                    $submit_date = '<p id="submit-' . $id_date . '" class="hidden"><a href="#"><button ' . $submit_js_date . '>Valider</button></a></p>';
+                    $submit_date = '<p id="submit-' . $id_date . '" class="hidden"><button ' . $submit_js_date . '>Valider</button></p>';
                    $date_buttons = '<div class="button_zone">' . $modify_date . $close_editor_date . $submit_date . '</div>';
-                    $delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . CURRENT_PAGE . '\')"';
+                    $delete_article = '';
-                    $delete_article = '<p id="delete-' . $id . '"><a href="#"><button ' . $delete_js . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></a></p>' . "\n";
+                    $submit_article = '';
+                    // modification: bouton "supprimer"
-                    $admin_buttons = $delete_article;
+                    if($_GET['id'][0] === 'i'){
+                        $delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
+                        $delete_article = '<p id="delete-' . $id . '"><button ' . $delete_js . '><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></p>' . "\n";
+                    }
+                    // nouvel article: bouton pour valider la création d'un nouvel article
+                    else{
+                        $submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
+                        $submit_article = '<p id="submit-' . $id . '"><button ' . $submit_js . '><img class="action_icon" src="assets/edit.svg">Tout<br>enregistrer</button></p>' . "\n";
+                    }
+                    
+                    $admin_buttons = $delete_article . $submit_article;
                }
+                // page d'accueil
                else{
                    $modify_article = '<p id="edit-' . $id . '"></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_editor = '<p id="cancel-' . $id . '" class="hidden"></p>';
                    $submit_article = '<p id="submit-' . $id . '" class="hidden"></p>';
@@ -120,7 +136,6 @@ class NewBuilder extends AbstractBuilder
                    $admin_buttons = $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
                }
-                
            }
            ob_start();

diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php index acde8b4..a862a08 100644 --- a/src/view/NewBuilder.php +++ b/src/view/NewBuilder.php
@@ -5,7 +5,7 @@ use App\Entity\Node;
5		5
6	class NewBuilder extends AbstractBuilder	6	class NewBuilder extends AbstractBuilder
7	{	7	{
8	public function __construct(Node $node)	8	public function __construct(Node $node, )
9	{	9	{
10	$viewFile = self::VIEWS_PATH . $node->getName() . '.php';	10	$viewFile = self::VIEWS_PATH . $node->getName() . '.php';
11		11
@@ -50,10 +50,15 @@ class NewBuilder extends AbstractBuilder
50	//$date = str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));	50	//$date = str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));
51		51
52	// partage	52	// partage
53	$share_link = new URL(['page' => CURRENT_PAGE], $id);	53	$share_link = new URL(['page' => 'article', 'id' => $id]);
54	isset($_GET['id']) ? $share_link->addParams(['id' => $_GET['id']]) : '';
55	$share_js = 'onclick="copyInClipBoard(\'' . $share_link . '\')"';	54	$share_js = 'onclick="copyInClipBoard(\'' . $share_link . '\')"';
56	$share_button = '<a class="share" href="' . $share_link . '" ' . $share_js . '><img class="action_icon" src="assets/share.svg"></a>' . "\n";	55	if(isset($_GET['id']) && $_GET['id'][0] === 'n'){
		56	$class = 'class="share hidden"';
		57	}
		58	else{
		59	$class = 'class="share"';
		60	}
		61	$share_button = '<p ' . $class . ' ' . $share_js . '><img class="action_icon" src="assets/share.svg"></p>' . "\n";
57		62
58	// modifier un article	63	// modifier un article
59	$title_buttons = '';	64	$title_buttons = '';
@@ -65,53 +70,64 @@ class NewBuilder extends AbstractBuilder
65	{	70	{
66	if(Director::$page_path->getLast()->getEndOfPath() === 'article'){	71	if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
67	$title_js = 'onclick="openEditor(\'' . $id_title . '\', \'article\')"';	72	$title_js = 'onclick="openEditor(\'' . $id_title . '\', \'article\')"';
68	$modify_title = '<p id="edit-' . $id_title . '"><a href="#"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></a></p>' . "\n";	73	$modify_title = '<p id="edit-' . $id_title . '"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></p>' . "\n";
69	$close_js_title = 'onclick="closeEditor(\'' . $id_title . '\', \'article\', \'preview\')"';	74	$close_js_title = 'onclick="closeEditor(\'' . $id_title . '\', \'article\', \'preview\')"';
70	$close_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><a href="#"><button ' . $close_js_title . '>Annuler</button></a></p>';	75	$close_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><button ' . $close_js_title . '>Annuler</button></p>';
71	$submit_js_title = 'onclick="submitArticle(\'' . $id_title . '\', \'article\')"';	76	$submit_js_title = 'onclick="submitArticle(\'' . $id_title . '\', \'article\')"';
72	$submit_title = '<p id="submit-' . $id_title . '" class="hidden"><a href="#"><button ' . $submit_js_title . '>Valider</button></a></p>';	77	$submit_title = '<p id="submit-' . $id_title . '" class="hidden"><button ' . $submit_js_title . '>Valider</button></p>';
73	$title_buttons = '<div class="button_zone">' . $modify_title . $close_editor_title . $submit_title . '</div>';	78	$title_buttons = '<div class="button_zone">' . $modify_title . $close_editor_title . $submit_title . '</div>';
74		79
75	$preview_js = 'onclick="openEditor(\'' . $id_preview . '\', \'article\')"';	80	$preview_js = 'onclick="openEditor(\'' . $id_preview . '\', \'article\')"';
76	$modify_preview = '<p id="edit-' . $id_preview . '"><a href="#"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";	81	$modify_preview = '<p id="edit-' . $id_preview . '"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";
77	$close_js_preview = 'onclick="closeEditor(\'' . $id_preview . '\', \'article\', \'preview\')"';	82	$close_js_preview = 'onclick="closeEditor(\'' . $id_preview . '\', \'article\', \'preview\')"';
78	$close_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><a href="#"><button ' . $close_js_preview . '>Annuler</button></a></p>';	83	$close_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><button ' . $close_js_preview . '>Annuler</button></p>';
79	$submit_js_preview = 'onclick="submitArticle(\'' . $id_preview . '\', \'article\')"';	84	$submit_js_preview = 'onclick="submitArticle(\'' . $id_preview . '\', \'article\')"';
80	$submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><a href="#"><button ' . $submit_js_preview . '>Valider</button></a></p>';	85	$submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><button ' . $submit_js_preview . '>Valider</button></p>';
81	$preview_buttons = '<div class="button_zone">' . $modify_preview . $close_editor_preview . $submit_preview . '</div>';	86	$preview_buttons = '<div class="button_zone">' . $modify_preview . $close_editor_preview . $submit_preview . '</div>';
82		87
83	$article_js = 'onclick="openEditor(\'' . $id . '\', \'article\')"';	88	$article_js = 'onclick="openEditor(\'' . $id . '\', \'article\')"';
84	$modify_article = '<p id="edit-' . $id . '"><a href="#"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></a></p>' . "\n";	89	$modify_article = '<p id="edit-' . $id . '"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></p>' . "\n";
85	$close_js_article = 'onclick="closeEditor(\'' . $id . '\', \'article\')"';	90	$close_js_article = 'onclick="closeEditor(\'' . $id . '\', \'article\')"';
86	$close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js_article . '>Annuler</button></a></p>';	91	$close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
87	$submit_js_article = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';	92	$submit_js_article = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';
88	$submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js_article . '>Valider</button></a></p>';	93	$submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js_article . '>Valider</button></p>';
89	$article_buttons = '<div class="button_zone">' . $modify_article . $close_editor_article . $submit_article . '</div>';	94	$article_buttons = '<div class="button_zone">' . $modify_article . $close_editor_article . $submit_article . '</div>';
90		95
91	$date_js = 'onclick="changeDate(\'' . $id_date . '\', \'article\');';	96	$date_js = 'onclick="changeDate(\'' . $id_date . '\', \'article\');';
92	$modify_date = '<p id="edit-' . $id_date . '"><a href="#"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></a></p>' . "\n";	97	$modify_date = '<p id="edit-' . $id_date . '"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></p>' . "\n";
93	$close_js_date = 'onclick="closeInput(\'' . $id_date . '\')"';	98	$close_js_date = 'onclick="closeInput(\'' . $id_date . '\')"';
94	$close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><a href="#"><button ' . $close_js_date . '>Annuler</button></a></p>';	99	$close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><button ' . $close_js_date . '>Annuler</button></p>';
95	$submit_js_date = 'onclick="submitDate(\'' . $id_date . '\')"';	100	$submit_js_date = 'onclick="submitDate(\'' . $id_date . '\')"';
96	$submit_date = '<p id="submit-' . $id_date . '" class="hidden"><a href="#"><button ' . $submit_js_date . '>Valider</button></a></p>';	101	$submit_date = '<p id="submit-' . $id_date . '" class="hidden"><button ' . $submit_js_date . '>Valider</button></p>';
97	$date_buttons = '<div class="button_zone">' . $modify_date . $close_editor_date . $submit_date . '</div>';	102	$date_buttons = '<div class="button_zone">' . $modify_date . $close_editor_date . $submit_date . '</div>';
98		103
99	$delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . CURRENT_PAGE . '\')"';	104	$delete_article = '';
100	$delete_article = '<p id="delete-' . $id . '"><a href="#"><button ' . $delete_js . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></a></p>' . "\n";	105	$submit_article = '';
101		106	// modification: bouton "supprimer"
102	$admin_buttons = $delete_article;	107	if($_GET['id'][0] === 'i'){
		108	$delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
		109	$delete_article = '<p id="delete-' . $id . '"><button ' . $delete_js . '><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></p>' . "\n";
		110	}
		111	// nouvel article: bouton pour valider la création d'un nouvel article
		112	else{
		113	$submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
		114	$submit_article = '<p id="submit-' . $id . '"><button ' . $submit_js . '><img class="action_icon" src="assets/edit.svg">Tout<br>enregistrer</button></p>' . "\n";
		115	}
		116
		117	$admin_buttons = $delete_article . $submit_article;
103	}	118	}
		119	// page d'accueil
104	else{	120	else{
105	$modify_article = '<p id="edit-' . $id . '"></p>' . "\n";	121	$modify_article = '<p id="edit-' . $id . '"></p>' . "\n";
106		122
107	$up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';	123	$up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
108	$up_button = '<p id="position_up-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></a></p>' . "\n";	124	$up_button = '<p id="position_up-' . $id . '"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
109		125
110	$down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';	126	$down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
111	$down_button = '<p id="position_down-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></a></p>' . "\n";	127	$down_button = '<p id="position_down-' . $id . '"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
112		128
113	$delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';	129	$delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
114	$delete_article = '<p id="delete-' . $id . '"><a href="#"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></a></p>' . "\n";	130	$delete_article = '<p id="delete-' . $id . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
115		131
116	$close_editor = '<p id="cancel-' . $id . '" class="hidden"></p>';	132	$close_editor = '<p id="cancel-' . $id . '" class="hidden"></p>';
117	$submit_article = '<p id="submit-' . $id . '" class="hidden"></p>';	133	$submit_article = '<p id="submit-' . $id . '" class="hidden"></p>';
@@ -120,7 +136,6 @@ class NewBuilder extends AbstractBuilder
120		136
121	$admin_buttons = $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;	137	$admin_buttons = $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
122	}	138	}
123
124	}	139	}
125		140
126	ob_start();	141	ob_start();