Skip to content

Commit

Permalink
Merge pull request #77 from TYPO3-Documentation/develop
Browse files Browse the repository at this point in the history
Add 'PAGE CONTENTS', fix Makefile
  • Loading branch information
marble authored May 20, 2020
2 parents 726c1ff + aa47ed8 commit 614b9f7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ Next release
...


4.2.1 (2020-05-20)
==================

* Add PAGE CONTENTS above the menu of intra-page links


4.2.0 (2020-05-08)
==================

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ clean-test: ##- Remove test and coverage artifacts

.PHONY: coverage
coverage: ##- Check code coverage quickly with default Python
coverage run --source src -m pytest
coverage run --source sphinx_typo3_theme -m pytest
coverage report -m
coverage html
$(BROWSER) htmlcov/index.html
Expand Down Expand Up @@ -133,7 +133,7 @@ install-for-dev: clean uninstall ## Clean, uninstall and pip install -e for deve
.PHONY: lint
lint: ## Check Python style
flake8 *.py
flake8 src
flake8 sphinx_typo3_theme
flake8 tests


Expand All @@ -142,13 +142,13 @@ lm: lint-minimal
lint-minimal: ## Check Python style for minimal standards (alias lm)
flake8 *.py --count --select=E9,F63,F7,F82 --show-source --statistics
echo
flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics
flake8 sphinx_typo3_theme --count --select=E9,F63,F7,F82 --show-source --statistics
echo
flake8 tests --count --select=E9,F63,F7,F82 --show-source --statistics
echo
flake8 *.py --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
echo
flake8 src --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
flake8 sphinx_typo3_theme --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
echo
flake8 tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
echo
Expand Down
3 changes: 3 additions & 0 deletions sphinx_typo3_theme/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@
{%- if toctree %}
{{ toctree }}
{%- endif %}
{%- if toc %}
<p class="caption"><span class="caption-text">PAGE CONTENTS</span></p>
{{ toc }}
{%- endif %}
{%- endblock -%}
<!-- /menu -->
</div>
Expand Down

0 comments on commit 614b9f7

Please sign in to comment.