浏览代码

Version 1.2.5: Create Pages

Sebastian 6 年之前
父节点
当前提交
9b16a17d0b

+ 1 - 1
cache/lastCache.txt

@@ -1 +1 @@
-1538860826
+1538862654

+ 10 - 10
composer.lock

@@ -649,7 +649,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -770,16 +770,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.45",
+            "version": "v2.8.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "fbf876678e29dc634430dcf0096e216eb0004467"
+                "reference": "5baf0f821b14eee8ca415e6a0361a9fa140c002c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/fbf876678e29dc634430dcf0096e216eb0004467",
-                "reference": "fbf876678e29dc634430dcf0096e216eb0004467",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/5baf0f821b14eee8ca415e6a0361a9fa140c002c",
+                "reference": "5baf0f821b14eee8ca415e6a0361a9fa140c002c",
                 "shasum": ""
             },
             "require": {
@@ -816,7 +816,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:03:18+00:00"
+            "time": "2018-08-29T13:11:53+00:00"
         },
         {
             "name": "twig/twig",
@@ -890,12 +890,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/valitron.git",
-                "reference": "14702f00d36938a04c23c667630d83cd4d001b31"
+                "reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/valitron/zipball/14702f00d36938a04c23c667630d83cd4d001b31",
-                "reference": "14702f00d36938a04c23c667630d83cd4d001b31",
+                "url": "https://api.github.com/repos/vlucas/valitron/zipball/e3b3eb31a2fc41827ac8d5646e406dde4584f3c2",
+                "reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2",
                 "shasum": ""
             },
             "require": {
@@ -931,7 +931,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2018-09-11T16:59:23+00:00"
+            "time": "2018-09-23T19:46:36+00:00"
         }
     ],
     "packages-dev": [],

+ 4 - 4
content/00-typemill/01-roadmap.md

@@ -13,14 +13,14 @@ Here are some **milestones** of the past:
 - Added a basic content editor to edit and delete 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)
+- Editor: Create new pages (v. 1.2.5)
 
 And here is the **roadmap** for this year (2018):
 
-- Editor: Create new pages (v. 1.2.5)
-- Editor: Manage images and assets (v. 1.2.6)
-- Editor: Edit meta-information (v. 1.2.7)
+- Editor: Basic WYSIWYG-Preview for markdown blocks (v. 1.2.6)
+- Editor: Manage images and assets (v. 1.2.7)
+- Editor: Edit meta-information (v. 1.2.8)
 - Editor: Add formatting options (v. 1.3.0)
-- Editor: WYSIWYG-Preview for markdown blocks (v. 1.3.0)
 - Editor: Create the best author- and writing experience you have ever seen (1.4.0)
 
 Other features with lower prio: 

+ 2 - 2
content/00-typemill/02-features.md

@@ -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 and to reorder the pages.
+- Use the content editor to create, edit and reorder 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, then you have to use an offline markdown editor like Typora and a FTP software like FileZilla.
+Right now there is only a simple content editor to create, edit and reorder pages. There is no media management yet, so you have to upload images and media files with an FTP software like FileZilla for now.

+ 1 - 1
content/01-getting-started/00-system-requirements.md

@@ -4,7 +4,7 @@ TYPEMILL is a modern and lightweight software with nearly no requirements. All y
 
 - **A webserver (Apache)** (to host TYPEMILL)
 - **PHP 7.0+** (to run TYPEMILL)
-- **FTP** (to upload your content files)
+- **FTP** (to upload your images and media files)
 
 What you don't need:
 

+ 4 - 3
content/02-for-writers/00-quick start.md

@@ -1,6 +1,8 @@
 # Quick Start for Writers
 
-You are a pro and don't want to read the whole manual? No problem, this is a quick overview:
+In earlier versions of Typemill authors had to create content files with an offline Markdown editor and upload the files to the server. Since Typemill provides an online editor to create, reorder and edit content pages, a separate offline editor is not needed anymore.
+
+However, if you still want to use your favourite Markdown editor to create your content files, then please follow this rules:
 
 - **Setup**: Login to your system and setup the system, the themes and the plugins in the author panel.
 - **Content**: Organize your content in folders and markdown files and put them in the `\content` folder of TYPEMILL. 
@@ -10,5 +12,4 @@ You are a pro and don't want to read the whole manual? No problem, this is a qui
 - **F5**: After some changes, use the `F5` key to refresh the navigation manually.
 - **Lean back** and let TYPEMILL create a nice website for you.
 
-
-The TYPEMILL system ships with this user manual in the content folder. Check how the files are written and how the folders are organized.
+TYPEMILL ships with this user manual in the content folder. Check how the files are written and how the folders are organized.

+ 5 - 4
content/02-for-writers/01-author panel.md

@@ -1,6 +1,6 @@
 # The Author Panel
 
