diff options
Diffstat (limited to 'nikola/data/themes/bootstrap3/templates')
| -rw-r--r-- | nikola/data/themes/bootstrap3/templates/base.tmpl | 16 | ||||
| -rw-r--r-- | nikola/data/themes/bootstrap3/templates/base_helper.tmpl | 36 | ||||
| -rw-r--r-- | nikola/data/themes/bootstrap3/templates/gallery.tmpl | 6 |
3 files changed, 40 insertions, 18 deletions
diff --git a/nikola/data/themes/bootstrap3/templates/base.tmpl b/nikola/data/themes/bootstrap3/templates/base.tmpl index c463873..16aebce 100644 --- a/nikola/data/themes/bootstrap3/templates/base.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base.tmpl @@ -13,7 +13,7 @@ ${template_hooks['extra_head']()} <!-- Menubar --> -<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> +<nav class="navbar navbar-inverse navbar-static-top" role="navigation"> <div class="container"><!-- This keeps the margins nice --> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> @@ -22,7 +22,7 @@ ${template_hooks['extra_head']()} <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="${abs_link('/')}"> + <a class="navbar-brand" href="${abs_link(_link("root", None, lang))}"> %if logo_url: <img src="${logo_url}" alt="${blog_title}" id="logo"> %endif @@ -58,7 +58,7 @@ ${template_hooks['extra_head']()} <!-- End of Menubar --> -<div class="container" id="content"> +<div class="container" id="content" role="main"> <div class="body-content"> <!--Body content--> <div class="row"> @@ -67,7 +67,7 @@ ${template_hooks['extra_head']()} </div> <!--End of body content--> - <footer> + <footer id="footer"> ${content_footer} ${template_hooks['page_footer']()} </footer> @@ -75,7 +75,13 @@ ${template_hooks['extra_head']()} </div> ${base.late_load_js()} - <script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script> + <script>$('a.image-reference:not(.islink) img:not(.islink)').parent().colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script> + <!-- fancy dates --> + <script> + moment.locale("${momentjs_locales[lang]}"); + fancydates(${date_fanciness}, ${js_date_format}); + </script> + <!-- end fancy dates --> <%block name="extra_js"></%block> % if annotations and post and not post.meta('noannotations'): ${notes.code()} diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl index 096c3c2..8ea843a 100644 --- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl +++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl @@ -1,5 +1,6 @@ ## -*- coding: utf-8 -*- +<%namespace name="notes" file="annotation_helper.tmpl" import="*" /> <%def name="html_headstart()"> <!DOCTYPE html> <html @@ -67,19 +68,21 @@ lang="${lang}"> <%def name="late_load_js()"> %if use_bundles: %if use_cdn: - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> - <script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> + <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> <script src="/assets/js/all.js"></script> %else: <script src="/assets/js/all-nocdn.js"></script> %endif %else: %if use_cdn: - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> - <script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> + <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> %else: <script src="/assets/js/jquery.min.js"></script> <script src="/assets/js/bootstrap.min.js"></script> + <script src="/assets/js/moment-with-locales.min.js"></script> + <script src="/assets/js/fancydates.js"></script> %endif <script src="/assets/js/jquery.colorbox-min.js"></script> %endif @@ -93,14 +96,14 @@ lang="${lang}"> <%def name="html_stylesheets()"> %if use_bundles: %if use_cdn: - <link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> + <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> %else: <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> %endif %else: %if use_cdn: - <link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> + <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> %else: <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css"> %endif @@ -112,6 +115,10 @@ lang="${lang}"> <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif %endif + % if needs_ipython_css: + <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css"> + % endif % if annotations and post and not post.meta('noannotations'): ${notes.css()} % elif not annotations and post and post.meta('annotations'): @@ -122,11 +129,11 @@ 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">${text} <b class="caret"></b></a> <ul class="dropdown-menu"> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": - <li class="active"><a href="${permalink}">${text}</a> + <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a> %else: <li><a href="${suburl}">${text}</a> %endif @@ -134,7 +141,7 @@ lang="${lang}"> </ul> % else: % if rel_link(permalink, url) == "#": - <li class="active"><a href="${permalink}">${text}</a> + <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a> %else: <li><a href="${url}">${text}</a> %endif @@ -154,12 +161,21 @@ lang="${lang}"> <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}"> %endif %endif + %if generate_atom: + %if len(translations) > 1: + %for language in translations: + <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}"> + %endfor + %else: + <link rel="alternate" type="application/atom+xml" title="Atom" href="${_link('index_atom', None)}"> + %endif + %endif </%def> <%def name="html_translations()"> %for langname in translations.keys(): %if langname != lang: - <li><a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> + <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> %endif %endfor </%def> diff --git a/nikola/data/themes/bootstrap3/templates/gallery.tmpl b/nikola/data/themes/bootstrap3/templates/gallery.tmpl index 26fe80d..3d6c01a 100644 --- a/nikola/data/themes/bootstrap3/templates/gallery.tmpl +++ b/nikola/data/themes/bootstrap3/templates/gallery.tmpl @@ -7,7 +7,7 @@ <%block name="content"> ${ui.bar(crumbs)} %if title: - <h1>${title}</h1> + <h1>${title|h}</h1> %endif %if post: <p> @@ -17,8 +17,7 @@ %if folders: <ul> % for folder, ftitle in folders: - <li><a href="${folder}"><i class="glyphicon - glyphicon-folder-open"></i> ${ftitle}</a></li> + <li><a href="${folder}"><i class="glyphicon glyphicon-folder-open"></i> ${ftitle}</a></li> % endfor </ul> %endif @@ -41,6 +40,7 @@ ${comments.comment_form(None, permalink, title)} <%block name="extra_head"> ${parent.extra_head()} +<link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml"> <style type="text/css"> .image-block { display: inline-block; |