diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
| commit | 055d72d76b44b0e627c8a17c48dbecd62e44197b (patch) | |
| tree | e2c8d5475477c46115461fe9547c1ee797873635 /nikola/data/themes/bootstrap3-jinja/templates/base.tmpl | |
| parent | 61f3aad02cd6492cb38e41b66f2ed8ec56e98981 (diff) | |
| parent | b0b24795b24ee6809397fbbadf42f31f310a219f (diff) | |
Merge tag 'upstream/7.6.0'
Upstream version 7.6.0
Diffstat (limited to 'nikola/data/themes/bootstrap3-jinja/templates/base.tmpl')
| -rw-r--r-- | nikola/data/themes/bootstrap3-jinja/templates/base.tmpl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl index c1ac838..058640a 100644 --- a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl +++ b/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl @@ -13,7 +13,7 @@ <!-- 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 @@ <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 @@ <!-- 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 @@ </div> <!--End of body content--> - <footer> + <footer id="footer"> {{ content_footer }} {{ template_hooks['page_footer']() }} </footer> @@ -75,7 +75,13 @@ </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 extra_js %}{% endblock %} {% if annotations and post and not post.meta('noannotations') %} {{ notes.code() }} |