From 7b0cd592ae207131f1000aab5e122a652a45d0b0 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Thu, 25 Jan 2024 14:41:33 +0100
Subject: [PATCH 1/7] cleanup checkout

---
 cache/cyanine-custom.css      |  3 +++
 data/security/securitylog.txt | 19 -------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 create mode 100644 cache/cyanine-custom.css
 delete mode 100644 data/security/securitylog.txt

diff --git a/cache/cyanine-custom.css b/cache/cyanine-custom.css
new file mode 100644
index 0000000..61ff634
--- /dev/null
+++ b/cache/cyanine-custom.css
@@ -0,0 +1,3 @@
+.body{
+  background-color: green;
+}
\ No newline at end of file
diff --git a/data/security/securitylog.txt b/data/security/securitylog.txt
deleted file mode 100644
index b123e63..0000000
--- a/data/security/securitylog.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-127.0.0.1;2023-12-24 10:46:32;login: invalid data
-127.0.0.1;2023-12-24 10:47:01;login: invalid data
-127.0.0.1;2023-12-24 10:51:05;login: invalid data
-127.0.0.1;2023-12-24 10:57:31;login: authcode wrong or outdated.
-127.0.0.1;2023-12-24 10:59:47;login: authcode wrong or outdated.
-127.0.0.1;2023-12-24 10:59:51;login: wrong password
-127.0.0.1;2023-12-24 10:59:59;login: authcode wrong or outdated.
-127.0.0.1;2023-12-25 06:20:18;login: authcode wrong or outdated.
-127.0.0.1;2023-12-25 06:20:35;login: user not found
-127.0.0.1;2023-12-25 09:12:05;login: wrong password
-127.0.0.1;2023-12-27 11:17:43;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:21:21;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:24:01;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:25:07;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:30:28;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:31:36;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:31:52;login: authcode wrong or outdated.
-127.0.0.1;2023-12-27 11:32:10;login: authcode wrong or outdated.
-127.0.0.1;2024-01-15 13:11:20;login: invalid data

From 49301c1722f7b88ff0020072be31be6844078978 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Thu, 25 Jan 2024 15:05:13 +0100
Subject: [PATCH 2/7] V2.1.2 Fix fullname in user model and logic to add author
 in meta

---
 system/typemill/Models/Meta.php | 12 ++++++++++--
 system/typemill/Models/User.php | 12 +++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/system/typemill/Models/Meta.php b/system/typemill/Models/Meta.php
index 5ab0659..c4f0eec 100644
--- a/system/typemill/Models/Meta.php
+++ b/system/typemill/Models/Meta.php
@@ -78,7 +78,11 @@ class Meta
 		$user = new User();
 		if($user->setUser($username))
 		{
-			$author = $user->getFullName();
+			$fullname = $user->getFullName();
+			if($fullname)
+			{
+				$author = $fullname;
+			}
 		}
 
 		$meta = [];
@@ -127,7 +131,11 @@ class Meta
 				$user = new User();
 				if($user->setUser($currentuser))
 				{
-					$author = $user->getFullName();
+					$fullname 	= $user->getFullName();
+					if($fullname)
+					{
+						$author = $fullname;
+					}
 				}
 			}
 
diff --git a/system/typemill/Models/User.php b/system/typemill/Models/User.php
index 6a60042..718d0f0 100644
--- a/system/typemill/Models/User.php
+++ b/system/typemill/Models/User.php
@@ -71,7 +71,17 @@ class User
 
 	public function getFullName()
 	{
-		return trim($this->user['firstname'] . ' ' . $this->user['lastname']);
+
+		$firstname 	= $this->user['firstname'] ?? '';
+		$lastname 	= $this->user['lastname'] ?? '';
+		$fullname 	= trim($firstname . ' ' . $lastname);
+
+		if($fullname != '')
+		{
+			return $fullname;
+		}
+
+		return false;
 	}
 
 	public function getError()

From 4ac8874a8a79641b7129cb1f14c7e7d8ec3cad96 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Thu, 25 Jan 2024 21:17:32 +0100
Subject: [PATCH 3/7] v2.1.2 fix owner value false in metadata

---
 .../Controllers/ControllerApiAuthorArticle.php        |  2 +-
 .../typemill/Controllers/ControllerApiAuthorMeta.php  | 10 ++++++++--
 system/typemill/Models/Meta.php                       | 11 +++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/system/typemill/Controllers/ControllerApiAuthorArticle.php b/system/typemill/Controllers/ControllerApiAuthorArticle.php
index 7d19cc0..b7759af 100644
--- a/system/typemill/Controllers/ControllerApiAuthorArticle.php
+++ b/system/typemill/Controllers/ControllerApiAuthorArticle.php
@@ -332,7 +332,7 @@ class ControllerApiAuthorArticle extends Controller
 		# META is important e.g. for newsletter, so send it, too
 		$meta 				= new Meta();
 		$metadata  			= $meta->getMetaData($item);
-		$metadata 			= $meta->addMetaDefaults($metadata, $item, $this->settings['author']);
+		$metadata 			= $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
 #		$metadata 			= $meta->addMetaTitleDescription($metadata, $item, $markdownArray);
 
 		# dispatch event, e.g. send newsletter and more
diff --git a/system/typemill/Controllers/ControllerApiAuthorMeta.php b/system/typemill/Controllers/ControllerApiAuthorMeta.php
index 369588f..5d675ad 100644
--- a/system/typemill/Controllers/ControllerApiAuthorMeta.php
+++ b/system/typemill/Controllers/ControllerApiAuthorMeta.php
@@ -33,9 +33,15 @@ class ControllerApiAuthorMeta extends Controller
 
 		$metadata = $meta->getMetaData($item);
 
