From bca44d7ce86b417d6455a8a88a6bd166d3c97acf Mon Sep 17 00:00:00 2001 From: Maryna Balioura Date: Sun, 19 Nov 2023 20:52:17 +0100 Subject: [PATCH] export/html: update Header component --- .../html/templates/components/header/_usage_example.jinja | 2 +- strictdoc/export/html/templates/components/header/index.jinja | 2 +- .../export/html/templates/screens/project_index/index.jinja | 2 +- .../html/templates/screens/project_statistics/index.jinja | 4 +--- .../html/templates/screens/requirements_coverage/index.jinja | 2 +- strictdoc/export/html/templates/screens/search/index.jinja | 2 +- .../html/templates/screens/source_file_coverage/index.jinja | 2 +- .../html/templates/screens/source_file_view/index.jinja | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/strictdoc/export/html/templates/components/header/_usage_example.jinja b/strictdoc/export/html/templates/components/header/_usage_example.jinja index 132834e9d..6d0109863 100644 --- a/strictdoc/export/html/templates/components/header/_usage_example.jinja +++ b/strictdoc/export/html/templates/components/header/_usage_example.jinja @@ -1,6 +1,6 @@ {# header__items=["template1.jinja", "template2.jinja"], - header__pagetype=true, + header__pagetype="string", header__last="template.jinja" #} diff --git a/strictdoc/export/html/templates/components/header/index.jinja b/strictdoc/export/html/templates/components/header/index.jinja index 0f20ffd9f..f83f567b1 100644 --- a/strictdoc/export/html/templates/components/header/index.jinja +++ b/strictdoc/export/html/templates/components/header/index.jinja @@ -17,7 +17,7 @@ {%- endif -%} {# 2: pagetype #} - {%- if header__pagetype is true and template_type is defined -%} + {%- if header__pagetype is defined -%} {% include "_res/svg__separator.jinja.html" %} {% include "components/header/header_pagetype.jinja" %} {%- endif -%} diff --git a/strictdoc/export/html/templates/screens/project_index/index.jinja b/strictdoc/export/html/templates/screens/project_index/index.jinja index f9fae1815..8aef917ee 100644 --- a/strictdoc/export/html/templates/screens/project_index/index.jinja +++ b/strictdoc/export/html/templates/screens/project_index/index.jinja @@ -35,7 +35,7 @@ {% block header_content %} {%- with - header__pagetype=true, + header__pagetype=template_type, header__last="screens/project_index/actions.jinja" -%} {% include "components/header/index.jinja" %} diff --git a/strictdoc/export/html/templates/screens/project_statistics/index.jinja b/strictdoc/export/html/templates/screens/project_statistics/index.jinja index 87979b209..4b533e320 100644 --- a/strictdoc/export/html/templates/screens/project_statistics/index.jinja +++ b/strictdoc/export/html/templates/screens/project_statistics/index.jinja @@ -23,9 +23,7 @@ {% endblock layout_nav %} {% block header_content %} - {%- with - header__pagetype=true - -%} + {%- with header__pagetype=template_type -%} {% include "components/header/index.jinja" %} {%- endwith -%} {% endblock header_content %} diff --git a/strictdoc/export/html/templates/screens/requirements_coverage/index.jinja b/strictdoc/export/html/templates/screens/requirements_coverage/index.jinja index 05d05058f..280337e84 100644 --- a/strictdoc/export/html/templates/screens/requirements_coverage/index.jinja +++ b/strictdoc/export/html/templates/screens/requirements_coverage/index.jinja @@ -28,7 +28,7 @@ {% endblock tree_content %} {% block header_content %} - {%- with header__pagetype=true -%} + {%- with header__pagetype=template_type -%} {% include "components/header/index.jinja" %} {%- endwith -%} {% endblock header_content %} diff --git a/strictdoc/export/html/templates/screens/search/index.jinja b/strictdoc/export/html/templates/screens/search/index.jinja index 064ead1de..ee35b332f 100644 --- a/strictdoc/export/html/templates/screens/search/index.jinja +++ b/strictdoc/export/html/templates/screens/search/index.jinja @@ -34,7 +34,7 @@ {% endblock tree_content %} {% block header_content %} - {%- with header__pagetype=true -%} + {%- with header__pagetype=template_type -%} {% include "components/header/index.jinja" %} {%- endwith -%} {% endblock header_content %} diff --git a/strictdoc/export/html/templates/screens/source_file_coverage/index.jinja b/strictdoc/export/html/templates/screens/source_file_coverage/index.jinja index 2b7130b94..f2a86c149 100644 --- a/strictdoc/export/html/templates/screens/source_file_coverage/index.jinja +++ b/strictdoc/export/html/templates/screens/source_file_coverage/index.jinja @@ -20,7 +20,7 @@ {% endblock toc_content %} {% block header_content %} - {%- with header__pagetype=true -%} + {%- with header__pagetype=template_type -%} {% include "components/header/index.jinja" %} {%- endwith -%} {% endblock header_content %} diff --git a/strictdoc/export/html/templates/screens/source_file_view/index.jinja b/strictdoc/export/html/templates/screens/source_file_view/index.jinja index 734403f62..f8a1bb3c2 100644 --- a/strictdoc/export/html/templates/screens/source_file_view/index.jinja +++ b/strictdoc/export/html/templates/screens/source_file_view/index.jinja @@ -33,7 +33,7 @@ {% block header_content %} {%- with header__items=["screens/source_file_view/header__source_file_name.jinja"], - header__pagetype=true + header__pagetype=template_type -%} {% include "components/header/index.jinja" %} {%- endwith -%}