diff --git a/cache/lastCache.txt b/cache/lastCache.txt
index 3859b00..88f7c30 100644
--- a/cache/lastCache.txt
+++ b/cache/lastCache.txt
@@ -1 +1 @@
-1536861417
\ No newline at end of file
+1536875791
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index bb1e0a6..8f31e99 100644
--- a/composer.lock
+++ b/composer.lock
@@ -135,16 +135,16 @@
},
{
"name": "jbroadway/urlify",
- "version": "1.1.0-stable",
+ "version": "1.1.1-stable",
"source": {
"type": "git",
"url": "https://github.com/jbroadway/urlify.git",
- "reference": "99bb78cd9002d0e9ce479bb81635eb665e37e981"
+ "reference": "e8d6950edc484c29f1a499ca6710e928e219ea43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jbroadway/urlify/zipball/99bb78cd9002d0e9ce479bb81635eb665e37e981",
- "reference": "99bb78cd9002d0e9ce479bb81635eb665e37e981",
+ "url": "https://api.github.com/repos/jbroadway/urlify/zipball/e8d6950edc484c29f1a499ca6710e928e219ea43",
+ "reference": "e8d6950edc484c29f1a499ca6710e928e219ea43",
"shasum": ""
},
"require": {
@@ -163,7 +163,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD"
+ "BSD-3-Clause-Clear"
],
"authors": [
{
@@ -185,7 +185,7 @@
"url",
"urlify"
],
- "time": "2017-01-03T20:12:54+00:00"
+ "time": "2018-08-28T14:21:56+00:00"
},
{
"name": "nikic/fast-route",
@@ -235,33 +235,29 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.17",
+ "version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -280,7 +276,7 @@
"pseudorandom",
"random"
],
- "time": "2018-07-04T16:31:37+00:00"
+ "time": "2018-07-02T15:55:56+00:00"
},
{
"name": "pimple/pimple",
@@ -433,20 +429,20 @@
},
{
"name": "slim/csrf",
- "version": "0.8.2",
+ "version": "0.8.3",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim-Csrf.git",
- "reference": "e416320bc0eecdf409aefaad2889737da095ff9a"
+ "reference": "5f2bcf5d89adf86dc0455a32bea84d912ab466a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/e416320bc0eecdf409aefaad2889737da095ff9a",
- "reference": "e416320bc0eecdf409aefaad2889737da095ff9a",
+ "url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/5f2bcf5d89adf86dc0455a32bea84d912ab466a7",
+ "reference": "5f2bcf5d89adf86dc0455a32bea84d912ab466a7",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "^1.1|^2.0",
+ "paragonie/random_compat": "^1.1|^2.0|^9.99",
"php": ">=5.5.0",
"psr/http-message": "^1.0"
},
@@ -479,7 +475,7 @@
"middleware",
"slim"
],
- "time": "2017-10-14T07:59:05+00:00"
+ "time": "2018-08-22T16:12:18+00:00"
},
{
"name": "slim/flash",
@@ -653,16 +649,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.13",
+ "version": "v3.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
+ "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
- "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+ "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
"shasum": ""
},
"require": {
@@ -712,29 +708,32 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-04-06T07:35:25+00:00"
+ "time": "2018-07-26T09:06:28+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -767,20 +766,20 @@
"polyfill",
"portable"
],
- "time": "2018-04-30T19:57:29+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/yaml",
- "version": "v2.8.43",
+ "version": "v2.8.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff"
+ "reference": "fbf876678e29dc634430dcf0096e216eb0004467"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
- "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/fbf876678e29dc634430dcf0096e216eb0004467",
+ "reference": "fbf876678e29dc634430dcf0096e216eb0004467",
"shasum": ""
},
"require": {
@@ -817,7 +816,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2018-05-01T22:52:40+00:00"
+ "time": "2018-07-26T09:03:18+00:00"
},
{
"name": "twig/twig",
@@ -891,12 +890,12 @@
"source": {
"type": "git",
"url": "https://github.com/vlucas/valitron.git",
- "reference": "3511ad84af98c1d47cc671ef0e52b1fab594c406"
+ "reference": "14702f00d36938a04c23c667630d83cd4d001b31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/valitron/zipball/3511ad84af98c1d47cc671ef0e52b1fab594c406",
- "reference": "3511ad84af98c1d47cc671ef0e52b1fab594c406",
+ "url": "https://api.github.com/repos/vlucas/valitron/zipball/14702f00d36938a04c23c667630d83cd4d001b31",
+ "reference": "14702f00d36938a04c23c667630d83cd4d001b31",
"shasum": ""
},
"require": {
@@ -932,7 +931,7 @@
"validation",
"validator"
],
- "time": "2018-06-27T07:23:19+00:00"
+ "time": "2018-09-11T16:59:23+00:00"
}
],
"packages-dev": [],
diff --git a/content/0_typemill/03-features.md b/content/00-typemill/00-features.md
similarity index 74%
rename from content/0_typemill/03-features.md
rename to content/00-typemill/00-features.md
index 169f5ea..05e85d9 100644
--- a/content/0_typemill/03-features.md
+++ b/content/00-typemill/00-features.md
@@ -1,4 +1,4 @@
-# Features qwer
+# Features
TYPEMILL has a limited set of features right now. It transforms a bunch of **markdown files** into a **website** and generates a list of contents for **navigation**.
@@ -7,7 +7,7 @@ This is what you can **do with TYPEMILL**:
- Create a website with simple files and folders.
- Use markdown for your content files.
- Use an admin panel to configure your site.
-- Use the content editor to edit existing pages.
+- Use the content editor to edit existing pages and to reorder the pages.
- Choose themes.
- Activate plugins. Check the [list of plugins](/writers/plugins) for that.
- Create your own theme with HTML, CSS and Twig (a template language for PHP).
@@ -22,4 +22,4 @@ This is, what **TYPEMILL does** for you:
- It adds hierarchic numbers to your chapters and pages.
- It generates a google sitemap, a last modified date and much more.
-Right now there is only a simple content editor that provides basic editing of existing pages. If you want to create new pages or delete existing pages, then you have to use an offline markdown editor like Typora and a FTP software like FileZilla. I will add all basic features for the online-editor step by step within the next weeks.
\ No newline at end of file
+Right now there is only a simple content editor that provides basic editing of existing pages. If you want to create new pages, then you have to use an offline markdown editor like Typora and a FTP software like FileZilla. These missing feature will be added in version 1.2.6.
\ No newline at end of file
diff --git a/content/0_typemill/01-use-cases.md b/content/00-typemill/01-use cases.md
similarity index 100%
rename from content/0_typemill/01-use-cases.md
rename to content/00-typemill/01-use cases.md
diff --git a/content/0_typemill/09-roadmap.md b/content/00-typemill/03-roadmap.md
similarity index 88%
rename from content/0_typemill/09-roadmap.md
rename to content/00-typemill/03-roadmap.md
index b69b2da..84eee92 100644
--- a/content/0_typemill/09-roadmap.md
+++ b/content/00-typemill/03-roadmap.md
@@ -11,13 +11,12 @@ Here are some **milestones** of the past:
- Added an author panel for configurations (v. 1.1.3)
- Added math support (mathjax/katex) (v. 1.1.5)
- Added a basic content editor to change existing pages (v. 1.2.0)
+- Added a draft management for pages (v. 1.2.2)
+- Re-order content pages with drag&drop (v. 1.2.3)
And here is the **roadmap** for this year (2018):
-- Editor: Delete content / pages (v. 1.2.1)
-- Editor: Create new pages (v. 1.2.2)
-- Editor: Move pages (v. 1.2.2)
-- Editor: Save as draft or publish live (v. 1.2.3)
+- Editor: Create new pages (v. 1.2.3)
- Editor: Edit meta-information (v. 1.2.4)
- Editor: Markdown and HTML-preview (v. 1.2.5)
- Editor: Manage images and assets (v. 1.3.0)
diff --git a/content/0_typemill/index.md b/content/00-typemill/index.md
similarity index 100%
rename from content/0_typemill/index.md
rename to content/00-typemill/index.md
diff --git a/content/1_getting-started/00-system-requirements.md b/content/01-getting started/00-system requirements.md
similarity index 94%
rename from content/1_getting-started/00-system-requirements.md
rename to content/01-getting started/00-system requirements.md
index 82549ce..0a85c1d 100644
--- a/content/1_getting-started/00-system-requirements.md
+++ b/content/01-getting started/00-system requirements.md
@@ -3,7 +3,7 @@
TYPEMILL is a modern and lightweight software with nearly no requirements. All you need is:
- **A webserver (Apache)** (to host TYPEMILL)
-- **PHP 5.6+** (to run TYPEMILL)
+- **PHP 7.0+** (to run TYPEMILL)
- **FTP** (to upload your content files)
What you don't need:
diff --git a/content/1_getting-started/01-installation.md b/content/01-getting started/01-installation.md
similarity index 100%
rename from content/1_getting-started/01-installation.md
rename to content/01-getting started/01-installation.md
diff --git a/content/1_getting-started/02-settings.md b/content/01-getting started/02-settings.md
similarity index 100%
rename from content/1_getting-started/02-settings.md
rename to content/01-getting started/02-settings.md
diff --git a/content/1_getting-started/03-update.md b/content/01-getting started/03-update.md
similarity index 100%
rename from content/1_getting-started/03-update.md
rename to content/01-getting started/03-update.md
diff --git a/content/1_getting-started/index.md b/content/01-getting started/index.md
similarity index 100%
rename from content/1_getting-started/index.md
rename to content/01-getting started/index.md
diff --git a/content/2_for-writers/00-quick-start.md b/content/02-for writers/00-quick start.md
similarity index 100%
rename from content/2_for-writers/00-quick-start.md
rename to content/02-for writers/00-quick start.md
diff --git a/content/2_for-writers/03-author-panel.md b/content/02-for writers/01-author panel.md
similarity index 95%
rename from content/2_for-writers/03-author-panel.md
rename to content/02-for writers/01-author panel.md
index 7c84e02..e2a07a6 100644
--- a/content/2_for-writers/03-author-panel.md
+++ b/content/02-for writers/01-author panel.md
@@ -14,6 +14,7 @@ In the **content area** of the author panel you can:
* Navigate through your existing content.
* Edit all existing content pages with markdown syntax.
+* Re-order existing content with simple drag&drop.
There are several **limitations** right now:
diff --git a/content/2_for-writers/05-mardown.md b/content/02-for writers/02-mardown.md
similarity index 100%
rename from content/2_for-writers/05-mardown.md
rename to content/02-for writers/02-mardown.md
diff --git a/content/2_for-writers/10-naming-files-and-folders.md b/content/02-for writers/03-naming files and folders.md
similarity index 100%
rename from content/2_for-writers/10-naming-files-and-folders.md
rename to content/02-for writers/03-naming files and folders.md
diff --git a/content/2_for-writers/15-folder-structure.md b/content/02-for writers/04-folder structure.md
similarity index 100%
rename from content/2_for-writers/15-folder-structure.md
rename to content/02-for writers/04-folder structure.md
diff --git a/content/2_for-writers/20-google-sitemap.md b/content/02-for writers/05-google sitemap.md
similarity index 100%
rename from content/2_for-writers/20-google-sitemap.md
rename to content/02-for writers/05-google sitemap.md
diff --git a/content/2_for-writers/25-themes.md b/content/02-for writers/06-themes.md
similarity index 100%
rename from content/2_for-writers/25-themes.md
rename to content/02-for writers/06-themes.md
diff --git a/content/2_for-writers/30-plugins.md b/content/02-for writers/07-plugins.md
similarity index 100%
rename from content/2_for-writers/30-plugins.md
rename to content/02-for writers/07-plugins.md
diff --git a/content/2_for-writers/60-forgot-password.md b/content/02-for writers/08-forgot password.md
similarity index 100%
rename from content/2_for-writers/60-forgot-password.md
rename to content/02-for writers/08-forgot password.md
diff --git a/content/2_for-writers/index.md b/content/02-for writers/index.md
similarity index 100%
rename from content/2_for-writers/index.md
rename to content/02-for writers/index.md
diff --git a/content/3_for-theme-developers/01-quick-start.md b/content/03-for theme developers/00-quick start.md
similarity index 100%
rename from content/3_for-theme-developers/01-quick-start.md
rename to content/03-for theme developers/00-quick start.md
diff --git a/content/3_for-theme-developers/02-theme-structure.md b/content/03-for theme developers/01-theme structure.md
similarity index 100%
rename from content/3_for-theme-developers/02-theme-structure.md
rename to content/03-for theme developers/01-theme structure.md
diff --git a/content/3_for-theme-developers/03-theme-meta.md b/content/03-for theme developers/02-theme meta.md
similarity index 100%
rename from content/3_for-theme-developers/03-theme-meta.md
rename to content/03-for theme developers/02-theme meta.md
diff --git a/content/3_for-theme-developers/04-asset-tags.md b/content/03-for theme developers/03-asset tags.md
similarity index 100%
rename from content/3_for-theme-developers/04-asset-tags.md
rename to content/03-for theme developers/03-asset tags.md
diff --git a/content/3_for-theme-developers/05-twig.md b/content/03-for theme developers/04-twig.md
similarity index 100%
rename from content/3_for-theme-developers/05-twig.md
rename to content/03-for theme developers/04-twig.md
diff --git a/content/3_for-theme-developers/06-theme-variables/02-content.md b/content/03-for theme developers/05-theme variables/00-content.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/02-content.md
rename to content/03-for theme developers/05-theme variables/00-content.md
diff --git a/content/3_for-theme-developers/06-theme-variables/03-title.md b/content/03-for theme developers/05-theme variables/01-title.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/03-title.md
rename to content/03-for theme developers/05-theme variables/01-title.md
diff --git a/content/3_for-theme-developers/06-theme-variables/04-description.md b/content/03-for theme developers/05-theme variables/02-description.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/04-description.md
rename to content/03-for theme developers/05-theme variables/02-description.md
diff --git a/content/3_for-theme-developers/06-theme-variables/06-image.md b/content/03-for theme developers/05-theme variables/03-image.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/06-image.md
rename to content/03-for theme developers/05-theme variables/03-image.md
diff --git a/content/3_for-theme-developers/06-theme-variables/08-base-url.md b/content/03-for theme developers/05-theme variables/04-base url.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/08-base-url.md
rename to content/03-for theme developers/05-theme variables/04-base url.md
diff --git a/content/3_for-theme-developers/06-theme-variables/10-item.md b/content/03-for theme developers/05-theme variables/05-item.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/10-item.md
rename to content/03-for theme developers/05-theme variables/05-item.md
diff --git a/content/3_for-theme-developers/06-theme-variables/15-breadcrumb.md b/content/03-for theme developers/05-theme variables/06-breadcrumb.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/15-breadcrumb.md
rename to content/03-for theme developers/05-theme variables/06-breadcrumb.md
diff --git a/content/3_for-theme-developers/06-theme-variables/25-navigation.md b/content/03-for theme developers/05-theme variables/07-navigation.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/25-navigation.md
rename to content/03-for theme developers/05-theme variables/07-navigation.md
diff --git a/content/3_for-theme-developers/06-theme-variables/30-settings.md b/content/03-for theme developers/05-theme variables/08-settings.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/30-settings.md
rename to content/03-for theme developers/05-theme variables/08-settings.md
diff --git a/content/3_for-theme-developers/06-theme-variables/index.md b/content/03-for theme developers/05-theme variables/index.md
similarity index 100%
rename from content/3_for-theme-developers/06-theme-variables/index.md
rename to content/03-for theme developers/05-theme variables/index.md
diff --git a/content/3_for-theme-developers/index.md b/content/03-for theme developers/index.md
similarity index 100%
rename from content/3_for-theme-developers/index.md
rename to content/03-for theme developers/index.md
diff --git a/content/4_for-plugin-developers/01-intro.md b/content/04-for plugin developers/00-intro.md
similarity index 100%
rename from content/4_for-plugin-developers/01-intro.md
rename to content/04-for plugin developers/00-intro.md
diff --git a/content/4_for-plugin-developers/01-tutorial/02-cookie-consent-plugin.md b/content/04-for plugin developers/01-tutorial/00-cookie consent plugin.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/02-cookie-consent-plugin.md
rename to content/04-for plugin developers/01-tutorial/00-cookie consent plugin.md
diff --git a/content/4_for-plugin-developers/01-tutorial/06-write-the-yaml-file.md b/content/04-for plugin developers/01-tutorial/01-write the yaml file.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/06-write-the-yaml-file.md
rename to content/04-for plugin developers/01-tutorial/01-write the yaml file.md
diff --git a/content/4_for-plugin-developers/01-tutorial/08-write-the-php-file.md b/content/04-for plugin developers/01-tutorial/02-write the php file.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/08-write-the-php-file.md
rename to content/04-for plugin developers/01-tutorial/02-write the php file.md
diff --git a/content/4_for-plugin-developers/01-tutorial/10-add-methods.md b/content/04-for plugin developers/01-tutorial/03-add methods.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/10-add-methods.md
rename to content/04-for plugin developers/01-tutorial/03-add methods.md
diff --git a/content/4_for-plugin-developers/01-tutorial/04-create-the-structure.md b/content/04-for plugin developers/01-tutorial/04-create the structure.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/04-create-the-structure.md
rename to content/04-for plugin developers/01-tutorial/04-create the structure.md
diff --git a/content/4_for-plugin-developers/01-tutorial/12-add-twig-template.md b/content/04-for plugin developers/01-tutorial/05-add twig template.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/12-add-twig-template.md
rename to content/04-for plugin developers/01-tutorial/05-add twig template.md
diff --git a/content/4_for-plugin-developers/01-tutorial/14-add-default-values.md b/content/04-for plugin developers/01-tutorial/06-add default values.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/14-add-default-values.md
rename to content/04-for plugin developers/01-tutorial/06-add default values.md
diff --git a/content/4_for-plugin-developers/01-tutorial/16-use-variables-in-twig.md b/content/04-for plugin developers/01-tutorial/07-use variables in twig.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/16-use-variables-in-twig.md
rename to content/04-for plugin developers/01-tutorial/07-use variables in twig.md
diff --git a/content/4_for-plugin-developers/01-tutorial/18-make-variables-editable.md b/content/04-for plugin developers/01-tutorial/08-make variables editable.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/18-make-variables-editable.md
rename to content/04-for plugin developers/01-tutorial/08-make variables editable.md
diff --git a/content/4_for-plugin-developers/01-tutorial/index.md b/content/04-for plugin developers/01-tutorial/index.md
similarity index 100%
rename from content/4_for-plugin-developers/01-tutorial/index.md
rename to content/04-for plugin developers/01-tutorial/index.md
diff --git a/content/4_for-plugin-developers/02-documentation/02-file-structure.md b/content/04-for plugin developers/02-documentation/00-file structure.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/02-file-structure.md
rename to content/04-for plugin developers/02-documentation/00-file structure.md
diff --git a/content/4_for-plugin-developers/02-documentation/04-configuration-file.md b/content/04-for plugin developers/02-documentation/01-configuration file.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/04-configuration-file.md
rename to content/04-for plugin developers/02-documentation/01-configuration file.md
diff --git a/content/4_for-plugin-developers/02-documentation/06-field-overview.md b/content/04-for plugin developers/02-documentation/02-field overview.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/06-field-overview.md
rename to content/04-for plugin developers/02-documentation/02-field overview.md
diff --git a/content/4_for-plugin-developers/02-documentation/08-basic-php-file.md b/content/04-for plugin developers/02-documentation/03-basic php file.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/08-basic-php-file.md
rename to content/04-for plugin developers/02-documentation/03-basic php file.md
diff --git a/content/4_for-plugin-developers/02-documentation/10-event-overview.md b/content/04-for plugin developers/02-documentation/04-event overview.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/10-event-overview.md
rename to content/04-for plugin developers/02-documentation/04-event overview.md
diff --git a/content/4_for-plugin-developers/02-documentation/10-method-overview.md b/content/04-for plugin developers/02-documentation/05-method overview.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/10-method-overview.md
rename to content/04-for plugin developers/02-documentation/05-method overview.md
diff --git a/content/4_for-plugin-developers/02-documentation/12-routes.md b/content/04-for plugin developers/02-documentation/06-routes.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/12-routes.md
rename to content/04-for plugin developers/02-documentation/06-routes.md
diff --git a/content/4_for-plugin-developers/02-documentation/14-middleware.md b/content/04-for plugin developers/02-documentation/07-middleware.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/14-middleware.md
rename to content/04-for plugin developers/02-documentation/07-middleware.md
diff --git a/content/4_for-plugin-developers/02-documentation/index.md b/content/04-for plugin developers/02-documentation/index.md
similarity index 100%
rename from content/4_for-plugin-developers/02-documentation/index.md
rename to content/04-for plugin developers/02-documentation/index.md
diff --git a/content/4_for-plugin-developers/index.md b/content/04-for plugin developers/index.md
similarity index 100%
rename from content/4_for-plugin-developers/index.md
rename to content/04-for plugin developers/index.md
diff --git a/content/5_info/01-release-notes.md b/content/05-info/00-release notes.md
similarity index 87%
rename from content/5_info/01-release-notes.md
rename to content/05-info/00-release notes.md
index 589a5f2..b978ab9 100644
--- a/content/5_info/01-release-notes.md
+++ b/content/05-info/00-release notes.md
@@ -2,6 +2,27 @@
This is the version history with some release notes.
+## Version 1.2.3: Reorder Pages
+
+_Release date: 14.09.2018_
+
+**Important: Upgrade to PHP 7**: With version 1.2.3 TYPEMILL requires PHP Version 7.0 or higher. This is due to a library (CSRF-protection), that uses a PHP7 function that is not supported by PHP 5.6. PHP 5.6 and PHP 7.0 will run out of life cycle in december 2018, so you should upgrade your server to PHP 7.1 or PHP 7.2 anyway.
+
+Wow!! More than six weeks and only one feature: As of version 1.2.3 you can re-order your existing content. To do so, simply drag&drop the items in the new navigation of the author panel. It looks so easy, but it was so complex in the background!!
+
+Follow the instruction for simple updates in the [documentation](/gettings-started/update) and simply update the `system` folder.
+
+Be aware, that all existing content-files will be renamed if you reorder a file, because we add a new order-prefix to the file name. And be aware of some rules and limitations:
+
+* You can move files to any other folder.
+* Only folders are allowed at the first level.
+* Folders can be reordered within the same level.
+* But a folder can not be moved to another folder or another level.
+
+Here is the reason for the last restriction: If you move a folder to another folder, then the adress (url) will change for the whole folder and all its content (pages). It is a nightmare for your readers and for google.
+
+If you really want to reorder your content completely, then you have to do it on the file system for now. In version 2.3.5 you will be able to create new folders and files in the author system, so you can create a new folder and move all files to the new folder manually.
+
## Version 1.2.2: Draft Management
_Release date: 24.07.2018_
diff --git a/content/5_info/05-usage-and-licence.md b/content/05-info/01-usage and licence.md
similarity index 100%
rename from content/5_info/05-usage-and-licence.md
rename to content/05-info/01-usage and licence.md
diff --git a/content/5_info/10-Imprint-and-privacy.md b/content/05-info/02-Imprint and privacy.md
similarity index 100%
rename from content/5_info/10-Imprint-and-privacy.md
rename to content/05-info/02-Imprint and privacy.md
diff --git a/content/5_info/15_markdown-test.md b/content/05-info/03-markdown test.md
similarity index 100%
rename from content/5_info/15_markdown-test.md
rename to content/05-info/03-markdown test.md
diff --git a/content/5_info/index.md b/content/05-info/index.md
similarity index 100%
rename from content/5_info/index.md
rename to content/05-info/index.md
diff --git a/content/0_typemill/01-use-cases.txt b/content/0_typemill/01-use-cases.txt
deleted file mode 100644
index 9fb41fe..0000000
--- a/content/0_typemill/01-use-cases.txt
+++ /dev/null
@@ -1 +0,0 @@
-["# Use Cases","Whenever you want to publish a finished text work as a website and if you like writing with Markdown, then TYPEMILL is a smart and lightweight solution. Possible use cases are ...","- a documentation\n- a manual\n- a user guide\n- a whitepaper\n- a handbook\n- a tutorial\n- a study\n- a book\n- a drama\n- a lyric collection\n- a collection of articles","If you want to create a blog, a wiki or a classic corporate website, please use a specialized CMS for that instead of TYPEMILL.","TYPEMILL is under heavy developement and not finished right now. It has an admin panel for settings and a very basic editor for existing content. More options like delete or create new pages and manage your media-files will be added step by step in next weeks. Also different output formats like mobi and ePup are on the roadmap, so stay tuned.","You have to use a FTP-software like FileZilla until the basic editing features are ready. Check the roadmap for more informations."]
\ No newline at end of file
diff --git a/system/Settings.php b/system/Settings.php
index ae3b98b..fe184db 100644
--- a/system/Settings.php
+++ b/system/Settings.php
@@ -43,7 +43,7 @@ class Settings
'contentFolder' => 'content',
'cache' => true,
'cachePath' => $rootPath . 'cache',
- 'version' => '1.2.2',
+ 'version' => '1.2.3',
'setup' => true,
'welcome' => true
];
diff --git a/system/author/js/vue-navi.js b/system/author/js/vue-navi.js
index 854762c..aa94297 100644
--- a/system/author/js/vue-navi.js
+++ b/system/author/js/vue-navi.js
@@ -125,7 +125,7 @@ let navi = new Vue({
this.$refs.draggit[0].onStart(evt);
},
onEnd(evt){
- this.$refs.draggit[0].save(evt);
+ this.$refs.draggit[0].onEnd(evt);
},
showModal: function(e){
this.modalWindow = "modal show";
diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig
index 2f1f945..6edbb09 100644
--- a/system/author/layouts/layoutEditor.twig
+++ b/system/author/layouts/layoutEditor.twig
@@ -17,7 +17,7 @@
-
+
@@ -35,11 +35,11 @@
-
-
+
+
-
-
-
+
+
+