From 77502c156596558c79bc6e8ad99bbb73a0f71349 Mon Sep 17 00:00:00 2001 From: trendschau Date: Fri, 27 May 2022 14:23:52 +0200 Subject: [PATCH 1/2] V 1.5.3.2 add glossary option to cyanine theme --- cache/securitylog.txt | 2 + composer.json | 2 +- composer.lock | 183 ++++++++++++++++-- themes/cyanine/cyanine.yaml | 12 ++ themes/cyanine/page.twig | 12 +- .../cyanine/partials/navigationGlossary.twig | 21 ++ 6 files changed, 216 insertions(+), 16 deletions(-) create mode 100644 cache/securitylog.txt create mode 100644 themes/cyanine/partials/navigationGlossary.twig diff --git a/cache/securitylog.txt b/cache/securitylog.txt new file mode 100644 index 0000000..7c402e6 --- /dev/null +++ b/cache/securitylog.txt @@ -0,0 +1,2 @@ +127.0.0.1;2022-05-26 22:14:00;wrong login +127.0.0.1;2022-05-26 22:14:07;wrong captcha http://localhost/typemill/tm/login diff --git a/composer.json b/composer.json index bf5529e..a7a19bd 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }, "require": { "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", diff --git a/composer.lock b/composer.lock index 3f7644a..11f5a79 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "7b59f60804ecefb2545c3ee2cb0583d6", "packages": [ { "name": "akrabat/proxy-detection-middleware", @@ -1125,6 +1125,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", @@ -1263,30 +1422,32 @@ }, { "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 +1486,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 +1498,7 @@ "type": "tidelift" } ], - "time": "2021-11-25T13:31:46+00:00" + "time": "2022-05-17T05:46:24+00:00" }, { "name": "vlucas/valitron", diff --git a/themes/cyanine/cyanine.yaml b/themes/cyanine/cyanine.yaml index 0da0c89..cb5538a 100644 --- a/themes/cyanine/cyanine.yaml +++ b/themes/cyanine/cyanine.yaml @@ -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) \ No newline at end of file diff --git a/themes/cyanine/page.twig b/themes/cyanine/page.twig index 6340c27..935fe65 100644 --- a/themes/cyanine/page.twig +++ b/themes/cyanine/page.twig @@ -109,15 +109,19 @@ {% endif %} - {% if item.elementType == 'folder' and item.contains == 'pages' %} + {% if item.elementType == 'folder' and metatabs.meta.glossary %} + + + + {% elseif item.elementType == 'folder' and item.contains == 'pages' %} - {% endif %} - - {% if item.elementType == 'folder' and item.contains == 'posts' %} + {% elseif item.elementType == 'folder' and item.contains == 'posts' %} {% include 'partials/posts.twig' %} diff --git a/themes/cyanine/partials/navigationGlossary.twig b/themes/cyanine/partials/navigationGlossary.twig new file mode 100644 index 0000000..f46f529 --- /dev/null +++ b/themes/cyanine/partials/navigationGlossary.twig @@ -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 %} +

{{ alphabet }}

+ {% endif %} +
  • + {{ element.name }} +
    • + {% endfor %} +{% endmacro %} + +{% import _self as macros %} + + \ No newline at end of file From 0670e9da26384ee09ff56bcbc3db75f190a02687 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sun, 29 May 2022 13:10:02 +0200 Subject: [PATCH 2/2] Version 1.5.3.2 Cyanine glossary style and update libraries --- cache/securitylog.txt | 1 + composer.json | 4 +- composer.lock | 169 +++++++++++++++++++++++++++++------- system/Settings.php | 2 +- themes/cyanine/cyanine.yaml | 2 +- themes/cyanine/layout.twig | 2 +- 6 files changed, 145 insertions(+), 35 deletions(-) diff --git a/cache/securitylog.txt b/cache/securitylog.txt index 7c402e6..99050d7 100644 --- a/cache/securitylog.txt +++ b/cache/securitylog.txt @@ -1,2 +1,3 @@ 127.0.0.1;2022-05-26 22:14:00;wrong login 127.0.0.1;2022-05-26 22:14:07;wrong captcha http://localhost/typemill/tm/login +127.0.0.1;2022-05-27 21:33:28;wrong login diff --git a/composer.json b/composer.json index a7a19bd..0cd8575 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ "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", diff --git a/composer.lock b/composer.lock index 11f5a79..9726ac3 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "7b59f60804ecefb2545c3ee2cb0583d6", + "content-hash": "cbf2ffca94a321670576fdc5d99bc9a5", "packages": [ { "name": "akrabat/proxy-detection-middleware", @@ -906,31 +906,39 @@ }, { "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,7 +986,86 @@ "type": "tidelift" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2022-05-05T15:33:49+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "shasum": "" + }, + "require": { + "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", @@ -1369,28 +1456,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\\": "" @@ -1413,12 +1508,26 @@ "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", diff --git a/system/Settings.php b/system/Settings.php index ad296ee..16c2ce6 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -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]], diff --git a/themes/cyanine/cyanine.yaml b/themes/cyanine/cyanine.yaml index cb5538a..f33057e 100644 --- a/themes/cyanine/cyanine.yaml +++ b/themes/cyanine/cyanine.yaml @@ -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 diff --git a/themes/cyanine/layout.twig b/themes/cyanine/layout.twig index 96d0c14..3b39b6d 100644 --- a/themes/cyanine/layout.twig +++ b/themes/cyanine/layout.twig @@ -16,7 +16,7 @@ {{ assets.activateTachyons() }} - +