-		if(!$metadata)
+		if(!$metadata or !isset($metadata['meta']['owner']) OR !$metadata['meta']['owner'])
 		{
-			$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author']);
+			$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
+		}
+
+		#fix for version 1 because owner in meta is often 'false'
+		if(!isset($metadata['meta']['owner']) OR !$metadata['meta']['owner'])
+		{
+			$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
 		}
 
 		# if user is not allowed to perform this action (e.g. not admin)
diff --git a/system/typemill/Models/Meta.php b/system/typemill/Models/Meta.php
index c4f0eec..bef62a1 100644
--- a/system/typemill/Models/Meta.php
+++ b/system/typemill/Models/Meta.php
@@ -20,7 +20,7 @@ class Meta
 	public function getMetaData($item)
 	{
 		$metadata = $this->storage->getYaml('contentFolder', '', $item->pathWithoutType . '.yaml');
-	
+			
 		return $metadata;
 	}
 
@@ -116,10 +116,13 @@ class Meta
 			$meta['meta'] = []; 
 		}
 		
-		if(!isset($meta['meta']['owner']))
+		if(!isset($meta['meta']['owner']) OR !$meta['meta']['owner'])
 		{
-			$meta['meta']['owner'] = $currentuser;
-			$modified = true;
+			if($currentuser)
+			{
+				$meta['meta']['owner'] = $currentuser;
+				$modified = true;
+			}
 		}
 
 		if(!isset($meta['meta']['author']))

From 393e6478fefe5a86ae6b5a1dfd66de038087b8e0 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Fri, 26 Jan 2024 18:46:13 +0100
Subject: [PATCH 4/7] v2.1.2 change navigation expand logic from name to
 urlRelWoF

---
 system/typemill/author/js/vue-contentnavi.js | 45 +++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/system/typemill/author/js/vue-contentnavi.js b/system/typemill/author/js/vue-contentnavi.js
