From 505eae21d0c83b47d5ac8454e72691884e07a6fa Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 16 Jul 2015 10:16:02 +0100
Subject: [PATCH] continuing work on the new theme. $settings->navlinks is now
 $settings->nav_links

---
 core.php              | 7 ++++---
 index.php             | 2 +-
 module_index.json     | 2 +-
 modules/page-edit.php | 4 +---
 settings.fragment.php | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core.php b/core.php
index 81984ad..d6fb708 100644
--- a/core.php
+++ b/core.php
@@ -288,6 +288,7 @@ class page_renderer
 			<p>Powered by Pepperminty Wiki, which was built by <a href='//starbeamrainbowlabs.com/'>Starbeamrainbowlabs</a>. Send bugs to 'bugs at starbeamrainbowlabs dot com' or open an issue <a href='//github.com/sbrl/Pepperminty-Wiki'>on github</a>.</p>
 			<p>Your local friendly administrators are {admins-name-list}.
 			<p>This wiki is managed by <a href='mailto:{admin-details-email}'>{admin-details-name}</a>.</p>
+			{nav-bottom}
 		</footer>
 		{all-pages-datalist}";
 	public static $minimal_content_template = "{content}
@@ -322,7 +323,7 @@ class page_renderer
 			$settings->favicon,
 			self::get_css_as_html(),
 			
-			self::render_navigation_bar(),
+			self::render_navigation_bar($settings->navlinks),
 			
 			$settings->admindetails["name"],
 			$settings->admindetails["email"],
@@ -367,7 +368,7 @@ class page_renderer
 	
 	public static $nav_divider = "<span class='nav-divider inflexible'> | </span>";
 	
-	public static function render_navigation_bar()
+	public static function render_navigation_bar($nav_links)
 	{
 		global $settings, $user, $isloggedin, $page;
 		$result = "<nav>\n";
@@ -382,7 +383,7 @@ class page_renderer
 			$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login'>Login</a></span>" . page_renderer::$nav_divider;
 		
 		// Loop over all the navigation links
-		foreach($settings->navlinks as $item)
+		foreach($nav_links as $item)
 		{
 			if(is_string($item))
 			{
diff --git a/index.php b/index.php
index e8893c4..abc0bad 100644
--- a/index.php
+++ b/index.php
@@ -947,7 +947,7 @@ register_module([
 					http_response_code(201);
 				else
 					http_response_code(200);
-
+				
 				header("location: index.php?page=$page&edit_status=success");
 				exit();
 			}
diff --git a/module_index.json b/module_index.json
index b6ba6d1..0c6d8fd 100644
--- a/module_index.json
+++ b/module_index.json
@@ -29,7 +29,7 @@
         "author": "Starbeamrainbowlabs",
         "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
         "id": "page-edit",
-        "lastupdate": 1436889893
+        "lastupdate": 1437037943
     },
     {
         "name": "Help page",
diff --git a/modules/page-edit.php b/modules/page-edit.php
index f33fb17..f7a4533 100644
--- a/modules/page-edit.php
+++ b/modules/page-edit.php
@@ -118,13 +118,11 @@ register_module([
 				
 				file_put_contents("./pageindex.json", json_encode($pageindex, JSON_PRETTY_PRINT));
 				
-				// Todo Update the parent page entries in the page index if they exist
-				
 				if(isset($_GET["newpage"]))
 					http_response_code(201);
 				else
 					http_response_code(200);
-
+				
 				header("location: index.php?page=$page&edit_status=success");
 				exit();
 			}
diff --git a/settings.fragment.php b/settings.fragment.php
index 4763b2c..3d3342d 100644
--- a/settings.fragment.php
+++ b/settings.fragment.php
@@ -91,7 +91,7 @@ $settings->admindetails = [
 //		search: Expands to a search box.
 //		divider: Expands to a divider to separate links.
 //		more: Expands to the "More..." submenu.
-$settings->navlinks = [
+$settings->nav_links = [
 	[ "Home", "index.php" ],
 	[ "Login", "index.php?action=login" ],
 	"search",