1
0
mirror of https://github.com/typemill/typemill.git synced 2025-01-16 21:08:20 +01:00

changes 1.5.3.2

This commit is contained in:
trendschau 2022-06-12 22:41:20 +02:00
parent 3273c610df
commit e19a5c72d0
9 changed files with 391 additions and 82 deletions

View File

@ -9,13 +9,14 @@
"vendor-dir": "system/vendor"
},
"require": {
"php": "^7.4|^8.0",
"slim/slim": "~3.7",
"twig/twig": "~1.18",
"twig/twig": "^2.0",
"slim/twig-view": "~2.3",
"slim/flash": "~0.4",
"slim/csrf": "~0.8",
"symfony/yaml": "~2.8",
"symfony/event-dispatcher": "~3.3",
"symfony/yaml": "~5.0",
"symfony/event-dispatcher": "~4.0",
"erusev/parsedown": "~1.4",
"erusev/parsedown-extra": "dev-master",
"jbroadway/urlify": "1.1.3",

400
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "bc8436c1ed1a0ea8333205185da466f4",
"content-hash": "9e90c5a7b64a3c990e19b1c706dae0af",
"packages": [
{
"name": "akrabat/proxy-detection-middleware",
@ -839,25 +839,25 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.5.0",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"shasum": ""
},
"require": {
"php": ">=7.1"
"php": ">=8.0.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.5-dev"
"dev-main": "3.0-dev"
},
"thanks": {
"name": "symfony/contracts",
@ -886,7 +886,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
},
"funding": [
{
@ -902,35 +902,43 @@
"type": "tidelift"
}
],
"time": "2021-07-12T14:48:14+00:00"
"time": "2022-01-02T09:55:41+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.4.47",
"version": "v4.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "31fde73757b6bad247c54597beef974919ec6860"
"reference": "708e761740c16b02c86e3f0c932018a06b895d40"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860",
"reference": "31fde73757b6bad247c54597beef974919ec6860",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/708e761740c16b02c86e3f0c932018a06b895d40",
"reference": "708e761740c16b02c86e3f0c932018a06b895d40",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
"php": ">=7.1.3",
"symfony/event-dispatcher-contracts": "^1.1",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"symfony/dependency-injection": "<3.3"
"symfony/dependency-injection": "<3.4"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.8|~3.0|~4.0",
"symfony/debug": "~3.4|~4.4",
"symfony/dependency-injection": "~3.3|~4.0",
"symfony/expression-language": "~2.8|~3.0|~4.0",
"symfony/stopwatch": "~2.8|~3.0|~4.0"
"psr/log": "^1|^2|^3",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/error-handler": "~3.4|~4.4",
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/service-contracts": "^1.1|^2",
"symfony/stopwatch": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/dependency-injection": "",
@ -959,10 +967,10 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v3.4.47"
"source": "https://github.com/symfony/event-dispatcher/tree/v4.4.42"
},
"funding": [
{
@ -978,26 +986,103 @@
"type": "tidelift"
}
],
"time": "2020-10-24T10:57:07+00:00"
"time": "2022-05-05T15:33:49+00:00"
},
{
"name": "symfony/finder",
"version": "v5.4.3",
"name": "symfony/event-dispatcher-contracts",
"version": "v1.1.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e",
"reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-php80": "^1.16"
"php": ">=7.1.3"
},
"suggest": {
"psr/event-dispatcher": "",
"symfony/event-dispatcher-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",
"url": "https://github.com/symfony/contracts"
}
},
"autoload": {
"psr-4": {
"Symfony\\Contracts\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Generic abstractions related to dispatching event",
"homepage": "https://symfony.com",
"keywords": [
"abstractions",
"contracts",
"decoupling",
"interfaces",
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.12"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2022-01-02T09:41:36+00:00"
},
{
"name": "symfony/finder",
"version": "v6.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "af7edab28d17caecd1f40a9219fc646ae751c21f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/af7edab28d17caecd1f40a9219fc646ae751c21f",
"reference": "af7edab28d17caecd1f40a9219fc646ae751c21f",
"shasum": ""
},
"require": {
"php": ">=8.0.2"
},
"type": "library",
"autoload": {
@ -1025,7 +1110,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v5.4.3"
"source": "https://github.com/symfony/finder/tree/v6.0.8"
},
"funding": [
{
@ -1041,7 +1126,7 @@
"type": "tidelift"
}
],
"time": "2022-01-26T16:34:36+00:00"
"time": "2022-04-15T08:07:58+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -1125,6 +1210,165 @@
],
"time": "2021-10-20T20:35:02+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
"reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"provide": {
"ext-mbstring": "*"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2021-11-30T18:21:41+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php72\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2021-05-27T09:17:38+00:00"
},
{
"name": "symfony/polyfill-php80",
"version": "v1.25.0",
@ -1210,28 +1454,36 @@
},
{
"name": "symfony/yaml",
"version": "v2.8.52",
"version": "v5.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "02c1859112aa779d9ab394ae4f3381911d84052b"
"reference": "e80f87d2c9495966768310fc531b487ce64237a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/02c1859112aa779d9ab394ae4f3381911d84052b",
"reference": "02c1859112aa779d9ab394ae4f3381911d84052b",
"url": "https://api.github.com/repos/symfony/yaml/zipball/e80f87d2c9495966768310fc531b487ce64237a2",
"reference": "e80f87d2c9495966768310fc531b487ce64237a2",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/polyfill-ctype": "~1.8"
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"symfony/console": "<5.3"
},
"require-dev": {
"symfony/console": "^5.3|^6.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
"bin": [
"Resources/bin/yaml-lint"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
@ -1254,39 +1506,55 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v2.8.52"
"source": "https://github.com/symfony/yaml/tree/v5.4.3"
},
"time": "2018-11-11T11:18:13+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2022-01-26T16:32:32+00:00"
},
{
"name": "twig/twig",
"version": "v1.44.6",
"version": "v2.15.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "ae39480f010ef88adc7938503c9b02d3baf2f3b3"
"reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ae39480f010ef88adc7938503c9b02d3baf2f3b3",
"reference": "ae39480f010ef88adc7938503c9b02d3baf2f3b3",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
"reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-ctype": "^1.8"
"php": ">=7.1.3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php72": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9"
"symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.44-dev"
"dev-master": "2.15-dev"
}
},
"autoload": {
@ -1325,7 +1593,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v1.44.6"
"source": "https://github.com/twigphp/Twig/tree/v2.15.1"
},
"funding": [
{
@ -1337,7 +1605,7 @@
"type": "tidelift"
}
],
"time": "2021-11-25T13:31:46+00:00"
"time": "2022-05-17T05:46:24+00:00"
},
{
"name": "vlucas/valitron",
@ -1345,12 +1613,12 @@
"source": {
"type": "git",
"url": "https://github.com/vlucas/valitron.git",
"reference": "9bf11f4374f722b78f69b1d36f5fd9154bb6bffa"
"reference": "d0fb8ee84c96f68dcd06983475838780aed5c6c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/valitron/zipball/9bf11f4374f722b78f69b1d36f5fd9154bb6bffa",
"reference": "9bf11f4374f722b78f69b1d36f5fd9154bb6bffa",
"url": "https://api.github.com/repos/vlucas/valitron/zipball/d0fb8ee84c96f68dcd06983475838780aed5c6c7",
"reference": "d0fb8ee84c96f68dcd06983475838780aed5c6c7",
"shasum": ""
},
"require": {
@ -1397,7 +1665,7 @@
"type": "tidelift"
}
],
"time": "2021-12-07T08:05:12+00:00"
"time": "2022-03-16T09:16:07+00:00"
}
],
"packages-dev": [],
@ -1409,7 +1677,9 @@
},
"prefer-stable": true,
"prefer-lowest": false,
"platform": [],
"platform": {
"php": "^7.4|^8.0"
},
"platform-dev": [],
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}

