Autoformatted some twigs

This commit is contained in:
pikim 2023-01-20 00:08:50 +01:00
parent 3318a38408
commit ecc1d5c964
6 changed files with 83 additions and 84 deletions

View file

@ -1,23 +1,25 @@
<header id="header">
<h1 class="logo"><a href="{{ home_url }}">{{ site.title }}</a></h1>
<nav class="dropdown">
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% endblock %}
</nav>
<nav class="main">
{% block header_extra %}
<ul>
{% if config.plugins.langswitcher.enabled %}
{% include 'partials/langswitcher.html.twig' %}
{% endif %}
{% if config.plugins.simplesearch.enabled %}
{% include 'partials/simplesearch_searchbox.html.twig' %}
{% endif %}
<li class="menu">
<a class="fa-bars" href="#menu">Menu</a>
</li>
</ul>
{% endblock %}
</nav>
</header>
<h1 class="logo">
<a href="{{ home_url }}">{{ site.title }}</a>
</h1>
<nav class="dropdown">
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% endblock %}
</nav>
<nav class="main">
{% block header_extra %}
<ul>
{% if config.plugins.langswitcher.enabled %}
{% include 'partials/langswitcher.html.twig' %}
{% endif %}
{% if config.plugins.simplesearch.enabled %}
{% include 'partials/simplesearch_searchbox.html.twig' %}
{% endif %}
<li class="menu">
<a class="fa-bars" href="#menu">Menu</a>
</li>
</ul>
{% endblock %}
</nav>
</header>

View file

@ -1,31 +1,31 @@
<li class="langswitcher">
{% set display_format = display_format ?? config.get('plugins.langswitcher.language_display', 'long') %}
{% for language in langswitcher.languages %}
{% set display_format = display_format ?? config.get('plugins.langswitcher.language_display', 'long') %}
{% for language in langswitcher.languages %}
{% set show_language = true %}
{% if language == langswitcher.current %}
{% set lang_url = page.url %}
{% set active_class = ' active' %}
{% set lang_url = page.url %}
{% set active_class = ' active' %}
{% else %}
{% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
{% set lang_url = base_lang_url ~ langswitcher.page_route ~ page.urlExtension %}
{% set untranslated_pages_behavior = grav.config.plugins.langswitcher.untranslated_pages_behavior %}
{% if untranslated_pages_behavior != 'none' %}
{% set translated_page = langswitcher.translated_pages[language] %}
{% if (not translated_page) or (not translated_page.published) %}
{% if untranslated_pages_behavior == 'redirect' %}
{% set lang_url = base_lang_url ~ '/' %}
{% elseif untranslated_pages_behavior == 'hide' %}
{% set show_language = false %}
{% endif %}
{% endif %}
{% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
{% set lang_url = base_lang_url ~ langswitcher.page_route ~ page.urlExtension %}
{% set untranslated_pages_behavior = grav.config.plugins.langswitcher.untranslated_pages_behavior %}
{% if untranslated_pages_behavior != 'none' %}
{% set translated_page = langswitcher.translated_pages[language] %}
{% if (not translated_page) or (not translated_page.published) %}
{% if untranslated_pages_behavior == 'redirect' %}
{% set lang_url = base_lang_url ~ '/' %}
{% elseif untranslated_pages_behavior == 'hide' %}
{% set show_language = false %}
{% endif %}
{% endif %}
{% set active_class = '' %}
{% endif %}
{% set active_class = '' %}
{% endif %}
{% if show_language %}
<a href="{{ lang_url ~ uri.params }}" class="external{{ active_class }}">{% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %}</a>
<a href="{{ lang_url ~ uri.params }}" class="external{{ active_class }}">{% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %}</a>
{% endif %}
{% endfor %}
{% endfor %}
</li>

View file

@ -1,9 +1,9 @@
{% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %}
<a href="{{ home_url }}" class="logo">
{% if logo %}
{% set logo_file = (logo|first).name %}
<img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.title }}" />
{% else %}
{% include('@images/grav-logo.svg') %}
{% endif %}
</a>
{% if logo %}
{% set logo_file = (logo|first).name %}
<img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.title }}"/>
{% else %}
{% include('@images/grav-logo.svg') %}
{% endif %}
</a>

View file

