Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 10 insertions, 4 deletions

diff --git a/nikola/data/themes/bootstrap/templates/base.tmpl b/nikola/data/themes/bootstrap/templates/base.tmpl
index 9f2bb61..e848673 100644
--- a/nikola/data/themes/bootstrap/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap/templates/base.tmpl
@@ -13,7 +13,7 @@ ${template_hooks['extra_head']()}
 
 <!-- Menubar -->
 
-<div class="navbar navbar-fixed-top" id="navbar">
+<div class="navbar navbar-static-top" id="navbar">
     <div class="navbar-inner">
         <div class="container">
 
@@ -24,7 +24,7 @@ ${template_hooks['extra_head']()}
             <span class="icon-bar"></span>
         </a>
 
-            <a class="brand" href="${abs_link('/')}">
+            <a class="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']()}
     </div>
 </div>
 <!-- End of Menubar -->
-<div class="container-fluid" id="content">
+<div class="container-fluid" id="content" role="main">
     <!--Body content-->
     <div class="row-fluid">
     <div class="span2"></div>
@@ -74,7 +74,13 @@ ${template_hooks['extra_head']()}
     ${template_hooks['page_footer']()}
 </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()}