From 017e3a3762f20e09c5fd3b1b80321a3c7c7f6daf Mon Sep 17 00:00:00 2001 From: Marr11317 Date: Thu, 9 Apr 2020 18:47:00 -0400 Subject: [PATCH] documentation/doxygen: do not show Doxygen version 0 on empty index. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Co-authored-by: Vladimír Vondruš --- documentation/doxygen.py | 2 +- documentation/templates/doxygen/base.html | 2 +- documentation/test_doxygen/page_empty_index/Doxyfile | 4 +++- documentation/test_doxygen/page_empty_index/index.html | 9 +++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/documentation/doxygen.py b/documentation/doxygen.py index a0830be4..0560f51b 100755 --- a/documentation/doxygen.py +++ b/documentation/doxygen.py @@ -3603,7 +3603,7 @@ def run(state: State, *, templates=default_templates, wildcard=default_wildcard, compound.breadcrumb = [(state.doxyfile['PROJECT_NAME'], 'index.html')] template = env.get_template('page.html') rendered = template.render(compound=compound, - DOXYGEN_VERSION='0', + DOXYGEN_VERSION=None, FILENAME='index.html', SEARCHDATA_FORMAT_VERSION=searchdata_format_version, **state.doxyfile) diff --git a/documentation/templates/doxygen/base.html b/documentation/templates/doxygen/base.html index a1eee4c6..39ea7c26 100644 --- a/documentation/templates/doxygen/base.html +++ b/documentation/templates/doxygen/base.html @@ -152,7 +152,7 @@
{% if M_PAGE_FINE_PRINT == '[default]' %} -

{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created with Doxygen {{ DOXYGEN_VERSION }} and m.css.

+

{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created with {% if DOXYGEN_VERSION %}Doxygen {{ DOXYGEN_VERSION }} and {% endif %}m.css.

{% else %} {{ M_PAGE_FINE_PRINT|replace('{doxygen_version}', DOXYGEN_VERSION) }} {% endif %} diff --git a/documentation/test_doxygen/page_empty_index/Doxyfile b/documentation/test_doxygen/page_empty_index/Doxyfile index 07979766..b24370df 100644 --- a/documentation/test_doxygen/page_empty_index/Doxyfile +++ b/documentation/test_doxygen/page_empty_index/Doxyfile @@ -6,7 +6,9 @@ GENERATE_XML = YES XML_PROGRAMLISTING = NO CASE_SENSE_NAMES = YES -##! M_PAGE_FINE_PRINT = +# Keeping the default M_PAGE_FINE_PRINT to test that no "Doxygen version 0" is +# added to the footer. + ##! M_THEME_COLOR = ##! M_FAVICON = ##! M_LINKS_NAVBAR1 = diff --git a/documentation/test_doxygen/page_empty_index/index.html b/documentation/test_doxygen/page_empty_index/index.html index 0c441b48..cbc0947c 100644 --- a/documentation/test_doxygen/page_empty_index/index.html +++ b/documentation/test_doxygen/page_empty_index/index.html @@ -26,5 +26,14 @@
+ -- 2.30.2