diff options
Diffstat (limited to 'nikola/data/themes/site')
| -rw-r--r-- | nikola/data/themes/site/assets/css/theme.css | 12 | ||||
| -rw-r--r-- | nikola/data/themes/site/templates/base.tmpl | 67 | ||||
| -rw-r--r-- | nikola/data/themes/site/templates/post.tmpl | 45 |
3 files changed, 20 insertions, 104 deletions
diff --git a/nikola/data/themes/site/assets/css/theme.css b/nikola/data/themes/site/assets/css/theme.css index 6b21e2e..32c9f24 100644 --- a/nikola/data/themes/site/assets/css/theme.css +++ b/nikola/data/themes/site/assets/css/theme.css @@ -1,5 +1,11 @@ -body { margin-top: 50px;} - +body { + padding-top: 60px; +} +@media (max-width: 979px) { + body { + padding-top: 0px; + } +} #container { width: 960px; margin: 50 auto; @@ -23,5 +29,3 @@ img { .footerbox {padding: 15px; text-align: center; margin-bottom: 15px;} -#addthisbox {top: 180px; left:10px;} - diff --git a/nikola/data/themes/site/templates/base.tmpl b/nikola/data/themes/site/templates/base.tmpl index 46e9b39..784f29a 100644 --- a/nikola/data/themes/site/templates/base.tmpl +++ b/nikola/data/themes/site/templates/base.tmpl @@ -1,40 +1,9 @@ ## -*- coding: utf-8 -*- +<%namespace file="base_helper.tmpl" import="*"/> <!DOCTYPE html> <html lang="${lang}"> <head> - <meta charset="utf-8"> - <meta name="title" content="${title} | ${blog_title}" > - <meta name="description" content="${description}" > - <meta name="author" content="${blog_author}"> - <title>${title} | ${blog_title}</title> - <!-- Le styles --> - %if use_bundles: - <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> - <script src="/assets/js/all.js" type="text/javascript"></script> - %else: - <link href="/assets/css/bootstrap.css" rel="stylesheet" type="text/css"> - <link href="/assets/css/bootstrap-responsive.css" rel="stylesheet" type="text/css"> - <link href="/assets/css/rst.css" rel="stylesheet" type="text/css"> - <link href="/assets/css/code.css" rel="stylesheet" type="text/css"> - <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css"/> - <link href="/assets/css/theme.css" rel="stylesheet" type="text/css"/> - %if exists("files/assets/css/custom.css", not_empty=True): - <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> - %endif - <script src="/assets/js/jquery-1.7.2.min.js" type="text/javascript"></script> - <script src="/assets/js/jquery.colorbox-min.js" type="text/javascript"></script> - %endif - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> - %if rss_link: - ${rss_link} - %else: - %for language in translations: - <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link("rss", None, lang)}"> - %endfor - %endif + ${html_head()} <%block name="extra_head"> </%block> </head> @@ -47,13 +16,7 @@ ${blog_title} </a> <ul class="nav"> - %for url, text in sidebar_links[lang]: - % if rel_link(permalink, url) == "#": - <li class="active"><a href="${url}">${text}</a> - %else: - <li><a href="${url}">${text}</a> - %endif - %endfor + ${html_sidebar_links()} </ul> %if search_form: ${search_form} @@ -61,13 +24,7 @@ <ul class="nav pull-right"> <%block name="belowtitle"> %if len(translations) > 1: - <li> - %for langname in translations.keys(): - %if langname != lang: - <a href="${_link("index", None, langname)}">${messages[langname]["LANGUAGE"]}</a> - %endif - %endfor - </li> + <li>${html_translations()}</li> %endif </%block> <%block name="sourcelink"> </%block> @@ -76,7 +33,6 @@ </div> </div> <!-- End of Menubar --> - <div class="container" id="container"> <!--Body content--> <%block name="content"></%block> @@ -85,20 +41,7 @@ ${content_footer} </div> </div> - %if add_this_buttons: - <!-- addthis --> - <div id="addthisbox" class="addthis_bar addthis_bar_vertical addthis_bar_small"> - <div class="addthis_toolbox addthis_default_style"> - <span><a class="addthis_button_preferred_1"></a></span> - <span><a class="addthis_button_preferred_2"></a></span> - <span><a class="addthis_button_preferred_3"></a></span> - <span><a class="addthis_button_preferred_4"></a></span> - <span><a class="addthis_button_compact"></a></span> - </div> - </div> - <script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f7088a56bb93798"></script> - <!-- End of addthis --> - %endif +${html_social()} ${analytics} <script type="text/javascript">jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"80%",maxHeight:"80%",scalePhotos:true});</script> </body> diff --git a/nikola/data/themes/site/templates/post.tmpl b/nikola/data/themes/site/templates/post.tmpl index f777366..06ca10f 100644 --- a/nikola/data/themes/site/templates/post.tmpl +++ b/nikola/data/themes/site/templates/post.tmpl @@ -1,50 +1,19 @@ ## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> <%inherit file="base.tmpl"/> <%block name="content"> <div class="postbox"> - <h1>${title}</h1> - % if link: - <p><a href='${link}'>${messages[lang]["Original site"]}</a></p> - % endif + ${helper.html_title()} <hr> <small> - ${messages[lang]["Posted"]}: ${post.date} - - %if len(translations) > 1: - %for langname in translations.keys(): - %if langname != lang: - | - <a href="${post.permalink(langname)}">${messages[langname][u"Read in English"]}</a> - %endif - %endfor - %endif - %if post.tags: - | ${messages[lang]["More posts about"]} - %for tag in post.tags: - <a href="${_link("tag", tag, lang)}"><span class="badge badge-info">${tag}</span></a> - %endfor - %endif + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} + ${helper.html_translations(post)} + ${helper.html_tags(post)} </small> <hr> ${post.text(lang)} - <ul class="pager"> - %if post.prev_post: - <li class="previous"> - <a href="${post.prev_post.permalink(lang)}">← ${messages[lang]["Previous post"]}</a> - </li> - %endif - %if post.next_post: - <li class="next"> - <a href="${post.next_post.permalink(lang)}">${messages[lang]["Next post"]} →</a> - </li> - %endif - </ul> - %if disqus_forum: - <div id="disqus_thread"></div> - <script type="text/javascript">var disqus_shortname="${disqus_forum}";var disqus_url="${post.permalink(absolute=True)}";(function(){var a=document.createElement("script");a.type="text/javascript";a.async=true;a.src="http://"+disqus_shortname+".disqus.com/embed.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)})();</script> - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> - <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> - %endif + ${helper.html_pager(post)} + ${helper.html_disqus(post)} </div> </%block> |