V2 dev-version finished

content/00-welcome/03-get-help.yaml

@@ -0,0 +1,8 @@
+meta:
+    navtitle: 'get help'
+    owner: Sebastian
+    created: '2023-06-12'
+    time: 22-36-34
+    modified: '2023-05-13'
+    title: 'If you need any help, then please read the [documentation on typemill.net](https://typemill.net/typemill) first. You can also check these [video-tutorials](https://www.youtube.com/channel/UCyghKiX2kK9QIqTf1WT1Xxw) about the basics to create a typemill website.'
+    description: 'If you found a bug or if you have a question, then please open a new issue on GitHub. Do you need professional help, an individual theme or a special plugin?'

content/00-welcome/05-todos.md

@@ -101,6 +101,10 @@
 * Reference feature
 * SVG checker
 * Markdown secure rendering
+* Typemill Utilities
+* Version check
+* User search only for +10 users
+* Fix error api systemnavi
 
 ## Cleanups:
 

content/01-cyanine-theme/00-new.md

@@ -1,51 +0,0 @@
-# ToDo
-
-[TOC]
-
-## Visual Editor
-
-Das ist ein Intro. Es gibt noch viel zu tun, aber das ist am Ende des Tages nicht so schlimm denn wir machen einfach weiter.
-
-* DONE: Fix toc component in new block
-* DONE: Fix hr component in new block
-* DONE: finish shortcode component
-* DONE: Fix inline formats
-* DONE: fix lenght of page
-* DONE: Fix design of new block at the end (background color)
-* DONE: Move Block
-* DONE: Fix headline design
-* DONE: Fix save on two enter
-* DONE:  fix quote design
-* DONE: Fix toc preview
-* DONE: disable enable 
-* DONE: Add load sign (from navigation)
-* SHIT!!! fiinish youtube component
-
-## Navigation
-
-* DONE: fix status in navigation
-* fix error messages
-* DONE: refresh navigation after changes
-
-## Publish Controller
-
-* DONE: Create 
-* DONE: publish
-* DONE: unpublish
-* DONE: discard
-* DONE: delete
-* DONE: save draft
-* DONE: switch to raw
-
-## Raw Editor
-
-* DONE:
-
-## Meta Tabs
-
-* Setup
-
-## Medialib
-
-* Setup
-

content/01-cyanine-theme/00-new.yaml

@@ -1,8 +0,0 @@
-meta:
-    navtitle: new
-    owner: Unknown
-    created: '2023-07-20'
-    time: 14-39-14
-    modified: '2023-07-20'
-    title: ToDo
-    description: ' Visual Editor'

content/01-cyanine-theme/01-landingpage.yaml

@@ -1,18 +0,0 @@
-meta:
-    navtitle: landingpage
-    title: 'Cyanine provides an optional landingpage with six segments:'
-    description: "\nIntro with the content of the home page and an additional link/button.\nInfo with individual markdown content.\nTeaser with two elements. Each element has a"
-    heroimage: null
-    heroimagealt: null
-    owner: Unknown
-    author: null
-    allowedrole: null
-    alloweduser: null
-    manualdate: null
-    modified: '2023-03-26'
-    created: '2023-06-12'
-    time: 22-36-46
-    reference: null
-    referencetype: null
-    hide: false
-    noindex: true

content/01-cyanine-theme/02-content-elements.yaml

@@ -1,8 +0,0 @@
-meta:
-    navtitle: 'content elements'
-    owner: Sebastian
-    created: '2023-06-12'
-    time: 22-36-50
-    modified: '2021-11-24'
-    title: 'Cyanine provides a lot of other settings for your content area. For example:'
-    description: "\nAdd an edit-button for github, gitlab or other plattforms.\nShow the author.\nShow the publish date.\nShow the chapter numbers in the navigation.\n"

content/01-cyanine-theme/03-colors-and-fonts.yaml

@@ -1,8 +0,0 @@
-meta:
-    navtitle: 'colors and fonts'
-    owner: Sebastian
-    created: '2023-06-12'
-    time: 22-36-53
-    modified: '2023-03-26'
-    title: 'First of all cyanine supports individual logos. If you want to use our logo, then please upload it in the system settings. Cyanine will automatically replace the title text with your logo. You can also upload your own favicon in the system settings.'
-    description: 'Cyanine allows you to change many colors. Please make sure that your color-combinations are readable and accessible. The following colors are editable: '

content/01-cyanine-theme/04-footer.yaml

@@ -1,8 +0,0 @@
-meta:
-    navtitle: footer
-    owner: Sebastian
-    created: '2023-06-12'
-    time: 21-41-25
-    modified: '2021-05-18'
-    description: 'Cyanine provides a three column footer at the bottom of each page. You can use markdown for each column. Make sure that you use the correct headline-level (we'
-    title: '3-Column Footer'

data/navigation/navi-extended.txt

@@ -4,11 +4,11 @@
     noindex: false
     path: /00-welcome
     keyPath: 0
-/welcome/markdown-test:
-    navtitle: 'markdown test'
+/welcome/setup-your-website:
+    navtitle: 'setup your website'
     hide: false
     noindex: false
-    path: /00-welcome/00-markdown-test.md
+    path: /00-welcome/00-setup-your-website.md
     keyPath: '0.0'
 /welcome/manage-access:
     navtitle: 'manage access'
@@ -16,23 +16,23 @@
     noindex: false
     path: /00-welcome/01-manage-access.md
     keyPath: '0.1'
