diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:04 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:04 -0300 |
| commit | 3dddbd8cc879402c2047919bccd20e6697082657 (patch) | |
| tree | 38d6290f37be1d67d91c46027974e6ee3372e232 /nikola/data/themes/bootstrap/templates/base.tmpl | |
| parent | 7ac2cf148f7a8ea0de126fed3360b49964ce9b45 (diff) | |
| parent | 58c4878526dec5510f23c812274686787d8724ba (diff) | |
Merge tag 'upstream/7.0.1'
Upstream version 7.0.1
Diffstat (limited to 'nikola/data/themes/bootstrap/templates/base.tmpl')
| -rw-r--r-- | nikola/data/themes/bootstrap/templates/base.tmpl | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/nikola/data/themes/bootstrap/templates/base.tmpl b/nikola/data/themes/bootstrap/templates/base.tmpl index 65132b7..a469098 100644 --- a/nikola/data/themes/bootstrap/templates/base.tmpl +++ b/nikola/data/themes/bootstrap/templates/base.tmpl @@ -1,28 +1,17 @@ ## -*- coding: utf-8 -*- <%namespace name="base" file="base_helper.tmpl" import="*" /> -<%namespace name="bootstrap" file="bootstrap_helper.tmpl" import="*" /> <%namespace name="notes" file="annotation_helper.tmpl" import="*" /> ${set_locale(lang)} -<!DOCTYPE html> -<html -%if comment_system == 'facebook': -xmlns:fb="http://ogp.me/ns/fb#" -%endif -lang="${lang}"> -<head> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - ${bootstrap.html_head()} - <%block name="extra_head"> - </%block> - % if annotations and post and not post.meta('noannotations'): - ${notes.css()} - % elif not annotations and post and post.meta('annotations'): - ${notes.css()} - % endif - ${extra_head_data} +${base.html_headstart()} +<%block name="extra_head"> +### Leave this block alone. +</%block> +${template_hooks['extra_head']()} </head> <body> + <!-- Menubar --> + <div class="navbar navbar-fixed-top" id="navbar"> <div class="navbar-inner"> <div class="container"> @@ -35,12 +24,19 @@ lang="${lang}"> </a> <a class="brand" href="${abs_link('/')}"> - ${blog_title} + %if logo_url: + <img src="${logo_url}" alt="${blog_title}" id="logo"> + %endif + + % if show_blog_title: + <span id="blog-title">${blog_title}</span> + % endif </a> <!-- Everything you want hidden at 940px or less, place within here --> <div class="nav-collapse collapse"> <ul class="nav"> - ${bootstrap.html_navigation_links()} + ${base.html_navigation_links()} + ${template_hooks['menu']()} </ul> %if search_form: ${search_form} @@ -51,9 +47,10 @@ lang="${lang}"> <li>${base.html_translations()}</li> %endif </%block> - % if not hide_sourcelink: + % if show_sourcelink: <li><%block name="sourcelink"></%block></li> %endif + ${template_hooks['menu_alt']()} </ul> </div> </div> @@ -65,6 +62,7 @@ lang="${lang}"> <div class="row-fluid"> <div class="span2"></div> <div class="span8"> + ${template_hooks['page_header']()} <%block name="content"></%block> </div> </div> @@ -72,23 +70,17 @@ lang="${lang}"> </div> <div class="footerbox"> ${content_footer} + ${template_hooks['page_footer']()} </div> -${bootstrap.late_load_js()} -${base.html_social()} - <script type="text/javascript">jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true}); - $(window).on('hashchange', function(){ - if (location.hash && $(location.hash)[0]) { - $('body').animate({scrollTop: $(location.hash).offset().top - $('#navbar').outerHeight(true)*1.2 }, 1); - } - }); - $(document).ready(function(){$(window).trigger('hashchange')}); - </script> +${base.late_load_js()} + <script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script> <%block name="extra_js"></%block> % if annotations and post and not post.meta('noannotations'): ${notes.code()} % elif not annotations and post and post.meta('annotations'): ${notes.code()} % endif - ${body_end} +${body_end} +${template_hooks['body_end']()} </body> </html> |