diff options
Diffstat (limited to 'nikola/data/themes/bootstrap3/templates/base_helper.tmpl')
| -rw-r--r-- | nikola/data/themes/bootstrap3/templates/base_helper.tmpl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl index 8ea843a..a1e7508 100644 --- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl @@ -26,17 +26,20 @@ dir="rtl" \ lang="${lang}"> <head> <meta charset="utf-8"> + <base href="${abs_link(permalink)}"> %if description: <meta name="description" content="${description}"> %endif <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>${title|striphtml} | ${blog_title|striphtml}</title> + %if title == blog_title: + <title>${blog_title|h}</title> + %else: + <title>${title|h} | ${blog_title|h}</title> + %endif ${html_stylesheets()} ${html_feedlinks()} - %if permalink: - <link rel="canonical" href="${abs_link(permalink)}"> - %endif + <link rel="canonical" href="${abs_link(permalink)}"> %if favicons: %for name, file, size in favicons: @@ -129,7 +132,7 @@ lang="${lang}"> <%def name="html_navigation_links()"> %for url, text in navigation_links[lang]: % if isinstance(url, tuple): - <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text} <b class="caret"></b></a> + <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a> <ul class="dropdown-menu"> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": @@ -154,7 +157,7 @@ lang="${lang}"> ${rss_link} %elif generate_rss: %if len(translations) > 1: - %for language in translations: + %for language in sorted(translations): <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> %endfor %else: @@ -163,7 +166,7 @@ lang="${lang}"> %endif %if generate_atom: %if len(translations) > 1: - %for language in translations: + %for language in sorted(translations): <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}"> %endfor %else: @@ -173,7 +176,7 @@ lang="${lang}"> </%def> <%def name="html_translations()"> - %for langname in translations.keys(): + %for langname in sorted(translations): %if langname != lang: <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> %endif |