-After you have setup your TYPEMILL website, you can login to the author panel. The login url is 
+You can login to the author panel with this url:
 
 ````
 https://yourwebsite.net/tm/login
@@ -13,13 +13,14 @@ You can also use the url `https://yourwebsite.net/setup` that redirects to the l
 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.
+* Create new pages.
+* Edit existing pages with markdown syntax.
+* Re-order existing pages with simple drag&drop.
+* Save drafts, publish pages, unpublish pages and delete pages.
 
 There are several **limitations** right now:
 
 * You cannot use HTML, JavaScript or any other code in the editor, only markdown-syntax is allowed.
-* You cannot create new pages right now (use FTP for this), but these feature is on its way.
 * There is no media-management right now.
 
 The content editor has highest priority in the roadmap, so you can expect a lot of improvements in the next weeks.

+ 3 - 2
content/02-for-writers/02-naming files and folders.md

@@ -1,5 +1,7 @@
 # Naming your Files and Folders
 
+Naming conventions are not very relevant anymore since you can create new pages online with the author panel right now. If you still want to create your content offline, then please follow the rules below.
+
 To create a clean website with TYPEMILL, you have to follow some naming conventions for your files and folders. A typcial structure for folders and file looks like this:
 
 ````
@@ -19,5 +21,4 @@ The rules are simple:
 - **Use index.md**: TYPEMILL creates websites for the folders and users can click on folder-names exactly like they click on file-names in the navigation. Folder pages are empty by default, but you can use a file named `index.md` to create content for the folder page.
 - **Avoid Language Specific Characters**: As of version 1.0.5 the character encoding has been improved, but it is still not perfect. You can try to use german, french or other character sets to name your files and folders. But if you see some errors in the navigation of the website, please use english characters instead. In the content files itself you can use all character sets of course.
 
-When you name your files and folders, then always keep in mind, that the names are used to generate the navigation and the table of contents. So keep it short. Otherwise it might break the layout and the design.
-
+When you name your files and folders, then always keep in mind, that the names are used to generate the navigation and the table of contents. So keep it short. Otherwise it might break the layout and the design.

+ 11 - 0
content/05-info/00-release-notes.md

@@ -2,6 +2,17 @@
 
 This is the version history with some release notes.
 
+## Version 1.2.5: Create New Pages Online
+
+_Release date: 07.10.2018_
+
+Version 1.2.5 is a simple system update, so you only have to delete the system folder and upload the new system folder of version 1.2.5. The main changes are:
+
+* Create new folders and files.
+* Mark drafted and unpublished pages in navigation.
+* Add internal 404 page for the author panel.
+* Improve delete pages (redirect and subfolder).
+
 ## Version 1.2.4: Refactoring and Browser Support
 
 _Release date: 22.09.2018_

+ 6 - 9
system/Controllers/ContentController.php

@@ -149,20 +149,17 @@ abstract class ContentController
 			# scan the content of the folder
 			$structure = Folder::scanFolder($this->settings['rootPath'] . $this->settings['contentFolder'], $draft);
 
-			# if there is no content, render an empty page
-			if(count($structure) == 0)
+			# if there is content, then get the content details
+			if(count($structure) > 0)
 			{
-				$this->errors = ['errors' => ['message' => 'content folder is empty']];
-				return false;
+				# create an array of object with the whole content of the folder
+				$structure = Folder::getFolderContentDetails($structure, $this->uri->getBaseUrl(), $this->uri->getBasePath());
 			}
-
-			# create an array of object with the whole content of the folder
-			$structure = Folder::getFolderContentDetails($structure, $this->uri->getBaseUrl(), $this->uri->getBasePath());
-
+			
 			# cache navigation
 			$this->write->updateCache('cache', $filename, 'lastCache.txt', $structure);
 		}
-		
+				
 		$this->structure = $structure;
 		return true;
 	}

+ 1 - 1
system/Settings.php

@@ -43,7 +43,7 @@ class Settings
 			'contentFolder'							=> 'content',
 			'cache'									=> true,
 			'cachePath'								=> $rootPath . 'cache',
-			'version'								=> '1.2.4',
+			'version'								=> '1.2.5',
 			'setup'									=> true,
 			'welcome'								=> true
 		];

+ 1 - 1
system/author/layouts/layout.twig

@@ -34,6 +34,6 @@
 			<footer></footer>
 		</div>
 		<script src="{{ base_url }}/system/author/js/color-picker.min.js"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20180922"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20181007"></script>
 	</body>
 </html>

+ 8 - 8
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?20180914" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20181007" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -34,12 +34,12 @@
 			</article>
 			<footer></footer>		
 		</div>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/vue-editor.js?20180922"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20180922"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/vue-editor.js?20181007"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20181007"></script>
 	</body>
 </html>