Skip to content
Snippets Groups Projects
Verified Commit 8ba26b59 authored by Jake's avatar Jake :speech_balloon:
Browse files

fixed header tags being in footers

parent 34a3a8cf
No related branches found
No related tags found
No related merge requests found
Pipeline #323103 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
theme/templates/base.html
+ 1
− 1
View file @ 8ba26b59
......@@ -73,7 +73,7 @@
{% endblock global_after %}
<footer id="site-footer">
{{ render.sections(config.theme.footer, lang, 2) }}
{{ render.sections(config.theme.footer, lang, 2, in_footer=true) }}
</footer>
</body>
<!-- The Cake Is A Lie! -->
......
theme/templates/macros/common.html
+ 10
− 6
View file @ 8ba26b59
......@@ -62,14 +62,14 @@
{#- ############################# HEADER ################################## -#}
{%- macro render_header(content, level, attr, lang, visuallyhidden=false) -%}
{%- call render_header_raw(content, level, attr, lang, visuallyhidden=visuallyhidden) -%}
{%- macro render_header(content, level, attr, lang, visuallyhidden=false, in_footer=false) -%}
{%- call render_header_raw(content, level, attr, lang, visuallyhidden=visuallyhidden, in_footer=in_footer) -%}
{{ softbreak_span(content) }}
{%- endcall -%}
{%- endmacro -%}
{%- macro render_header_raw(content, level, attr, lang, visuallyhidden=false) -%}
{%- macro render_header_raw(content, level, attr, lang, visuallyhidden=false, in_footer=false) -%}
{%- set ns = namespace(extra_classes=[], level=level) -%}
{%- if visuallyhidden -%}
......@@ -82,9 +82,13 @@
{%- set ns.level = 6 -%}
{%- endif -%}
<header {{ render_attr(attr, lang, extra_classes=ns.extra_classes) }}>
<h{{ ns.level }}>{{ caller() }}</h{{ ns.level }}>
</header>
{%- if not in_footer -%}
<header {{ render_attr(attr, lang, extra_classes=ns.extra_classes) }}>
<h{{ ns.level }}>{{ caller() }}</h{{ ns.level }}>
</header>
{%- else -%}
<h{{ ns.level }} {{ render_attr(attr, lang, extra_classes=ns.extra_classes) }}>{{ caller() }}</h{{ ns.level }}>
{%- endif -%}
{%- endmacro -%}
......
theme/templates/macros/content_renderer.html
+ 5
− 5
View file @ 8ba26b59
{#- Siehe https://gitlab.gwdg.de/GAUMI-fginfo/fg-website/-/blob/better-content-renderer/docs/content.md -#}
{%- macro render_content(content, lang, header_level_offset) -%}
{%- set meta = namespace(header_level_offset=header_level_offset) -%}
{%- macro render_content(content, lang, header_level_offset, in_footer) -%}
{%- set meta = namespace(header_level_offset=header_level_offset, in_footer=in_footer) -%}
{{ render_blocks(content, lang, meta) }}
{%- endmacro -%}
......@@ -20,8 +20,8 @@
{%- endcall -%}
{%- endmacro -%}
{%- macro render_header(content, level, attr, lang) -%}
{%- call common.render_header_raw(content, level, attr, lang) -%}
{%- macro render_header(content, level, attr, lang, in_footer) -%}
{%- call common.render_header_raw(content, level, attr, lang, in_footer=in_footer) -%}
{{ render_inlines(content, lang) }}
{%- endcall -%}
{%- endmacro -%}
......@@ -103,7 +103,7 @@
{%- set attr = block['attr'] -%}
{%- set content = block['content'] -%}
{{ render_header(content, level + meta.header_level_offset, attr, lang) }}
{{ render_header(content, level + meta.header_level_offset, attr, lang, meta.in_footer) }}
{%- endmacro -%}
{%- macro render_block_paragraph(block, lang, meta) -%}
......
theme/templates/macros/renderers.html
+ 16
− 16
View file @ 8ba26b59
......@@ -11,49 +11,49 @@
<iframe src="{{ s.url }}" loading="lazy"></iframe>
{%- endmacro -%}
{%- macro section_tag(s, lang, header_level) -%}
{%- macro section_tag(s, lang, header_level, in_footer=false) -%}
{%- set title_mode = s.title_mode|d("normal") -%}
{%- if s.title is not defined and title_mode != "prevent" -%}
{{ common.render_header(s.tag.title, header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden")) }}
{{ common.render_header(s.tag.title, header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden"), in_footer=in_footer) }}
{%- endif -%}
{%- if s.tag.page -%}
{%- if 'before' in s.tag.page.metadata -%}
{{ sections(s.tag.page.metadata.before, lang, header_level + 1) }}
{{ sections(s.tag.page.metadata.before, lang, header_level + 1, in_footer=in_footer) }}
{%- endif -%}
{{ content_renderer.render_content(s.tag.page.content, lang, header_level - 1) }}
{{ content_renderer.render_content(s.tag.page.content, lang, header_level - 1, in_footer=in_footer) }}
{%- if 'after' in s.tag.page.metadata -%}
{{ sections(s.tag.page.metadata.after, lang, header_level + 1) }}
{{ sections(s.tag.page.metadata.after, lang, header_level + 1, in_footer=in_footer) }}
{%- endif -%}
{%- endif -%}
{{ cards.cards_from_pages(s.tag.pages, lang, max=s.num|d(None)) }}
{%- endmacro -%}
{%- macro section_page(s, lang, header_level) -%}
{%- macro section_page(s, lang, header_level, in_footer=false) -%}
{%- set title_mode = s.title_mode|d("normal") -%}
{%- if s.title is not defined and title_mode != "prevent" -%}
{{ common.render_header(s.page.title, header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden")) }}
{{ common.render_header(s.page.title, header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden"), in_footer=in_footer) }}
{%- endif -%}
{%- if 'before' in s.page.metadata -%}
{{ sections(s.page.metadata.before, lang, header_level + 1) }}
{{ sections(s.page.metadata.before, lang, header_level + 1, in_footer=in_footer) }}
{%- endif -%}
{{ content_renderer.render_content(s.page.content, lang, header_level - 1) }}
{{ content_renderer.render_content(s.page.content, lang, header_level - 1, in_footer=in_footer) }}
{%- if 'after' in s.page.metadata -%}
{{ sections(s.page.metadata.after, lang, header_level + 1) }}
{{ sections(s.page.metadata.after, lang, header_level + 1, in_footer=in_footer) }}
{%- endif -%}
{%- endmacro -%}
{%- macro section(s, lang, header_level) -%}
{%- macro section(s, lang, header_level, in_footer=false) -%}
{%- set title_mode = s.title_mode|d("normal") -%}
{%- if s.title is defined and title_mode != "prevent" -%}
{{ common.render_header(s.title[lang], header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden")) }}
{{ common.render_header(s.title[lang], header_level, {"id": s.id}, lang, visuallyhidden=(title_mode == "hidden"), in_footer=in_footer) }}
{%- endif -%}
{%- if s.type == "page" -%}
{{ section_page(s, lang, header_level) }}
{{ section_page(s, lang, header_level, in_footer) }}
{%- elif s.type == "tag" -%}
{{ section_tag(s, lang, header_level) }}
{{ section_tag(s, lang, header_level, in_footer) }}
{%- elif s.type == "news" -%}
{{ section_news(s, lang) }}
{%- elif s.type == "iframe" -%}
......@@ -67,10 +67,10 @@
{%- endif -%}
{%- endmacro -%}
{%- macro sections(sl, lang, header_level) -%}
{%- macro sections(sl, lang, header_level, in_footer=false) -%}
{%- for s in sl -%}
<section class="content">
{{ section(s, lang, header_level) }}
{{ section(s, lang, header_level, in_footer=in_footer) }}
</section>
{%- endfor -%}
{%- endmacro -%}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment