diff options
Diffstat (limited to 'nikola/data/themes/base-jinja/templates/base_header.tmpl')
| -rw-r--r-- | nikola/data/themes/base-jinja/templates/base_header.tmpl | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl index 092abd8..bfbd447 100644 --- a/nikola/data/themes/base-jinja/templates/base_header.tmpl +++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl @@ -16,13 +16,13 @@ {% endmacro %} {% macro html_site_title() %} - <h1 id="brand"><a href="{{ abs_link(_link("root", None, lang)) }}" title="{{ blog_title }}" rel="home"> + <h1 id="brand"><a href="{{ _link("root", None, lang) }}" title="{{ blog_title|e }}" rel="home"> {% if logo_url %} - <img src="{{ logo_url }}" alt="{{ blog_title }}" id="logo"> + <img src="{{ logo_url }}" alt="{{ blog_title|e }}" id="logo"> {% endif %} {% if show_blog_title %} - <span id="blog-title">{{ blog_title }}</span> + <span id="blog-title">{{ blog_title|e }}</span> {% endif %} </a></h1> {% endmacro %} @@ -30,13 +30,22 @@ {% macro html_navigation_links() %} <nav id="menu"> <ul> - {% for url, text in navigation_links[lang] %} + {{ html_navigation_links_entries(navigation_links) }} + {{ html_navigation_links_entries(navigation_alt_links) }} + {{ template_hooks['menu']() }} + {{ template_hooks['menu_alt']() }} + </ul> + </nav> +{% endmacro %} + +{% macro html_navigation_links_entries(navigation_links_source) %} + {% for url, text in navigation_links_source[lang] %} {% if isinstance(url, tuple) %} <li> {{ text }} <ul> {% for suburl, text in url %} {% if rel_link(permalink, suburl) == "#" %} - <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li> + <li class="active"><a href="{{ permalink }}">{{ text }}<span class="sr-only"> {{ messages("(active)", lang) }}</span></a></li> {% else %} <li><a href="{{ suburl }}">{{ text }}</a></li> {% endif %} @@ -44,16 +53,12 @@ </ul> {% else %} {% if rel_link(permalink, url) == "#" %} - <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li> + <li class="active"><a href="{{ permalink }}">{{ text }}<span class="sr-only"> {{ messages("(active)", lang) }}</span></a></li> {% else %} <li><a href="{{ url }}">{{ text }}</a></li> {% endif %} {% endif %} {% endfor %} - {{ template_hooks['menu']() }} - {{ template_hooks['menu_alt']() }} - </ul> - </nav> {% endmacro %} {% macro html_translation_header() %} |