diff options
| -rw-r--r-- | Makefile.example | 36 | ||||
| -rw-r--r-- | docs/changelog/css/combo.css | 3 | ||||
| -rw-r--r-- | docs/changelog/img/iggdrasil.png | bin | 30549 -> 24423 bytes | 
3 files changed, 33 insertions, 6 deletions
diff --git a/Makefile.example b/Makefile.example index 59b7b3b8e..7773481e6 100644 --- a/Makefile.example +++ b/Makefile.example @@ -4,6 +4,7 @@ NB_PROCESS=8  # if a virtualenv is used put the full python path  # e.g.: PYTHON=$$HOME/.virtualenvs/ishtar/bin/python  PYTHON=python3 +TMP='/tmp/tmp-ishtar'  export PATH := $(HOME)/bin/geckodriver:$(PATH)  # put name of your current project  project=example_project @@ -74,10 +75,39 @@ build_doc_model_graph:  build_doc_changelog:  	mkdir -p docs/changelog/build/ -	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 +	# generate menu +	rm -f $(TMP)-menu $(TMP)-menu-base.md +	touch $(TMP)-menu $(TMP)-menu-base.md +	echo "# Ishtar - changelog " >> $(TMP)-menu ; \ +	echo "# Ishtar - changelog " >> $(TMP)-menu-base.md ; \ +	for LANG in `ls changelog`; do \ +  		echo "- $$LANG: " >> $(TMP)-menu ; \ +  		echo "- $$LANG: " >> $(TMP)-menu-base.md ; \ +		for FILE in `ls -r changelog/$$LANG`; do \ +			EXTFILE="$${FILE%%.*}" ; \ +			DATE="$${EXTFILE##*_}" ; \ +			echo "[$$DATE](../$$LANG/$$EXTFILE.html) ; " >> $(TMP)-menu ; \ +			echo "[$$DATE]($$LANG/$$EXTFILE.html) ; " >> $(TMP)-menu-base.md ; \ +		done ;\ +	done +	echo "" >> $(TMP)-menu ; \ +	echo "---" >> $(TMP)-menu ; \ +	echo "" >> $(TMP)-menu ; \ +	pandoc --metadata title="Ishtar - changelog" --standalone --template docs/changelog/template.html $(TMP)-menu-base.md > docs/changelog/build/changelog.html ; \ +	# generate changelog +	for LANG in `ls changelog`; do \ +		mkdir -p docs/changelog/build/$$LANG ; \ +		ln -s ../img img ; mv img docs/changelog/build/$$LANG/ ; \ +		ln -s ../css css ; mv css docs/changelog/build/$$LANG/ ; \ +		for FILE in `ls changelog/$$LANG`; do \ +			cp $(TMP)-menu $(TMP).md ; \ +			FILE="$${FILE%%.*}" ; \ +			cat "changelog/$$LANG/$$FILE.md" >> $(TMP).md ; \ +			pandoc --metadata title="Ishtar - changelog" --standalone --template docs/changelog/template.html $(TMP).md > docs/changelog/build/$$LANG/$$FILE.html ; \ +		done ;\ +	done  build_doc: build_doc_values build_doc_model_graph build_doc_changelog ## generate documentation @@ -153,7 +183,7 @@ runalt:  ## run test server on port 9000  	cd $(project); $(PYTHON) manage.py runserver 0.0.0.0:9000  runcelery:  ## run a celery worker -	celery -A example_project worker -l INFO +	celery -A example_project worker -l INFO # -l DEBUG -f debug-celery.log  blackd:  ## blackd service  	$(VENV)bin/blackd diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index a53207390..67addc0d7 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -890,8 +890,5 @@ 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;  } diff --git a/docs/changelog/img/iggdrasil.png b/docs/changelog/img/iggdrasil.png Binary files differindex c07957393..e33f4b020 100644 --- a/docs/changelog/img/iggdrasil.png +++ b/docs/changelog/img/iggdrasil.png  | 
