mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-10-16 07:06:07 +02:00
Code Issues Releases Wiki Activity

Version 1.2.12: Add Content Blocks Everywhere

Browse Source
This commit is contained in:
Sebastian
2019-04-13 09:38:15 +02:00
parent b8196122d8
commit ba360f6102
9 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Settings.php
View File

@@ -47,7 +47,7 @@ class Settings
'contentFolder' => 'content',
'cache' => true,
'cachePath' => $rootPath . 'cache',
'version' => '1.2.11',
'version' => '1.2.12',
'setup' => true,
'welcome' => true,
'images' => ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]],

2
system/author/auth/welcome.twig
View File

@@ -11,7 +11,7 @@
<h1>Hurra!</h1>
<p>Your account has been created and you are logged in now.</p>
<p><strong>Next step:</strong> Visit the author panel and setup your new website. You can configure the system, choose themes and add plugins.</p>
<p><strong>New:</strong>With this latest version you can add a new content block with the visual editor everywhere on a page, not just at the end of the text. Sounds natural, but was pretty hard to code :)</p>
<p><strong>New:</strong>With this latest version you can add a new content block with the visual editor everywhere on a page, not just at the end of the text. Sounds natural, but was pretty hard to code :) </p>
<p><strong>Get help:</strong> If you have any questions, please consult the <a target="_blank" href="https://typemill.net/typemill"><i class="icon-link-ext"></i> docs</a> or open a new issue on <a target="_blank" href="https://github.com/typemill/typemill"><i class="icon-link-ext"></i> github</a>.</p>
</div>
<a class="button" href="{{ path_for('settings.show') }}">Configure your website</a>

2
system/author/editor/editor-blox.twig
View File

@@ -20,7 +20,7 @@
{% for block in content %}
<div class="blox" >{{block}}</div>
{% endfor %}
</div>
<content-block class="title" :body="false">

2
system/author/js/vue-blox.js
View File

@@ -68,7 +68,7 @@ const contentComponent = Vue.component('content-block', {
this.$root.$data.bloxOverlay = false;
this.$root.$data.newblock = false;
this.newblock = false;
self.$root.sortable.option("disabled", false);
self.$root.sortable.option("disabled", false);
this.$root.$data.html.splice(bloxid,1);
this.$root.$data.markdown.splice(bloxid,1);

4
system/author/layouts/layout.twig
View File

@@ -35,7 +35,7 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/color-picker.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/color-picker.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
</body>
</html>

2
system/author/layouts/layoutAuth.twig
View File

@@ -29,6 +29,6 @@
{% block content %}{% endblock %}
</div>
<script src="{{ base_url }}/system/author/js/auth.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/auth.js?20190412"></script>
</body>
</html>

18
system/author/layouts/layoutBlox.twig
View File

@@ -36,14 +36,14 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/vue.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-blox.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/lazy-video.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-blox.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/lazy-video.js?20190412"></script>
</body>
</html>

18
system/author/layouts/layoutEditor.twig
View File

@@ -19,7 +19,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?20190217" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190412" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
</head>
<body>
@@ -36,13 +36,13 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/vue.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-editor.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20190217"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-editor.js?20190412"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20190412"></script>
</body>
</html>