-/welcome/get-help:
-    navtitle: 'get help'
-    hide: false
-    noindex: false
-    path: /00-welcome/02-get-help.md
-    keyPath: '0.2'
-/welcome/setup-your-website:
-    navtitle: 'setup your website'
-    hide: false
-    noindex: false
-    path: /00-welcome/03-setup-your-website.md
-    keyPath: '0.3'
 /welcome/write-content:
     navtitle: 'write content'
     hide: false
     noindex: false
-    path: /00-welcome/04-write-content.md
+    path: /00-welcome/02-write-content.md
+    keyPath: '0.2'
+/welcome/get-help:
+    navtitle: 'get help'
+    hide: false
+    noindex: false
+    path: /00-welcome/03-get-help.md
+    keyPath: '0.3'
+/welcome/markdown-test:
+    navtitle: 'markdown test'
+    hide: false
+    noindex: false
+    path: /00-welcome/04-markdown-test.md
     keyPath: '0.4'
 /welcome/todos:
     navtitle: 'To Dos'
@@ -46,33 +46,27 @@
     noindex: false
     path: /01-cyanine-theme
     keyPath: 1
-/cyanine-theme/new:
-    navtitle: new
-    hide: false
-    noindex: false
-    path: /01-cyanine-theme/00-new.md
-    keyPath: '1.0'
 /cyanine-theme/landingpage:
     navtitle: landingpage
     hide: false
     noindex: true
-    path: /01-cyanine-theme/01-landingpage.md
-    keyPath: '1.1'
-/cyanine-theme/content-elements:
-    navtitle: 'content elements'
-    hide: false
-    noindex: false
-    path: /01-cyanine-theme/02-content-elements.md
-    keyPath: '1.2'
+    path: /01-cyanine-theme/00-landingpage.md
+    keyPath: '1.0'
 /cyanine-theme/colors-and-fonts:
     navtitle: 'colors and fonts'
     hide: false
     noindex: false
-    path: /01-cyanine-theme/03-colors-and-fonts.md
-    keyPath: '1.3'
+    path: /01-cyanine-theme/01-colors-and-fonts.md
+    keyPath: '1.1'
 /cyanine-theme/footer:
     navtitle: footer
     hide: false
     noindex: false
-    path: /01-cyanine-theme/04-footer.md
-    keyPath: '1.4'
+    path: /01-cyanine-theme/02-footer.md
+    keyPath: '1.2'
+/cyanine-theme/content-elements:
+    navtitle: 'content elements'
+    hide: false
+    noindex: false
+    path: /01-cyanine-theme/03-content-elements.md
+    keyPath: '1.3'

system/typemill/Controllers/ControllerWebSetup.php

@@ -35,7 +35,7 @@ class ControllerWebSetup extends Controller
 		if( !$storage->checkFolder('fileFolder')){ 				$systemerrors[] = $storage->getError(); }
 
 		# check php-version
-		if (version_compare(phpversion(), '8.3.0', '<')) 
+		if (version_compare(phpversion(), '8.0.0', '<')) 
 		{
 			$systemerrors[] = 'The PHP-version of your server is ' . phpversion() . ' and Typemill needs at least 8.0.0';
 		}

system/typemill/Models/Extension.php

@@ -31,6 +31,7 @@ class Extension
 		$themeSettings = [];
 		foreach($themes as $themename => $themeinputs)
 		{
+			if(!is_array($themeinputs)){ $themeinputs = []; }
 			$themeSettings[$themename] = $themeinputs;
 			$themeSettings[$themename]['customcss'] = $this->storage->getFile('cacheFolder', '', $themename . '-custom.css');
 		}

system/typemill/Models/Meta.php

@@ -98,6 +98,8 @@ class Meta
 	{
 		$modified = false;
 
+		if(!is_array($meta['meta'])){ $meta['meta'] = []; }
+		
 		if(!isset($meta['meta']['owner']))
 		{
 			$meta['meta']['owner'] = $currentuser ? $currentuser : false;

system/typemill/author/auth/login.twig

@@ -71,11 +71,8 @@
 		
 		<div class="content-center w-1/2 flex justify-center items-center">
 			<div class="max-w-md content-center">
-				<h2>Latest from Typemill</h2>
-				<p>Hey, get the latest news from Typemill please!</p>
-				<p>base_url(): {{ base_url() }}</p>
-				<p>current_url(): {{ current_url() }}</p>
-				<p>current_path(): {{ current_path() }}</p>
+				<h2 class="text-4xl py-5">Welcome back!</h2>
+				<p>What kind of information would be helpful or entertaining here?</p>
 			</div>
 		</div>
 	

system/typemill/author/auth/setup.twig

@@ -84,8 +84,9 @@
 						{% endfor %}
 					</ul>
 				{% else %}
-					<h2 class="text-6xl py-5">Welcome to Typemill</h2>
-					<p>some bla bla bla here</p>
+					<h2 class="text-4xl py-5">Here comes Typemill</h2>
+					<p>Hey writer, author, editor, content-guru, or website-manager, we hope you like Typemill, because we coded it just for you.</p>
+					<p>Get inspired and enjoy your writing!</p>
 				{% endif %}
 			</div>
 		</div>

themes/cyanine/layout.twig

@@ -13,9 +13,8 @@
 		{{ assets.renderMeta() }}
 
 		{% block stylesheets %}
-
-			{{ assets.activateTachyons() }}
     
+			<link rel="stylesheet" href="{{ base_url }}/themes/cyanine/css/tachyons.min.css?20220527" />
 			<link rel="stylesheet" href="{{ base_url }}/themes/cyanine/css/style.css?20220527" />
 			
 			<style>