Version 1.2.3: Reorder Pages

cache/lastCache.txt

@@ -1 +1 @@
-1536861417
+1536875791

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": [],

content/0_typemill/03-features.md → 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.
+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.

content/0_typemill/09-roadmap.md → 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)

content/1_getting-started/00-system-requirements.md → 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:

content/2_for-writers/03-author-panel.md → 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:
 

content/5_info/01-release-notes.md → 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_

content/0_typemill/01-use-cases.txt

@@ -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."]

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
 		];

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";

system/author/layouts/layoutEditor.twig

@@ -17,7 +17,7 @@
 		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20180724" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20180914" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -35,11 +35,11 @@
 			<footer></footer>		
 		</div>
 		<script src="{{ base_url }}/system/author/js/vue.min.js"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20180914"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20180914"></script>
 		<script src="{{ base_url }}/system/author/js/vuedraggable.min.js"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20180724"></script>
-		<script src="{{ base_url }}/system/author/js/vue-editor.js?20180724"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20180914"></script>
+		<script src="{{ base_url }}/system/author/js/vue-editor.js?20180914"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20180914"></script>
 	</body>
 </html>

system/author/partials/editorNavi.twig

@@ -8,7 +8,7 @@
 				<a href="{{ base_url }}/tm/content"><i class="icon-home"></i><span class="level-1">Homepage</span></a>
 			</div>
 		</div>
-		<draggable :element="'ul'" class="navi-list" :list="items" @start="onStart" @start="onEnd" :options="{group:{ name:'folder'}, animation: 150, 'disabled': freeze }">
+		<draggable :element="'ul'" class="navi-list" :list="items" @start="onStart" @end="onEnd" :options="{group:{ name:'folder'}, animation: 150, 'disabled': freeze }">
 			<navigation ref="draggit" v-for="item in items" :freeze="freeze" :name="item.name" :active="item.active" :parent="item.activeParent" :level="item.keyPath" :root="root" :url="item.urlRelWoF" v-bind:id="item.keyPath" :key="item.keyPath" :filetype="item.elementType" :folder="item.folderContent"></navigation>
 		</draggable>