diff --git a/templates/partials/header.html.twig b/templates/partials/header.html.twig index 7cc8e62..ba73542 100644 --- a/templates/partials/header.html.twig +++ b/templates/partials/header.html.twig @@ -1,23 +1,25 @@ \ No newline at end of file +

+ {{ site.title }} +

+ + + diff --git a/templates/partials/langswitcher.html.twig b/templates/partials/langswitcher.html.twig index 0cd0f7c..d2e1518 100644 --- a/templates/partials/langswitcher.html.twig +++ b/templates/partials/langswitcher.html.twig @@ -1,31 +1,31 @@
  • -{% 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 %} - {% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %} + {% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %} {% endif %} -{% endfor %} + {% endfor %}
  • diff --git a/templates/partials/logo.html.twig b/templates/partials/logo.html.twig index c220b1c..867cb6c 100644 --- a/templates/partials/logo.html.twig +++ b/templates/partials/logo.html.twig @@ -1,9 +1,9 @@ {% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %} \ No newline at end of file + {% if logo %} + {% set logo_file = (logo|first).name %} + {{ site.title }} + {% else %} + {% include('@images/grav-logo.svg') %} + {% endif %} + diff --git a/templates/partials/metadata.html.twig b/templates/partials/metadata.html.twig index 2f08a0e..59deee3 100644 --- a/templates/partials/metadata.html.twig +++ b/templates/partials/metadata.html.twig @@ -1,3 +1,3 @@ {% for meta in page.metadata %} - + {% endfor %} diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig index 282ad5a..4308b93 100644 --- a/templates/partials/navigation.html.twig +++ b/templates/partials/navigation.html.twig @@ -1,18 +1,18 @@ {% import 'macros/topmenu.html.twig' as macros %} diff --git a/templates/partials/pagination.html.twig b/templates/partials/pagination.html.twig index 5b6d1f5..1ce44c9 100644 --- a/templates/partials/pagination.html.twig +++ b/templates/partials/pagination.html.twig @@ -2,33 +2,30 @@ {% set base_url = base_url|default(page.url) %} {% if pagination|length > 1 %} - - {% endif %}