View File

@ -84,7 +84,7 @@ class Settings
'editor' => 'visual',
'formats' => ['markdown', 'headline', 'ulist', 'olist', 'table', 'quote', 'notice', 'image', 'video', 'file', 'toc', 'hr', 'definition', 'code', 'shortcode'],
'contentFolder' => 'content',
'version' => '1.5.3.1',
'version' => '1.5.3.2',
'setup' => true,
'welcome' => true,
'images' => ['live' => ['width' => 820], 'thumbs' => ['width' => 250, 'height' => 150]],

View File

@ -8,7 +8,7 @@ let editor = new Vue({
},
form: {
title: document.getElementById("title").value,
content: document.getElementById("content").innerHTML,
content: document.getElementById("content").textContent,
},
showEditor: 'show',
},

View File

@ -521,11 +521,11 @@ form input[type="submit"],form button,form .button{
font-size: 1em;
border: 0;
margin-top: 1.5em;
color: #fff;
background: rgba(0,0,0);
width: 100%;
padding: 15px;
}
form input[type="submit"]:hover,form button:hover,.button:hover{
background: rgba(0, 0, 0, 0.8);
opacity: .8;
}

View File

@ -1,5 +1,5 @@
name: Cyanine Theme
version: 1.1.11
version: 1.1.12
description: Cyanine is a modern and flexible multi-purpose theme and the standard theme for typemill.
author: Trendschau
homepage: https://trendschau.net
@ -505,3 +505,15 @@ forms:
label: Color for notices
checkboxlabel: Use grayscale color schema for notices
fieldsize: half
metatabs:
meta:
fields:
fieldsetGlossary:
type: fieldset
legend: Glossary Style
fields:
glossary:
type: checkbox
label: Glossary List (only for folders)
checkboxlabel: List pages or posts of this folder as glossary (only for folders)

