mirror of
https://github.com/typemill/typemill.git
synced 2025-04-30 08:38:21 +02:00
Version 1.2.7: Reorder Content Blocks
This commit is contained in:
Sebastian
parent
2633ab69be
commit
d87fe9d0d9
2
cache/lastCache.txt
vendored
2
cache/lastCache.txt
vendored
@ -1 +1 @@
|
||||
1541750318
|
||||
1541856493
|
||||
22
composer.lock
generated
22
composer.lock
generated
@ -649,16 +649,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v3.4.17",
|
||||
"version": "v3.4.18",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
"reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
|
||||
"reference": "db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
|
||||
"reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14",
|
||||
"reference": "db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -708,11 +708,11 @@
|
||||
],
|
||||
"description": "Symfony EventDispatcher Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-07-26T09:06:28+00:00"
|
||||
"time": "2018-10-30T16:50:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.9.0",
|
||||
"version": "v1.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||
@ -770,16 +770,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.8.46",
|
||||
"version": "v2.8.47",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "5baf0f821b14eee8ca415e6a0361a9fa140c002c"
|
||||
"reference": "0e16589861f192dbffb19b06683ce3ef58f7f99d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/5baf0f821b14eee8ca415e6a0361a9fa140c002c",
|
||||
"reference": "5baf0f821b14eee8ca415e6a0361a9fa140c002c",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/0e16589861f192dbffb19b06683ce3ef58f7f99d",
|
||||
"reference": "0e16589861f192dbffb19b06683ce3ef58f7f99d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -816,7 +816,7 @@
|
||||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-08-29T13:11:53+00:00"
|
||||
"time": "2018-10-02T16:27:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
# Setup the System
|
||||
|
||||
Typemil is a flat file cms that runs out of the box without a complicated installation process. You can create a user account with the [simple setup page](/setup) and then login to the author panel. In the author panel, you can configure your page, use plugins, choose a theme and edit your content.
|
||||
Typemil is a flat file cms that runs out of the box without a complicated installation process. You can create a user account with the [simple setup page](/setup) and then login to the author panel. In the author panel, you can configure your website, use plugins, choose a theme and edit your content.
|
||||
|
||||
## If it does not work
|
||||
|
||||
If you face any problems, then please make sure, that your system meets these requirements:
|
||||
If you face any problems, then please make sure, that your system supports these features:
|
||||
|
||||
- PHP version 7+.
|
||||
- Apache Server.
|
||||
- Apache server.
|
||||
- The module `mod_rewrite` and `htaccess`.
|
||||
|
||||
If you run a linux-systems like Debian or Ubuntu, then please double check that `mod_rewrite` or `htaccess` are activated. Check this issue on GitHub for help.
|
||||
If you run a linux-system like Debian or Ubuntu, then please double check that `mod_rewrite` and `htaccess` are activated. Check this [issue on GitHub](https://github.com/trendschau/typemill/issues/16) for help.
|
||||
|
||||
Please make the following folders writable with permission 774 (you can use your ftp-software for it):
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
["# demo page","Typemil is a flat file cms that runs out of the box without a complicated installation process. You can create a user account with the [simple setup page](\/setup) and then login to the author panel. In the author panel, you can configure your page, use plugins, choose a theme and edit your content.","## Headline","* This is\n* A list"]
|
||||
@ -12,7 +12,7 @@ However, there are some limitations when you try to reorder elements, for exampl
|
||||
|
||||
You can create and format your content with the Markdown syntax, that is similar to the markup syntax of wikipedia. If you are not familiar with Markdown, then please read the short [Markdown-tutorial](https://typemill.net/) in the documentation of Typemill. You can learn Markdown in less than 10 minutes and there is no easier and faster way to format your webpage. You will love it!
|
||||
|
||||
Typemill provides two edit modes: The **raw mode** and the **visual mode**. You can switch between the modes in the publish-bar at the bottom of each page. The **raw mode** is the most robust way to create your content, because you write raw markdown into a simple input area. The **visual mode** is experimental right now. It uses blocks and transforms each content block into a html-preview immediately, so that you can directly see the formatted result.
|
||||
Typemill provides two edit modes: The **raw mode** and the **visual mode**. You can switch between the modes in the publish-bar at the bottom of each page. The **raw mode** is the most robust way to create your content, because you write raw markdown into a simple textarea. The **visual mode** is experimental right now. It uses blocks and transforms each content block into a html-preview immediately, so that you can directly see the formatted result.
|
||||
|
||||
By default Typemill will use the raw mode. But you can change this behavior in the system settings and use the visual editor as default mode.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Welcome to Typemill
|
||||
|
||||
Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system.
|
||||
Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a handy and productive writing-system.
|
||||
|
||||
Before you start, please read the short introduction about "writing content". Or simply play around, I hope that Typemill is already quite intuitive to use...
|
||||
Read the short introduction about "writing content" before you start or simply play around and try it out.
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
["# Welcome to Typemill","Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system.","Before you start, please read the short introduction about \"writing content\". Or simply play around, I hope that Typemill is already quite intuitive to use..."]
|
||||
20
readme.md
20
readme.md
@ -1,8 +1,8 @@
|
||||
# About TYPEMILL
|
||||
|
||||
TYPEMILL is a small flat file cms designed for writers. It creates websites based on markdown files and can be used for manuals, documentations, web-books and similar publications. The website http://typemill.net itself is an example-website for TYPEMILL.
|
||||
TYPEMILL is a small flat file cms created for editors and writers. It generates websites based on markdown files and can be used for manuals, documentations, web-books and similar publications. The website http://typemill.net itself is an example-website for TYPEMILL.
|
||||
|
||||
|
||||
|
||||
|
||||
## Features
|
||||
|
||||
@ -15,13 +15,22 @@ TYPEMILL is a small flat file cms designed for writers. It creates websites base
|
||||
* Supports configurable themes and plugins.
|
||||
* Provides an author panel to configure the system, the themes and the plugins.
|
||||
* Creates and manages users.
|
||||
* Provides a basic online editing (only for existing files so far, in development).
|
||||
* Provides a pure markdown editor.
|
||||
* Provides a visual markdown editing mode (experimental).
|
||||
* Markdown supports table of contents (TOC), tables, footnotes, abbreviations and definition lists.
|
||||
* Supports MathJax and KaTeX (plugin).
|
||||
* Supports code highlighting (plugin).
|
||||
* Supports Matomo/Piwik and Google Analytics (plugin).
|
||||
* Supports Cookie Consent (plugin).
|
||||
|
||||
## Requirements
|
||||
|
||||
* PHP 7+
|
||||
* Apache server
|
||||
* mod_rewrite and htaccess
|
||||
|
||||
If you run a linux system, then please double check that mod_rewrite and htaccess are active!!!
|
||||
|
||||
## Installation
|
||||
|
||||
Download TYPEMILL from the [TYPEMILL website](http://typemill.net), unzip the files and you are done.
|
||||
@ -33,6 +42,7 @@ If you are a developer, you can also clone this repository. To do so, open your
|
||||
The GitHub-version has no vendor-folder, so you have to update and include all libraries and dependencies with composer. To do so, open your command line, go to your TYPEMILL folder and type:
|
||||
|
||||
composer update
|
||||
|
||||
If you did not use composer before, please go to the [composer website](http://getcomposer.org) and start to learn.
|
||||
|
||||
To run TYPEMILL on a **live** system, simply upload the files to your server.
|
||||
@ -45,10 +55,6 @@ Please go to `your-typemill-website.com/setup`, create an initial user and then
|
||||
|
||||
You can find your login screen under `/tm/login` or simply go to `/setup` and you will be redirected to the login-page.
|
||||
|
||||
## Requirements
|
||||
|
||||
Your server should run with PHP 5.6 or newer. No database is required.
|
||||
|
||||
## Documentation
|
||||
|
||||
You can read the full documentation for writers, for theme developers and for plugin developers on the [TYPEMILL website](http://typemill.net).
|
||||
|
||||
@ -44,7 +44,7 @@ class Settings
|
||||
'contentFolder' => 'content',
|
||||
'cache' => true,
|
||||
'cachePath' => $rootPath . 'cache',
|
||||
'version' => '1.2.6',
|
||||
'version' => '1.2.7',
|
||||
'setup' => true,
|
||||
'welcome' => true
|
||||
];
|
||||
|
||||
@ -714,7 +714,6 @@ button[type="button"].theme-button:hover{
|
||||
border:0px;
|
||||
border-top: 0px;
|
||||
}
|
||||
|
||||
.button{
|
||||
color: #fff;
|
||||
padding: 10px;
|
||||
@ -1572,7 +1571,12 @@ label .help, .label .help{
|
||||
sup{}
|
||||
cite{}
|
||||
abbr{}
|
||||
hr{}
|
||||
hr{
|
||||
background: #ddd;
|
||||
height: 2px;
|
||||
margin: 20px 0;
|
||||
border: 0px;
|
||||
}
|
||||
.blox ul.TOC,.blox .TOC ul{
|
||||
list-style: none;
|
||||
padding-left: 0px;
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
</article>
|
||||
<footer></footer>
|
||||
</div>
|
||||
<script src="{{ base_url }}/system/author/js/color-picker.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/color-picker.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181110"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -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?20181030" />
|
||||
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20181110" />
|
||||
<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
|
||||
</head>
|
||||
<body>
|
||||
@ -35,12 +35,12 @@
|
||||
<footer></footer>
|
||||
</div>
|
||||
<script src="{{ base_url }}/system/author/js/vue.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-blox.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-blox.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181110"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -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?20181030" />
|
||||
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20181110" />
|
||||
<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
|
||||
</head>
|
||||
<body>
|
||||
@ -32,15 +32,15 @@
|
||||
<article>
|
||||
{% block content %}{% endblock %}
|
||||
</article>
|
||||
<footer></footer>
|
||||
<footer></footer>
|
||||
</div>
|
||||
<script src="{{ base_url }}/system/author/js/vue.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-editor.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181030"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/author.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-editor.js?20181110"></script>
|
||||
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181110"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -99,7 +99,7 @@ html{
|
||||
}
|
||||
body{
|
||||
padding: 20px;
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
}
|
||||
.main{
|
||||
display: block;
|
||||
@ -739,7 +739,7 @@ img.myClass{
|
||||
overflow: visible;
|
||||
}
|
||||
body{
|
||||
font-size: 20px;
|
||||
font-size: 18px;
|
||||
}
|
||||
header, aside{
|
||||
width: 20%;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user