@ -1,3 +1,3 @@
{% for meta in page.metadata %}
<meta {% if meta.name %}name="{{ meta.name }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv }}" {% endif %}{% if meta.charset %}charset="{{ meta.charset }}" {% endif %}{% if meta.property %}property="{{ meta.property }}" {% endif %}{% if meta.content %}content="{{ meta.content }}" {% endif %}/>
<meta {% if meta.name %} name="{{ meta.name }}" {% endif %} {% if meta.http_equiv %} http-equiv="{{ meta.http_equiv }}" {% endif %} {% if meta.charset %} charset="{{ meta.charset }}" {% endif %} {% if meta.property %} property="{{ meta.property }}" {% endif %} {% if meta.content %} content="{{ meta.content }}" {% endif %}/>
{% endfor %}

View file

@ -1,18 +1,18 @@
{% import 'macros/topmenu.html.twig' as macros %}
<ul>
{{ macros.nav_loop(pages) }}
{{ macros.nav_loop(pages) }}
{% if theme_var('custommenus.enabled') %}
{% for mitem in theme_var('custommenu') %}
<li>
<a href="{{ mitem.url }}" target="{{ mitem.target }}">
{% if mitem.icon %}
<i class="fa fa-{{ mitem.icon }}"></i>
{% endif %}
<span>{{ mitem.text }}</span>
</a>
</li>
{% endfor %}
{% endif %}
{% if theme_var('custommenus.enabled') %}
{% for mitem in theme_var('custommenu') %}
<li>
<a href="{{ mitem.url }}" target="{{ mitem.target }}">
{% if mitem.icon %}
<i class="fa fa-{{ mitem.icon }}"></i>
{% endif %}
<span>{{ mitem.text }}</span>
</a>
</li>
{% endfor %}
{% endif %}
</ul>

View file

@ -2,33 +2,30 @@
{% set base_url = base_url|default(page.url) %}
{% if pagination|length > 1 %}
<ul class="actions pagination">
<ul class="actions pagination">
{% if pagination.hasPrev %}
{% set url = (base_url ~ pagination.params ~ pagination.prevUrl)|replace({'//':'/'}) %}
<li><a class="button large previous" rel="prev" href="{{ url }}">{{'FUTURE.BLOG.PAGINATION.PREVIOUS'|t}}</a></li>
{% set url = (base_url ~ pagination.params ~ pagination.prevUrl)|replace({'//':'/'}) %}
<li><a class="button large previous" rel="prev" href="{{ url }}">{{'FUTURE.BLOG.PAGINATION.PREVIOUS'|t}}</a></li>
{% else %}
<li><span class="disabled button large">{{'FUTURE.BLOG.PAGINATION.PREVIOUS'|t}}</span></li>
<li><span class="disabled button large">{{'FUTURE.BLOG.PAGINATION.PREVIOUS'|t}}</span></li>
{% endif %}
{% for paginate in pagination %}
{% if paginate.isCurrent %}
<li><span class="disabled button large">{{ paginate.number }}</span></li>
{% elseif paginate.isInDelta %}
{% set url = (base_url ~ pagination.params ~ paginate.url)|replace({'//':'/'}) %}
<li><a class="button large" href="{{ url }}">{{ paginate.number }}</a></li>
{% elseif paginate.isDeltaBorder %}
<li class="gap"><span>&hellip;</span></li>
{% endif %}
{% if paginate.isCurrent %}
<li><span class="disabled button large">{{ paginate.number }}</span></li>
{% elseif paginate.isInDelta %}
{% set url = (base_url ~ pagination.params ~ paginate.url)|replace({'//':'/'}) %}
<li><a class="button large" href="{{ url }}">{{ paginate.number }}</a></li>
{% elseif paginate.isDeltaBorder %}
<li class="gap"><span>&hellip;</span></li>
{% endif %}
{% endfor %}
{% if pagination.hasNext %}
{% set url = (base_url ~ pagination.params ~ pagination.nextUrl)|replace({'//':'/'}) %}
<li><a class="button large next" rel="next" href="{{ url }}">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</a></li>
{% else %}
<li><span class="disabled button large">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</span></li>
{% endif %}
</ul>
{% if pagination.hasNext %}
{% set url = (base_url ~ pagination.params ~ pagination.nextUrl)|replace({'//':'/'}) %}
<li><a class="button large next" rel="next" href="{{ url }}">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</a></li>
{% else %}
<li><span class="disabled button large">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</span></li>
{% endif %}
</ul>
{% endif %}