View File

@ -16,7 +16,7 @@
{{ assets.activateTachyons() }}
<link rel="stylesheet" href="{{ base_url }}/themes/cyanine/css/style.css?20220108" />
<link rel="stylesheet" href="{{ base_url }}/themes/cyanine/css/style.css?20220527" />
<style>
@ -75,10 +75,10 @@
/*******************
** COLORS **
*******************/
body,.landingpagecontrast,.account{
body,.landingpagecontrast,.account,form input[type="submit"],from button,form .button{
background: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
main, footer, .landingpageintro, .landingpageinfo, .landingpageteaser, .landingpagenavi, .landingpagecontrast, .landingpagenews{
main, footer, .landingpageintro, .landingpageinfo, .landingpageteaser, .landingpagenavi, .landingpagecontrast, .landingpagenews,form input[type="submit"],from button,form .button{
border-color: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited{
@ -86,7 +86,8 @@
}
body,.landingpagecontrast, a,
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited,
.account, .account a, .account a:link, .account a:hover, .account a:focus, .account a:visited{
.account, .account a, .account a:link, .account a:hover, .account a:focus, .account a:visited,
form input[type="submit"],from button,form .button{
color: {{ settings.themes.cyanine.fontcolorprimary|default('#F7F7F7') }};
}
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited{

View File

@ -109,15 +109,19 @@
{% endif %}
{% if item.elementType == 'folder' and item.contains == 'pages' %}
{% if item.elementType == 'folder' and metatabs.meta.glossary %}
<nav class="f4-l f5">
{% include 'partials/navigationGlossary.twig' with {'glossary': item.folderContent} %}
</nav>
{% elseif item.elementType == 'folder' and item.contains == 'pages' %}
<nav class="f4-l f5">
{% include 'partials/navigationFlat.twig' with {'flatnavi': item.folderContent} %}
</nav>
{% endif %}
{% if item.elementType == 'folder' and item.contains == 'posts' %}
{% elseif item.elementType == 'folder' and item.contains == 'posts' %}
{% include 'partials/posts.twig' %}

View File

@ -0,0 +1,21 @@
{% macro loop_over(navigation) %}
{% import _self as macros %}
{% set alphabet = 'ß' %}
{% for element in navigation|sort((a, b) => a.name <=> b.name) %}
{% if element.name|first|upper != alphabet %}
{% set alphabet = element.name|first|upper %}
<h2>{{ alphabet }}</h2>
{% endif %}
<li class="w-100 pa3 pa0-l">
<a class="link relative dib w-100" href="{{ element.urlAbs }}">{{ element.name }}</a>
</li>
{% endfor %}
{% endmacro %}
{% import _self as macros %}
<ul class="list pa0 flex-m flex-l flex-wrap tl justify-between">
{{ macros.loop_over(glossary) }}
</ul>