index 968b68e..3961956 100644
--- a/system/typemill/author/js/vue-contentnavi.js
+++ b/system/typemill/author/js/vue-contentnavi.js
@@ -70,7 +70,7 @@ const navigation = Vue.createApp({
 		{
 			return tmaxios.defaults.baseURL + '/tm/content/' + data.settings.editor;
 		},
-		toggleFolder(name)
+		toggleFolderOLD(name)
 		{
 			var index = this.expanded.indexOf(name);
 			if (index > -1)
@@ -84,40 +84,53 @@ const navigation = Vue.createApp({
 			}
 			localStorage.setItem("expanded", this.expanded.toString());
 		},
+		toggleFolder(url)
+		{
+			var index = this.expanded.indexOf(url);
+			if (index > -1)
+			{
+				this.expanded.splice(index, 1);
+			}
+			else
+			{
+				this.expanded.push(url);
+			}
+			localStorage.setItem("expanded", this.expanded.toString());
+		},
 		expandNavigation()
 		{
-			this.expanded = this.getFolderNames(this.navigation, []);
+			this.expanded = this.getFolderUrls(this.navigation, []);
 			localStorage.setItem("expanded", this.expanded.toString());
 		},
 		collapseNavigation()
 		{
-			this.expanded = this.getActiveNames(this.navigation, []);
+			this.expanded = this.getActiveUrls(this.navigation, []);
 			localStorage.setItem("expanded", this.expanded.toString());
 		},
-		getActiveNames(navigation, expanded)
+		getActiveUrls(navigation, expanded)
 		{
 			for (const item of navigation)
 			{
 				if(item.activeParent || item.active)
 				{
-					expanded.push(item.name);
+					expanded.push(item.urlRelWoF);
 				}
 
 				if (item.elementType == 'folder')
 				{
-					this.getActiveNames(item.folderContent, expanded);
+					this.getActiveUrls(item.folderContent, expanded);
 				}
 			}
 			return expanded;
 		},
-		getFolderNames(navigation, result)
+		getFolderUrls(navigation, result)
 		{
 			for (const item of navigation)
 			{
 				if (item.elementType == 'folder')
 				{
-					result.push(item.name);
-					this.getFolderNames(item.folderContent, result);
+					result.push(item.urlRelWoF);
+					this.getFolderUrls(item.folderContent, result);
 				}
 			}
 			return result;
@@ -169,8 +182,8 @@ navigation.component('navilevel',{
 								<use xlink:href="#icon-eye-blocked"></use>
 							</svg> 
 						</div>
-						<div v-if="element.elementType == 'folder' && element.contains == 'pages'" class=" p-1 bg-transparent absolute right-0" @click="callToggle(element.name)">
-							<svg v-if="isExpanded(element.name)" class="icon icon-cheveron-up">
+						<div v-if="element.elementType == 'folder' && element.contains == 'pages'" class=" p-1 bg-transparent absolute right-0" @click="callToggle(element.urlRelWoF)">
+							<svg v-if="isExpanded(element.urlRelWoF)" class="icon icon-cheveron-up">
 								<use xlink:href="#icon-cheveron-up"></use>
 							</svg>
 							<svg v-else class="icon icon-cheveron-down">
@@ -178,7 +191,7 @@ navigation.component('navilevel',{
 							</svg>
 						</div>
 					</div>
-					<navilevel v-show="isExpanded(element.name)" v-if="element.elementType == 'folder' && element.contains == 'pages'" :list="element.folderContent" :navigation="element.folderContent" :parentId="element.keyPath" :expanded="expanded" />
+					<navilevel v-show="isExpanded(element.urlRelWoF)" v-if="element.elementType == 'folder' && element.contains == 'pages'" :list="element.folderContent" :navigation="element.folderContent" :parentId="element.keyPath" :expanded="expanded" />
 				</li>
 			</template>
 			<template #footer>
@@ -305,13 +318,13 @@ navigation.component('navilevel',{
 		{
 			return tmaxios.defaults.baseURL + '/tm/content/' + data.settings.editor + segment;
 		},
-		callToggle(name)
+		callToggle(url)
 		{
-			eventBus.$emit('toggleFolder', name);
+			eventBus.$emit('toggleFolder', url);
 		},
-		isExpanded(name)
+		isExpanded(url)
 		{
-			if(this.expanded.indexOf(name) > -1)
+			if(this.expanded.indexOf(url) > -1)
 			{
 				return true;
 			}

From 488e874e83d896568a32ba83ca4a0045187a733f Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Mon, 29 Jan 2024 13:00:20 +0100
Subject: [PATCH 5/7] Fix inline bar link design, add metadata to copied page,
 add delete plugindata to plugin, temp fix open and close behavior of new
 blocks

---
 content/01-cyanine-theme/04-copy.md               |  4 ++++
 content/01-cyanine-theme/04-copy.txt              |  1 +
 content/01-cyanine-theme/04-copy.yaml             | 13 +++++++++++++
 data/navigation/navi-draft.txt                    |  2 +-
 data/navigation/navi-extended.txt                 |  6 ++++++
 .../Controllers/ControllerWebFrontend.php         | 15 ++++++++++++---
 system/typemill/Plugin.php                        | 12 ++++++++++++
 system/typemill/author/css/custom.css             |  4 ++--
 system/typemill/author/js/vue-blox.js             |  8 ++++++--
 system/typemill/settings/defaults.yaml            |  2 +-
 10 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 content/01-cyanine-theme/04-copy.md
 create mode 100644 content/01-cyanine-theme/04-copy.txt
 create mode 100644 content/01-cyanine-theme/04-copy.yaml

diff --git a/content/01-cyanine-theme/04-copy.md b/content/01-cyanine-theme/04-copy.md
new file mode 100644
index 0000000..22ef1f6
--- /dev/null
+++ b/content/01-cyanine-theme/04-copy.md
@@ -0,0 +1,4 @@
+# copy
+
+Content
+
diff --git a/content/01-cyanine-theme/04-copy.txt b/content/01-cyanine-theme/04-copy.txt
new file mode 100644
index 0000000..ab06d15
--- /dev/null
+++ b/content/01-cyanine-theme/04-copy.txt
@@ -0,0 +1 @@
+["# copy","Danke sch\u00f6n f\u00fcr das ganze hier!","## bla","Content changed","Das sollte auch so"]
\ No newline at end of file
diff --git a/content/01-cyanine-theme/04-copy.yaml b/content/01-cyanine-theme/04-copy.yaml
new file mode 100644
index 0000000..65c9565
--- /dev/null
+++ b/content/01-cyanine-theme/04-copy.yaml
@@ -0,0 +1,13 @@
+meta:
+    navtitle: copy
+    owner: trendschau
+    author: 'Sebastian Schürmanns'
+    created: '2024-01-28'
+    time: 21-47-19
+    reference: /welcome/write-content
+    referencetype: copy
+    hide: false
+    noindex: false
+    modified: '2024-01-28'
+    title: copy
+    description: Content
diff --git a/data/navigation/navi-draft.txt b/data/navigation/navi-draft.txt
index 84fcabc..e1d2e39 100644
--- a/data/navigation/navi-draft.txt
+++ b/data/navigation/navi-draft.txt
@@ -1 +1 @@
-a:2:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/01-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-write-content";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/02-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-manage-access";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:4:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}}
\ No newline at end of file
+a:2:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/01-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-write-content";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/02-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-manage-access";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:13:"04-copy.txtmd";s:11:"elementType";s:4:"file";s:6:"status";s:8:"modified";s:8:"fileType";s:3:"txt";s:5:"order";s:2:"04";s:4:"name";s:4:"copy";s:4:"slug";s:4:"copy";s:4:"path";s:31:"/01-cyanine-theme/04-copy.txtmd";s:15:"pathWithoutType";s:25:"/01-cyanine-theme/04-copy";s:3:"key";i:4;s:7:"keyPath";s:3:"1.4";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"4";}s:7:"chapter";s:3:"2.5";s:9:"urlRelWoF";s:19:"/cyanine-theme/copy";s:6:"urlRel";s:28:"/typemill/cyanine-theme/copy";s:6:"urlAbs";s:44:"http://localhost/typemill/cyanine-theme/copy";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}}
\ No newline at end of file
diff --git a/data/navigation/navi-extended.txt b/data/navigation/navi-extended.txt
index 69087af..14a0b5b 100644
--- a/data/navigation/navi-extended.txt
+++ b/data/navigation/navi-extended.txt
@@ -64,3 +64,9 @@
     noindex: false
     path: /01-cyanine-theme/03-content-elements.md
     keyPath: '1.3'
+/cyanine-theme/copy:
+    navtitle: copy
+    hide: false
+    noindex: false
+    path: /01-cyanine-theme/04-copy.txtmd
+    keyPath: '1.4'
diff --git a/system/typemill/Controllers/ControllerWebFrontend.php b/system/typemill/Controllers/ControllerWebFrontend.php
index 3facbac..d59953f 100644
--- a/system/typemill/Controllers/ControllerWebFrontend.php
+++ b/system/typemill/Controllers/ControllerWebFrontend.php
@@ -159,14 +159,23 @@ class ControllerWebFrontend extends Controller
 					    ]);
 				    }
 
-					$refKeyPathArray 		= explode(".", $refpageinfo['keyPath']);
-					$refItem 				= $navigation->getItemWithKeyPath($draftNavigation, $refKeyPathArray);
+					$refKeyPathArray 	= explode(".", $refpageinfo['keyPath']);
+					$refitem 			= $navigation->getItemWithKeyPath($draftNavigation, $refKeyPathArray);
 
 					# GET THE CONTENT FROM REFENCED PAGE
-					$liveMarkdown		= $content->getLiveMarkdown($refItem);
+					$liveMarkdown		= $content->getLiveMarkdown($refitem);
 					$liveMarkdown 		= $this->c->get('dispatcher')->dispatch(new OnMarkdownLoaded($liveMarkdown), 'onMarkdownLoaded')->getData();
 					$markdownArray 		= $content->markdownTextToArray($liveMarkdown);
 
+					# GET THE META FROM REFERENCED PAGE
+					$refmeta  			= $meta->getMetaData($refitem);
+					if($refmeta && isset($refmeta['meta']))
+					{
+						$metadata 		= $meta->getMetaData($refitem);
+						$metadata 		= $meta->addMetaDefaults($metadata, $refitem, $this->settings['author']);
+						$metadata 		= $meta->addMetaTitleDescription($metadata, $refItem, $markdownArray);					
+					}
+
 					break;
 			}
 		}
diff --git a/system/typemill/Plugin.php b/system/typemill/Plugin.php
index 6102586..8ed2578 100644
--- a/system/typemill/Plugin.php
+++ b/system/typemill/Plugin.php
@@ -142,6 +142,18 @@ abstract class Plugin implements EventSubscriberInterface
 		return $storage->getError();
 	}
 
