aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/installation.php4
-rw-r--r--src/view/NavBuilder.php9
-rw-r--r--src/view/templates/menu.php1
-rw-r--r--src/view/templates/new_page.php1
4 files changed, 11 insertions, 4 deletions
diff --git a/src/installation.php b/src/installation.php
index 5a56f6b..8aa3332 100644
--- a/src/installation.php
+++ b/src/installation.php
@@ -95,8 +95,12 @@ function fillStartingDatabase(EntityManager $entityManager){
95 $connection = new Page('Connexion', 'connection', "Connexion", true, false, false, NULL, NULL); 95 $connection = new Page('Connexion', 'connection', "Connexion", true, false, false, NULL, NULL);
96 $my_account = new Page('Mon compte', 'user_edit', "Mon compte", true, false, false, NULL, NULL); 96 $my_account = new Page('Mon compte', 'user_edit', "Mon compte", true, false, false, NULL, NULL);
97 $menu_paths = new Page("Menu et chemins", 'menu_chemins', "Menu et chemins", true, false, false, NULL, NULL); 97 $menu_paths = new Page("Menu et chemins", 'menu_chemins', "Menu et chemins", true, false, false, NULL, NULL);
98 $menu_paths->addCSS('menu');
99 $menu_paths->addJS('menu');
98 //$edit_page = new Page("Modification d'une page", 'modif_page', '', true, false, false, NULL, NULL); // hypothétique page "Modification de la page" 100 //$edit_page = new Page("Modification d'une page", 'modif_page', '', true, false, false, NULL, NULL); // hypothétique page "Modification de la page"
99 $new_page = new Page('Nouvelle page', 'nouvelle_page', "Nouvelle page", true, false, false, NULL, NULL); 101 $new_page = new Page('Nouvelle page', 'nouvelle_page', "Nouvelle page", true, false, false, NULL, NULL);
102 $new_page->addCSS('new_page');
103 $new_page->addJS('new_page');
100 104
101 /* -- table node -- */ 105 /* -- table node -- */
102 // paramètres: name_node, article_timestamp, attributes, position, parent, page, article 106 // paramètres: name_node, article_timestamp, attributes, position, parent, page, article
diff --git a/src/view/NavBuilder.php b/src/view/NavBuilder.php
index 07c70d1..2cded67 100644
--- a/src/view/NavBuilder.php
+++ b/src/view/NavBuilder.php
@@ -13,10 +13,11 @@ class NavBuilder extends AbstractBuilder
13 public function __construct(Node $node = null) 13 public function __construct(Node $node = null)
14 { 14 {
15 $this->html .= '<nav class="nav_main"><ul>'; 15 $this->html .= '<nav class="nav_main"><ul>';
16 $this->html .= $this->navMainHTML( 16 if(count(Model::$menu_data->getChildren()) > 1){
17 Model::$menu_data, 17 $this->html .= $this->navMainHTML(
18 // param nullable, ça retire une dépendance stricte entre NavBuilder et Model 18 Model::$menu_data, // Menu étend Page
19 Model::$page_path != null ? Model::$page_path->getArray() : []); 19 Model::$page_path != null ? Model::$page_path->getArray() : []); // param nullable, ça retire une dépendance stricte entre NavBuilder et Model
20 }
20 $this->html .= '</ul></nav>'; 21 $this->html .= '</ul></nav>';
21 } 22 }
22 23
diff --git a/src/view/templates/menu.php b/src/view/templates/menu.php
index d78c665..7f4b26f 100644
--- a/src/view/templates/menu.php
+++ b/src/view/templates/menu.php
@@ -38,4 +38,5 @@
38 <div id="menu_edit_buttons"> 38 <div id="menu_edit_buttons">
39<?= $this->html ?> 39<?= $this->html ?>
40 </div> 40 </div>
41 <a href="<?= new URL ?>"><button>Retour au site</button></a>
41</section> \ No newline at end of file 42</section> \ No newline at end of file
diff --git a/src/view/templates/new_page.php b/src/view/templates/new_page.php
index 5747e82..afa1d8f 100644
--- a/src/view/templates/new_page.php
+++ b/src/view/templates/new_page.php
@@ -23,6 +23,7 @@
23 <textarea id="page_description" name="page_description" cols="40" rows="3" placeholder="ex: nous faisons ceci et cela, etc"></textarea> 23 <textarea id="page_description" name="page_description" cols="40" rows="3" placeholder="ex: nous faisons ceci et cela, etc"></textarea>
24 </p> 24 </p>
25 <input type="submit" value="Créer la page"> 25 <input type="submit" value="Créer la page">
26 <button onclick="window.location.href='<?= new URL ?>';">Retour au site</button><!-- le JS est un hack pour contourner le blocage du bouton par les "required" -->
26 </form> 27 </form>
27 </div> 28 </div>
28</section> \ No newline at end of file 29</section> \ No newline at end of file