From 2a567ba8c8d280952e1dc89010aae2ed4dfd9edc Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 29 Aug 2019 20:57:14 +0100
Subject: [PATCH] Fix html structure for mega-menu. Next up: CSS! :D

---
 core/40-page-renderer.php |  6 +++++-
 module_index.json         | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/40-page-renderer.php b/core/40-page-renderer.php
index 6782445..43f47f2 100644
--- a/core/40-page-renderer.php
+++ b/core/40-page-renderer.php
@@ -427,6 +427,7 @@ class page_renderer
 		
 		$result = "<nav class='$class'>\n";
 		if($mega_menu) $result .= "<span class='category'>";
+		$is_first_category = true;
 		// Loop over all the navigation links
 		foreach($nav_links as $item) {
 			if(!is_string($item)) {
@@ -476,7 +477,10 @@ class page_renderer
 					break;
 				
 				case "category": // Renders a category header
-					$result .= "</span><span class='category'><strong>" . substr($item, 9) . "</strong>";
+					error_log("[category] " . substr($item, 9));
+					if(!$is_first_category) $result .= "</span>";
+					$result .= "<span class='category'><strong>" . substr($item, 9) . "</strong>";
+					$is_first_category = false;
 					break;
 
 				// It isn't a keyword, so just output it directly
diff --git a/module_index.json b/module_index.json
index 2377b90..f85a4a9 100755
--- a/module_index.json
+++ b/module_index.json
@@ -75,7 +75,7 @@
         "version": "0.1",
         "author": "Starbeamrainbowlabs",
         "description": "Displays a special page to aid in setting up a new wiki for the first time.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -85,7 +85,7 @@
         "version": "0.1.5",
         "author": "Starbeamrainbowlabs",
         "description": "The module everyone has been waiting for! Adds a web based gui that lets mods change the wiki settings.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -95,7 +95,7 @@
         "version": "0.4.2",
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to keep unlimited page history, limited only by your disk space. Note that this doesn't store file history (yet). Currently depends on feature-recent-changes for rendering of the history page.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -135,7 +135,7 @@
         "version": "0.10",
         "author": "Starbeamrainbowlabs",
         "description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -145,7 +145,7 @@
         "version": "0.2.1",
         "author": "Starbeamrainbowlabs",
         "description": "An extensible statistics calculation system. Comes with a range of built-in statistics, but can be extended by other modules too.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -155,7 +155,7 @@
         "version": "0.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a theme gallery page and optional automatic theme updates. Contacts a remote server, where IP addresses are stored in automatic server logs for security and attack mitigation purposes.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -165,7 +165,7 @@
         "version": "0.6.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -215,7 +215,7 @@
         "version": "0.10.2",
         "author": "Starbeamrainbowlabs",
         "description": "Adds an action to allow administrators to delete pages.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -225,7 +225,7 @@
         "version": "0.17.5",
         "author": "Starbeamrainbowlabs",
         "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": {
             "diff.min.js": "https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/jsdiff\/2.2.2\/diff.min.js"
@@ -247,7 +247,7 @@
         "version": "0.10",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a rather useful help page. Access through the 'help' action. This module also exposes help content added to Pepperminty Wiki's inbuilt invisible help section system.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -257,7 +257,7 @@
         "version": "0.11.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a page that lists all the pages in the index along with their metadata.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": []
     },
@@ -337,7 +337,7 @@
         "version": "0.10",
         "author": "Emanuil Rusev & Starbeamrainbowlabs",
         "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation.",
-        "lastupdate": 1567035922,
+        "lastupdate": 1567107944,
         "optional": false,
         "extra_data": {
             "Parsedown.php": "https:\/\/raw.githubusercontent.com\/erusev\/parsedown\/819c68899d593503180ed79ef4be5a4dcd8c5f92\/Parsedown.php",
@@ -345,4 +345,4 @@
             "ParsedownExtreme.php": "https:\/\/raw.githubusercontent.com\/BenjaminHoegh\/parsedown-extreme\/adae4136534ad1e4159fe04c74c4683681855b84\/ParsedownExtreme.php"
         }
     }
-]
+]
\ No newline at end of file