Skip to content

Commit

Permalink
Merge pull request strictdoc-project#1476 from strictdoc-project/_fix…
Browse files Browse the repository at this point in the history
…_var

export/html: update Header component
  • Loading branch information
stanislaw authored Nov 19, 2023
2 parents 20a7b55 + bca44d7 commit c646a22
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{#
header__items=["template1.jinja", "template2.jinja"],
header__pagetype=true,
header__pagetype="string",
header__last="template.jinja"
#}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion strictdoc/export/html/templates/screens/search/index.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%}
Expand Down

0 comments on commit c646a22

Please sign in to comment.