+	protected function deletePluginData($filename, $pluginname = false)
+	{
+		$pluginname 	= $this->getPluginName($pluginname);
+
+		$storageClass 	= $this->container->get('settings')['storage'];
+		$storage 		= new StorageWrapper($storageClass);
+		
+		$data 			= $storage->deleteFile('dataFolder', $pluginname, $filename);
+
+		return $data;
+	}
+
 	private function getPluginName($pluginname = NULL)
 	{
 		if(!$pluginname)
diff --git a/system/typemill/author/css/custom.css b/system/typemill/author/css/custom.css
index 109384b..bbbd441 100644
--- a/system/typemill/author/css/custom.css
+++ b/system/typemill/author/css/custom.css
@@ -547,7 +547,7 @@
   margin-left: 2px;
   margin-right: 2px;
 }
-.blox-editor input.urlinput{
+.inlineFormatBar input.urlinput{
   width: 75%;
   min-height: auto;
   background: #555;
@@ -555,7 +555,7 @@
   border: 0px;
   padding: 5px;
 }
-.blox-editor input.urlinput:focus{
+.inlineFormatBar input.urlinput:focus{
   outline: 0px;
   border: 0px;
 }
diff --git a/system/typemill/author/js/vue-blox.js b/system/typemill/author/js/vue-blox.js
index 80bfdb1..7cefb3d 100644
--- a/system/typemill/author/js/vue-blox.js
+++ b/system/typemill/author/js/vue-blox.js
@@ -128,6 +128,8 @@ bloxeditor.component('new-block',{
 	},
 	mounted: function()
 	{
+		console.info('new-block: mounted');
+
 		eventBus.$on('closeComponents', this.closeComponent);
 
 		eventBus.$on('inlineFormat', content => {
@@ -151,6 +153,7 @@ bloxeditor.component('new-block',{
 			}
 			else
 			{
+/*				eventBus.$emit('closeComponents'); will also close component above, refactor logic */
 				eventBus.$emit('freezeblocks');
 
 				this.componentType = componenttype;
@@ -232,7 +235,7 @@ bloxeditor.component('content-block', {
 	props: ['element', 'index'],
 	template: `
 			<div :class="{'edit': edit}">
-				<div v-if="newblock" class="bg-stone-100 dark:bg-stone-600">
+				<div v-if="newblock" class="blox-editor bg-stone-100 dark:bg-stone-600">
 					<div class="w-full flex justify-between bg-stone-200 dark:bg-stone-600">
 						<p class="p-2 pl-4">Choose a content type</p>
 						<button class="p-2 border-l border-stone-700 hover:text-white hover:bg-rose-500 transition-1" @click="closeNewBlock">{{ $filters.translate('close') }}</button>
@@ -302,6 +305,7 @@ bloxeditor.component('content-block', {
 			}
 			else
 			{
+				eventBus.$emit('closeComponents');
 				eventBus.$emit('freeze');
 
 				this.newblock 		= true;
@@ -309,7 +313,7 @@ bloxeditor.component('content-block', {
 			}
 		},
 		closeNewBlock()
-		{
+		{	
 			eventBus.$emit('unlockcontent');
 			eventBus.$emit('unfreeze');
 			eventBus.$emit('publisherclear');
diff --git a/system/typemill/settings/defaults.yaml b/system/typemill/settings/defaults.yaml
index 6b0cd63..a09f4d6 100644
--- a/system/typemill/settings/defaults.yaml
+++ b/system/typemill/settings/defaults.yaml
@@ -1,4 +1,4 @@
-version: '2.1.1'
+version: '2.1.2'
 title: 'Typemill'
 author: 'Unknown'
 copyright: false

From 0307007bb30c873609af08d75a1c6d2a02c65c75 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Mon, 29 Jan 2024 16:15:36 +0100
Subject: [PATCH 6/7] v2.1.2 fix behavior of open and close blocks

---
 system/typemill/author/js/vue-blox.js | 278 +++++++++++++-------------
 1 file changed, 140 insertions(+), 138 deletions(-)

diff --git a/system/typemill/author/js/vue-blox.js b/system/typemill/author/js/vue-blox.js
index 7cefb3d..2bfb15e 100644
--- a/system/typemill/author/js/vue-blox.js
+++ b/system/typemill/author/js/vue-blox.js
@@ -96,141 +96,6 @@ const bloxeditor = Vue.createApp({
 
 bloxeditor.component('draggable', vuedraggable);
 
-bloxeditor.component('new-block',{
-	props: ['markdown', 'index'],
-	template: `
-		<div class="w-full mb-4">
-			<div v-if="!componentType" class="w-full flex p-4 dark:bg-stone-900">
-				<button v-for="button in formats" 
-					class="p-2 m-1 border border-stone-300 bg-stone-100 dark:border-stone-700 dark:bg-stone-700 hover:bg-stone-700 hover:dark:bg-stone-600 hover:text-stone-50 transition-1"  
-					@click.prevent="setComponentType( $event, button.component )" 
-					:title="button.title" 
-					v-html="button.label">
-				</button>
-			</div>
-			<div v-if="componentType" class="relative bg-stone-100 dark:bg-stone-900">
-				<component ref="activeComponent" :disabled="disabled" :markdown="newblockmarkdown" :index="index" @saveBlockEvent="saveNewBlock" @updateMarkdownEvent="updateMarkdownFunction" :is="componentType"></component>
-				<div class="edit-buttons absolute -bottom-3 right-4 z-2 text-xs">
-					<button class="cancel w-20 p-1 border-r border-stone-700 bg-stone-200 dark:bg-stone-600 hover:bg-rose-500 hover:dark:bg-rose-500 hover:text-white transition-1" :disabled="disabled" @click.prevent="closeComponent">{{ $filters.translate('cancel') }}</button>
-					<button class="save w-20 p-1 border-l border-stone-700 bg-stone-200 dark:bg-stone-600 hover:bg-teal-500 hover:dark:bg-teal-500 hover:text-white transition-1" :disabled="disabled" @click.prevent="beforeSaveNew()">{{ $filters.translate('save') }}</button>
-				</div>
-			</div>
-		</div>
-	`,
-	data: function () {
-		return {
-			formats: bloxFormats,
-			componentType: false,
-			disabled: false,
-			newblockmarkdown: '',
-			unsafedcontent: false,
-		}
-	},
-	mounted: function()
-	{
-		console.info('new-block: mounted');
-
-		eventBus.$on('closeComponents', this.closeComponent);
-
-		eventBus.$on('inlineFormat', content => {
-			this.newblockmarkdown = content;
-		});
-
-		eventBus.$on('lockcontent', content => {
-			this.unsafedcontent = true;
-		});
-
-		eventBus.$on('unlockcontent', content => {
-			this.unsafedcontent = false;
-		});
-	},
-	methods: {
-		setComponentType(event, componenttype)
-		{
-			if(this.unsafedcontent)
-			{
-				eventBus.$emit('publishermessage', 'Save or cancel your changes first.');
-			}
-			else
-			{
-/*				eventBus.$emit('closeComponents'); will also close component above, refactor logic */
-				eventBus.$emit('freezeblocks');
-
-				this.componentType = componenttype;
-			}
-		},
-		closeComponent()
-		{
-			this.componentType = false;
-			this.newblockmarkdown = '';
-			eventBus.$emit('unlockcontent');
-			eventBus.$emit('publisherclear');
-		},
-		updateMarkdownFunction(value)
-		{
-			eventBus.$emit('lockcontent');
-			this.newblockmarkdown = value;
-		},
-		beforeSaveNew()
-		{
-			eventBus.$emit('beforeSave');
-		},
-		saveNewBlock()
-		{
-			if(
-				this.newblockmarkdown == undefined || 
-				this.newblockmarkdown.replace(/(\r\n|\n|\r|\s)/gm,"") == ''
-			)
-			{
-				this.closeComponent();
-				return;
-			}
-
-			if(typeof this.$refs.activeComponent.saveBlock === "function")
-			{
-				this.$refs.activeComponent.saveBlock(this.updatedmarkdown);
-				return; 
-			}
-
-			var self = this;
-
-			eventBus.$emit('publisherclear');
-
-			tmaxios.post('/api/v1/block',{
-				'url':				data.urlinfo.route,
-				'block_id':			this.index,
-				'markdown': 		this.newblockmarkdown.trim(),
-			})
-			.then(function (response)
-			{
-				self.$root.$data.content = response.data.content;
-				self.closeComponent();
-				eventBus.$emit('closeComponents');
-				if(response.data.navigation)
-				{
-					eventBus.$emit('navigation', response.data.navigation);
-				}
-				if(response.data.item)
-				{
-					eventBus.$emit('item', response.data.item);					
-				}
-			})
-			.catch(function (error)
-			{
-				if(error.response)
-				{
-					let message = handleErrorMessage(error);
-					if(message)
-					{
-						eventBus.$emit('publishermessage', message);
-					}
-				}
-			});
-		},
-	}
-});
-
-
 bloxeditor.component('content-block', {
 	props: ['element', 'index'],
 	template: `
@@ -313,12 +178,12 @@ bloxeditor.component('content-block', {
 			}
 		},
 		closeNewBlock()
-		{	
+		{
 			eventBus.$emit('unlockcontent');
 			eventBus.$emit('unfreeze');
 			eventBus.$emit('publisherclear');
 
-			this.newblock 			= false;
+			this.newblock 			= false;			
 		},
 		closeEditor()
 		{
@@ -487,4 +352,141 @@ bloxeditor.component('content-block', {
 			});
 		},
 	},
-})
\ No newline at end of file
+})
+
+bloxeditor.component('new-block',{
+	props: ['markdown', 'index'],
+	template: `
+		<div class="w-full mb-4">
+			<div v-if="!componentType" class="w-full flex p-4 dark:bg-stone-900">
+				<button v-for="button in formats" 
+					class="p-2 m-1 border border-stone-300 bg-stone-100 dark:border-stone-700 dark:bg-stone-700 hover:bg-stone-700 hover:dark:bg-stone-600 hover:text-stone-50 transition-1"  
+					@click.prevent="setComponentType( $event, button.component )" 
+					:title="button.title" 
+					v-html="button.label">
+				</button>
+			</div>
+			<div v-if="componentType" class="relative bg-stone-100 dark:bg-stone-900">
+				<component ref="activeComponent" :disabled="disabled" :markdown="newblockmarkdown" :index="index" @saveBlockEvent="saveNewBlock" @updateMarkdownEvent="updateMarkdownFunction" :is="componentType"></component>
+				<div class="edit-buttons absolute -bottom-3 right-4 z-2 text-xs">
+					<button class="cancel w-20 p-1 border-r border-stone-700 bg-stone-200 dark:bg-stone-600 hover:bg-rose-500 hover:dark:bg-rose-500 hover:text-white transition-1" :disabled="disabled" @click.prevent="closeComponent">{{ $filters.translate('cancel') }}</button>
+					<button class="save w-20 p-1 border-l border-stone-700 bg-stone-200 dark:bg-stone-600 hover:bg-teal-500 hover:dark:bg-teal-500 hover:text-white transition-1" :disabled="disabled" @click.prevent="beforeSaveNew()">{{ $filters.translate('save') }}</button>
+				</div>
+			</div>
+		</div>
+	`,
+	data: function () {
+		return {
+			formats: bloxFormats,
+			componentType: false,
+			disabled: false,
+			newblockmarkdown: '',
+			unsafedcontent: false,
+		}
+	},
+	mounted: function()
+	{
+		eventBus.$on('closeComponents', this.closeComponent);
+
+		eventBus.$on('inlineFormat', content => {
+			this.newblockmarkdown = content;
+		});
+
+		eventBus.$on('lockcontent', content => {
+			this.unsafedcontent = true;
+		});
+
+		eventBus.$on('unlockcontent', content => {
+			this.unsafedcontent = false;
+		});
+	},
+	methods: {
+		setComponentType(event, componenttype)
+		{			
+			if(this.unsafedcontent)
+			{
+				eventBus.$emit('publishermessage', 'Save or cancel your changes first.');
+			}
+			else
+			{
+				/* if it is a new block at the end of the page, close other open blocks first */
+				if(this.index == 999999)
+				{
+					eventBus.$emit('closeComponents');
+				}
+
+				eventBus.$emit('freezeblocks');
+
+				this.componentType = componenttype;
+			}
+		},
+		closeComponent()
+		{
+			this.componentType = false;
+			this.newblockmarkdown = '';
+			eventBus.$emit('unlockcontent');
+			eventBus.$emit('publisherclear');
+		},
+		updateMarkdownFunction(value)
+		{
+			eventBus.$emit('lockcontent');
+			this.newblockmarkdown = value;
+		},
+		beforeSaveNew()
+		{
+			eventBus.$emit('beforeSave');
+		},
+		saveNewBlock()
+		{
+			if(
+				this.newblockmarkdown == undefined || 
+				this.newblockmarkdown.replace(/(\r\n|\n|\r|\s)/gm,"") == ''
+			)
+			{
+				this.closeComponent();
+				return;
+			}
+
+			if(typeof this.$refs.activeComponent.saveBlock === "function")
+			{
+				this.$refs.activeComponent.saveBlock(this.updatedmarkdown);
+				return; 
+			}
+
+			var self = this;
+
+			eventBus.$emit('publisherclear');
+
+			tmaxios.post('/api/v1/block',{
+				'url':				data.urlinfo.route,
+				'block_id':			this.index,
+				'markdown': 		this.newblockmarkdown.trim(),
+			})
+			.then(function (response)
+			{
+				self.$root.$data.content = response.data.content;
+				self.closeComponent();
+				eventBus.$emit('closeComponents');
+				if(response.data.navigation)
+				{
+					eventBus.$emit('navigation', response.data.navigation);
+				}
+				if(response.data.item)
+				{
+					eventBus.$emit('item', response.data.item);					
+				}
+			})
+			.catch(function (error)
+			{
+				if(error.response)
+				{
+					let message = handleErrorMessage(error);
+					if(message)
+					{
+						eventBus.$emit('publishermessage', message);
+					}
+				}
+			});
+		},
+	}
+});

From cc42bac8305cd613755a91bcc796902379233033 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Mon, 29 Jan 2024 21:14:09 +0100
Subject: [PATCH 7/7] V2.1.2 fix use of self in callables error
 parsedown-extension

---
 content/01-cyanine-theme/04-copy.md               |  4 ----
 content/01-cyanine-theme/04-copy.txt              |  1 -
 content/01-cyanine-theme/04-copy.yaml             | 13 -------------
 data/navigation/navi-draft.txt                    |  2 +-
 data/navigation/navi-extended.txt                 |  6 ------
 system/typemill/Extensions/ParsedownExtension.php |  3 +--
 6 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 content/01-cyanine-theme/04-copy.md
 delete mode 100644 content/01-cyanine-theme/04-copy.txt
 delete mode 100644 content/01-cyanine-theme/04-copy.yaml

diff --git a/content/01-cyanine-theme/04-copy.md b/content/01-cyanine-theme/04-copy.md
deleted file mode 100644
index 22ef1f6..0000000
--- a/content/01-cyanine-theme/04-copy.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# copy
-
-Content
-
diff --git a/content/01-cyanine-theme/04-copy.txt b/content/01-cyanine-theme/04-copy.txt
deleted file mode 100644
index ab06d15..0000000
--- a/content/01-cyanine-theme/04-copy.txt
+++ /dev/null
@@ -1 +0,0 @@
-["# copy","Danke sch\u00f6n f\u00fcr das ganze hier!","## bla","Content changed","Das sollte auch so"]
\ No newline at end of file
diff --git a/content/01-cyanine-theme/04-copy.yaml b/content/01-cyanine-theme/04-copy.yaml
deleted file mode 100644
index 65c9565..0000000
--- a/content/01-cyanine-theme/04-copy.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-    navtitle: copy
-    owner: trendschau
-    author: 'Sebastian Schürmanns'
-    created: '2024-01-28'
-    time: 21-47-19
-    reference: /welcome/write-content
-    referencetype: copy
-    hide: false
-    noindex: false
-    modified: '2024-01-28'
-    title: copy
-    description: Content
diff --git a/data/navigation/navi-draft.txt b/data/navigation/navi-draft.txt
index e1d2e39..84fcabc 100644
--- a/data/navigation/navi-draft.txt
+++ b/data/navigation/navi-draft.txt
@@ -1 +1 @@
-a:2:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/01-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-write-content";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/02-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-manage-access";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:13:"04-copy.txtmd";s:11:"elementType";s:4:"file";s:6:"status";s:8:"modified";s:8:"fileType";s:3:"txt";s:5:"order";s:2:"04";s:4:"name";s:4:"copy";s:4:"slug";s:4:"copy";s:4:"path";s:31:"/01-cyanine-theme/04-copy.txtmd";s:15:"pathWithoutType";s:25:"/01-cyanine-theme/04-copy";s:3:"key";i:4;s:7:"keyPath";s:3:"1.4";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"4";}s:7:"chapter";s:3:"2.5";s:9:"urlRelWoF";s:19:"/cyanine-theme/copy";s:6:"urlRel";s:28:"/typemill/cyanine-theme/copy";s:6:"urlAbs";s:44:"http://localhost/typemill/cyanine-theme/copy";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}}
\ No newline at end of file
+a:2:{i:0;O:8:"stdClass":22:{s:12:"originalName";s:10:"00-welcome";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:7:"welcome";s:4:"slug";s:7:"welcome";s:4:"path";s:11:"/00-welcome";s:15:"pathWithoutType";s:17:"/00-welcome/index";s:9:"urlRelWoF";s:8:"/welcome";s:6:"urlRel";s:17:"/typemill/welcome";s:6:"urlAbs";s:33:"http://localhost/typemill/welcome";s:3:"key";i:0;s:7:"keyPath";i:0;s:12:"keyPathArray";a:1:{i:0;s:1:"0";}s:7:"chapter";i:1;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:5:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:24:"00-setup-your-website.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:18:"setup your website";s:4:"slug";s:18:"setup-your-website";s:4:"path";s:36:"/00-welcome/00-setup-your-website.md";s:15:"pathWithoutType";s:33:"/00-welcome/00-setup-your-website";s:3:"key";i:0;s:7:"keyPath";s:3:"0.0";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"0";}s:7:"chapter";s:3:"1.1";s:9:"urlRelWoF";s:27:"/welcome/setup-your-website";s:6:"urlRel";s:36:"/typemill/welcome/setup-your-website";s:6:"urlAbs";s:52:"http://localhost/typemill/welcome/setup-your-website";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:19:"01-write-content.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"write content";s:4:"slug";s:13:"write-content";s:4:"path";s:31:"/00-welcome/01-write-content.md";s:15:"pathWithoutType";s:28:"/00-welcome/01-write-content";s:3:"key";i:1;s:7:"keyPath";s:3:"0.1";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"1";}s:7:"chapter";s:3:"1.2";s:9:"urlRelWoF";s:22:"/welcome/write-content";s:6:"urlRel";s:31:"/typemill/welcome/write-content";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/write-content";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:19:"02-manage-access.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:13:"manage access";s:4:"slug";s:13:"manage-access";s:4:"path";s:31:"/00-welcome/02-manage-access.md";s:15:"pathWithoutType";s:28:"/00-welcome/02-manage-access";s:3:"key";i:2;s:7:"keyPath";s:3:"0.2";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"2";}s:7:"chapter";s:3:"1.3";s:9:"urlRelWoF";s:22:"/welcome/manage-access";s:6:"urlRel";s:31:"/typemill/welcome/manage-access";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/manage-access";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:14:"03-get-help.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:8:"get help";s:4:"slug";s:8:"get-help";s:4:"path";s:26:"/00-welcome/03-get-help.md";s:15:"pathWithoutType";s:23:"/00-welcome/03-get-help";s:3:"key";i:3;s:7:"keyPath";s:3:"0.3";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"3";}s:7:"chapter";s:3:"1.4";s:9:"urlRelWoF";s:17:"/welcome/get-help";s:6:"urlRel";s:26:"/typemill/welcome/get-help";s:6:"urlAbs";s:42:"http://localhost/typemill/welcome/get-help";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:4;O:8:"stdClass":20:{s:12:"originalName";s:19:"04-markdown-test.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"04";s:4:"name";s:13:"markdown test";s:4:"slug";s:13:"markdown-test";s:4:"path";s:31:"/00-welcome/04-markdown-test.md";s:15:"pathWithoutType";s:28:"/00-welcome/04-markdown-test";s:3:"key";i:4;s:7:"keyPath";s:3:"0.4";s:12:"keyPathArray";a:2:{i:0;s:1:"0";i:1;s:1:"4";}s:7:"chapter";s:3:"1.5";s:9:"urlRelWoF";s:22:"/welcome/markdown-test";s:6:"urlRel";s:31:"/typemill/welcome/markdown-test";s:6:"urlAbs";s:47:"http://localhost/typemill/welcome/markdown-test";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}i:1;O:8:"stdClass":22:{s:12:"originalName";s:16:"01-cyanine-theme";s:11:"elementType";s:6:"folder";s:8:"contains";s:5:"pages";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:13:"cyanine theme";s:4:"slug";s:13:"cyanine-theme";s:4:"path";s:17:"/01-cyanine-theme";s:15:"pathWithoutType";s:23:"/01-cyanine-theme/index";s:9:"urlRelWoF";s:14:"/cyanine-theme";s:6:"urlRel";s:23:"/typemill/cyanine-theme";s:6:"urlAbs";s:39:"http://localhost/typemill/cyanine-theme";s:3:"key";i:1;s:7:"keyPath";i:1;s:12:"keyPathArray";a:1:{i:0;s:1:"1";}s:7:"chapter";i:2;s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:13:"folderContent";a:4:{i:0;O:8:"stdClass":20:{s:12:"originalName";s:17:"00-landingpage.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"00";s:4:"name";s:11:"landingpage";s:4:"slug";s:11:"landingpage";s:4:"path";s:35:"/01-cyanine-theme/00-landingpage.md";s:15:"pathWithoutType";s:32:"/01-cyanine-theme/00-landingpage";s:3:"key";i:0;s:7:"keyPath";s:3:"1.0";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"0";}s:7:"chapter";s:3:"2.1";s:9:"urlRelWoF";s:26:"/cyanine-theme/landingpage";s:6:"urlRel";s:35:"/typemill/cyanine-theme/landingpage";s:6:"urlAbs";s:51:"http://localhost/typemill/cyanine-theme/landingpage";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:1;}i:1;O:8:"stdClass":20:{s:12:"originalName";s:22:"01-colors-and-fonts.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"01";s:4:"name";s:16:"colors and fonts";s:4:"slug";s:16:"colors-and-fonts";s:4:"path";s:40:"/01-cyanine-theme/01-colors-and-fonts.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/01-colors-and-fonts";s:3:"key";i:1;s:7:"keyPath";s:3:"1.1";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"1";}s:7:"chapter";s:3:"2.2";s:9:"urlRelWoF";s:31:"/cyanine-theme/colors-and-fonts";s:6:"urlRel";s:40:"/typemill/cyanine-theme/colors-and-fonts";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/colors-and-fonts";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:2;O:8:"stdClass":20:{s:12:"originalName";s:12:"02-footer.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"02";s:4:"name";s:6:"footer";s:4:"slug";s:6:"footer";s:4:"path";s:30:"/01-cyanine-theme/02-footer.md";s:15:"pathWithoutType";s:27:"/01-cyanine-theme/02-footer";s:3:"key";i:2;s:7:"keyPath";s:3:"1.2";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"2";}s:7:"chapter";s:3:"2.3";s:9:"urlRelWoF";s:21:"/cyanine-theme/footer";s:6:"urlRel";s:30:"/typemill/cyanine-theme/footer";s:6:"urlAbs";s:46:"http://localhost/typemill/cyanine-theme/footer";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}i:3;O:8:"stdClass":20:{s:12:"originalName";s:22:"03-content-elements.md";s:11:"elementType";s:4:"file";s:6:"status";s:9:"published";s:8:"fileType";s:2:"md";s:5:"order";s:2:"03";s:4:"name";s:16:"content elements";s:4:"slug";s:16:"content-elements";s:4:"path";s:40:"/01-cyanine-theme/03-content-elements.md";s:15:"pathWithoutType";s:37:"/01-cyanine-theme/03-content-elements";s:3:"key";i:3;s:7:"keyPath";s:3:"1.3";s:12:"keyPathArray";a:2:{i:0;s:1:"1";i:1;s:1:"3";}s:7:"chapter";s:3:"2.4";s:9:"urlRelWoF";s:31:"/cyanine-theme/content-elements";s:6:"urlRel";s:40:"/typemill/cyanine-theme/content-elements";s:6:"urlAbs";s:56:"http://localhost/typemill/cyanine-theme/content-elements";s:6:"active";b:0;s:12:"activeParent";b:0;s:4:"hide";b:0;s:7:"noindex";b:0;}}s:7:"noindex";b:0;}}
\ No newline at end of file
diff --git a/data/navigation/navi-extended.txt b/data/navigation/navi-extended.txt
index 14a0b5b..69087af 100644
--- a/data/navigation/navi-extended.txt
+++ b/data/navigation/navi-extended.txt
@@ -64,9 +64,3 @@
     noindex: false
     path: /01-cyanine-theme/03-content-elements.md
     keyPath: '1.3'
-/cyanine-theme/copy:
-    navtitle: copy
-    hide: false
-    noindex: false
-    path: /01-cyanine-theme/04-copy.txtmd
-    keyPath: '1.4'
diff --git a/system/typemill/Extensions/ParsedownExtension.php b/system/typemill/Extensions/ParsedownExtension.php
index f64ee30..22fe2d6 100644
--- a/system/typemill/Extensions/ParsedownExtension.php
+++ b/system/typemill/Extensions/ParsedownExtension.php
@@ -545,7 +545,6 @@ class ParsedownExtension extends \ParsedownExtra
     # has a fix for visual editor mode and option for spanFootnotes
     public function buildFootnoteElement()
     {
-
         # we do not need a footnote element if we use w3c inline style with spans for footnotes
         if($this->spanFootnotes)
         {
@@ -564,7 +563,7 @@ class ParsedownExtension extends \ParsedownExtra
             ),
         );
 
-        uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes');
+        uasort($this->DefinitionData['Footnote'], [$this, 'sortFootnotes']);
 
         foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData)
         {