From cbbe0c556de9b506dc69875110214c73189313d0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 17 May 2022 14:46:29 +0200 Subject: Update html changelog generation --- CHANGES-DEV.md | 9 +++++++-- Makefile.example | 5 +---- docs/changelog/css/combo.css | 6 ++++++ docs/changelog/img/iggdrasil.png | Bin 24423 -> 30549 bytes docs/changelog/template.html | 3 --- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGES-DEV.md b/CHANGES-DEV.md index 0d21815f1..bf52e8cb5 100644 --- a/CHANGES-DEV.md +++ b/CHANGES-DEV.md @@ -1,5 +1,10 @@ -Ishtar develop changelog -======================== +--- +title: Ishtar changelog +date: 2022-05-17 +--- + +Ishtar develop changelog v3.2 +============================= ### Features ### - Preventive forms for budget plan diff --git a/Makefile.example b/Makefile.example index 0224fbf8b..657b8ecba 100644 --- a/Makefile.example +++ b/Makefile.example @@ -77,6 +77,7 @@ build_doc_changelog: pandoc --standalone --template docs/changelog/template.html CHANGES.md > docs/changelog/build/changelog.html cp -r docs/changelog/css docs/changelog/build/ cp -r docs/changelog/img docs/changelog/build/ + pandoc --standalone --template docs/changelog/template.html CHANGES-DEV.md > docs/changelog/build/changelog-dev.html build_doc: build_doc_values build_doc_model_graph build_doc_changelog ## generate documentation @@ -89,10 +90,6 @@ soft_test: clean ## launch tests without database regeneration cd $(project); $(PYTHON) manage.py test -k --tag gis --exclude-tag ui $(apps) cd $(project); $(PYTHON) manage.py test -k --exclude-tag gis --exclude-tag ui $(apps) -soft_test_multi: clean ## launch multi-process tests without database regeneration - cd $(project); $(PYTHON) manage.py test -k --parallel $(NB_PROCESS) --tag gis $(apps) - cd $(project); $(PYTHON) manage.py test -k --parallel $(NB_PROCESS) --exclude-tag gis $(apps) - soft_test_verbose: clean ## launch tests without database regeneration - verbose cd $(project); $(PYTHON) manage.py test -k --verbosity 2 $(apps) diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 0c1e938dd..1a41b8c9d 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,3 +889,9 @@ nav ul li:hover, nav ul li.active { } } +body { + background-image: url("https://ishtar-archeo.net/changelog/img/iggdrasil.png"); + background-repeat: no-repeat; + background-position: calc(100% - 20px) 20px; + margin: 40px; +} \ No newline at end of file diff --git a/docs/changelog/img/iggdrasil.png b/docs/changelog/img/iggdrasil.png index e33f4b020..c07957393 100644 Binary files a/docs/changelog/img/iggdrasil.png and b/docs/changelog/img/iggdrasil.png differ diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 309f517ce..2a6361ba7 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,9 +9,6 @@ -

$body$

-- cgit v1.2.3