0ct0pu5/typemill
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version 1.4.3: Update JS-Libraries

Browse source
This commit is contained in:
trendschau 2020-12-09 22:05:13 +01:00
parent 90420a7500
commit 1d9d2837a9
12 changed files with 57 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
content/00-welcome/04-test.txt Normal file
View file

@ -0,0 +1 @@
["# test","Content mit neuem Stuff"]

9
content/00-welcome/04-test.yaml Normal file
View file

@ -0,0 +1,9 @@
meta:
title: ''
description: ''
owner: trendschau
author: 'Sebastian Schürmanns'
created: '2020-12-08'
time: 20-33-08
navtitle: test
modified: '2020-12-08'

4
system/Controllers/BlockApiController.php
View file

@ -490,7 +490,7 @@ class BlockApiController extends ContentController
# minimum permission is that user is allowed to update his own content
if(!$this->c->acl->isAllowed($_SESSION['role'], 'mycontent', 'update'))
{
return $response->withJson(array('data' => false, 'errors' => ['message' => 'You are not allowed to publish content.']), 403);
return $response->withJson(array('data' => false, 'errors' => ['message' => 'You are not allowed to delete this content.']), 403);
}
# set structure
@ -507,7 +507,7 @@ class BlockApiController extends ContentController
# check ownership. This code should nearly never run, because there is no button/interface to trigger it.
if(!$this->checkContentOwnership())
{
return $response->withJson(array('data' => false, 'errors' => ['message' => 'You are not allowed to delete content.']), 403);
return $response->withJson(array('data' => false, 'errors' => ['message' => 'You are not allowed to delete this content.']), 403);
}
}

10
system/author/js/axios.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
system/author/js/sortable.min.js vendored
View file

File diff suppressed because one or more lines are too long

83
system/author/js/vue-blox.js
View file

@ -31,7 +31,6 @@ const contentComponent = Vue.component('content-block', {
compmarkdown: '',
componentType: '',
disabled: false,
//fix load: false,
newblock: false,
}
},
@ -312,6 +311,7 @@ const contentComponent = Vue.component('content-block', {
var method = 'PUT';
}
sendJson(function(response, httpStatus)
{
if(httpStatus == 400)
@ -415,56 +415,41 @@ const contentComponent = Vue.component('content-block', {
var bloxid = bloxeditor.getElementsByClassName('blox')[0].dataset.id;
var self = this;
var url = self.$root.$data.root + '/api/v1/block';
var params = {
'url': document.getElementById("path").value,
'block_id': bloxid,
'csrf_name': document.getElementById("csrf_name").value,
'csrf_value': document.getElementById("csrf_value").value,
};
var method = 'DELETE';
sendJson(function(response, httpStatus)
{
if(httpStatus == 400)
{
self.$root.$data.unsafed = false;
self.activatePage();
publishController.errors.message = "Looks like you are logged out. Please login and try again.";
}
if(response)
{
self.$root.$data.unsafed = false;
self.activatePage();
var result = JSON.parse(response);
if(result.errors)
{
publishController.errors.message = result.errors.message;
}
else
{
self.switchToPreviewMode();
self.$root.$data.html.splice(bloxid,1);
self.$root.$data.markdown.splice(bloxid,1);
self.$root.$data.blockMarkdown = '';
self.$root.$data.blockType = '';
/* update the table of content if in result */
if(result.toc)
{
self.$root.$data.html.splice(result.toc.id, 1, result.toc);
}
/* update the navigation and mark navigation item as modified */
navi.getNavi();
}
myaxios.delete('/api/v1/block',{
data: {
'url': document.getElementById("path").value,
'block_id': bloxid,
'csrf_name': document.getElementById("csrf_name").value,
'csrf_value': document.getElementById("csrf_value").value,
}
})
.then(function (response)
{
self.$root.$data.unsafed = false;
self.activatePage();
self.switchToPreviewMode();
self.$root.$data.html.splice(bloxid,1);
self.$root.$data.markdown.splice(bloxid,1);
self.$root.$data.blockMarkdown = '';
self.$root.$data.blockType = '';
/* update the table of content if in result */
if(response.data.toc)
{
self.$root.$data.html.splice(response.data.toc.id, 1, response.data.toc);
}
}, method, url, params);
/* update the navigation and mark navigation item as modified */
navi.getNavi();
})
.catch(function (error)
{
if(error.response)
{
publishController.errors.message = error.response.data.errors.message;
}
});
},
},
})

3
system/author/js/vuedraggable.umd.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
system/author/layouts/layout.twig
View file

@ -16,7 +16,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<!-- <link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" /> -->
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20201130" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201130" />

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

@ -17,7 +17,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<!-- <link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" /> -->
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201130" />
{{ assets.renderCSS() }}

2
system/author/layouts/layoutBlank.twig
View file

@ -16,7 +16,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<!-- <link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" /> -->
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201130" />
</head>

2
system/author/layouts/layoutBlox.twig
View file

@ -16,7 +16,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<!-- <link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" /> -->
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201130" />

2
system/author/layouts/layoutEditor.twig
View file

@ -16,7 +16,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<!-- <link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" /> -->
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201130" />
{{ assets.renderCSS() }}