diff options
Diffstat (limited to 'nikola/data/themes/jinja-default')
6 files changed, 32 insertions, 20 deletions
diff --git a/nikola/data/themes/jinja-default/README b/nikola/data/themes/jinja-default/README index 3fb7d3f..4b0bf04 100644 --- a/nikola/data/themes/jinja-default/README +++ b/nikola/data/themes/jinja-default/README @@ -1,3 +1,3 @@ This theme is exactly the same as "default" but using Jinja2 templates. -To try it, set TEMPLATE_ENGINE="jinja" and THEME="jinja-default" in your 'conf.py' +To try it, set THEME="jinja-default" in your 'conf.py' diff --git a/nikola/data/themes/jinja-default/templates/base.tmpl b/nikola/data/themes/jinja-default/templates/base.tmpl index 546e1a7..0f394d3 100644 --- a/nikola/data/themes/jinja-default/templates/base.tmpl +++ b/nikola/data/themes/jinja-default/templates/base.tmpl @@ -17,7 +17,7 @@ <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) %} + {% if has_custom_css %} <link href="/assets/css/custom.css" rel="stylesheet"> {% endif %} <script src="/assets/js/jquery-1.7.2.min.js" type="text/javascript"></script> @@ -64,7 +64,7 @@ <hr> </div> <!-- End of banner-like substance !--> - <div class="row" id="contentrow"> + <div class="row-fluid" id="contentrow"> <div class="span10" id="contentcolumn"> <!--Body content--> {% block content %}{% endblock %} @@ -76,20 +76,6 @@ <!--Sidebar content--> <ul class="unstyled"> <li>{{license}} - <!-- social buttons --> -` {% if add_this_buttons %} - <li> - <div id="addthisbox" class="addthis_toolbox addthis_default_style"> - <a class="addthis_button_preferred_1"></a> - <a class="addthis_button_preferred_2"></a> - <a class="addthis_button_preferred_3"></a> - <a class="addthis_button_preferred_4"></a> - <a class="addthis_button_compact"></a> - <a class="addthis_counter addthis_bubble_style"></a> - </div> - <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4f7088a56bb93798"></script> - <!-- End of social buttons --> - {% endif %} {% for url, text in sidebar_links[lang] %} <li><a href="{{url}}">{{text}}</a> {% endfor %} @@ -97,6 +83,19 @@ </ul> <!--End of sidebar content--> </div> + {% if add_this_buttons %} + <!-- social buttons --> + <div id="addthisbox" class="addthis_toolbox addthis_peekaboo_style addthis_default_style addthis_label_style addthis_32x32_style"> + <a class="addthis_button_more">Share</a> + <ul><li><a class="addthis_button_facebook"></a></li> + <li><a class="addthis_button_google_plusone_share"></a></li> + <li><a class="addthis_button_linkedin"></a></li> + <li><a class="addthis_button_twitter"></a></li> + </ul> + </div> + <script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f7088a56bb93798"></script> + <!-- End of social buttons --> + {% endif %} {{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/jinja-default/templates/index.tmpl b/nikola/data/themes/jinja-default/templates/index.tmpl index 6244e10..c068417 100644 --- a/nikola/data/themes/jinja-default/templates/index.tmpl +++ b/nikola/data/themes/jinja-default/templates/index.tmpl @@ -4,7 +4,7 @@ <div class="postbox"> <h1><a href="{{post.permalink(lang)}}">{{post.title(lang)}}</a> <small> - {{messages[lang]["Posted"]}}: {{post.date}} + {{messages[lang]["Posted"]}}: {{post.date.strftime(date_format)}} </small></h1> <hr> {{post.text(lang, index_teasers)}} diff --git a/nikola/data/themes/jinja-default/templates/list_post.tmpl b/nikola/data/themes/jinja-default/templates/list_post.tmpl new file mode 100644 index 0000000..7723214 --- /dev/null +++ b/nikola/data/themes/jinja-default/templates/list_post.tmpl @@ -0,0 +1,13 @@ +{% extends "base.tmpl" %} +{% block content %} + <!--Body content--> + <div class="postbox"> + <h1>{{title}}</h1> + <ul class="unstyled"> + {% for post in posts %} + <li><a href="{{post.permalink(lang)}}">[{{post.date.strftime(date_format)}}] {{post.title(lang)}}</a> + {% endfor %} + </ul> + </div> + <!--End of body content--> +{% endblock %} diff --git a/nikola/data/themes/jinja-default/templates/post.tmpl b/nikola/data/themes/jinja-default/templates/post.tmpl index 4748959..3ce6abe 100644 --- a/nikola/data/themes/jinja-default/templates/post.tmpl +++ b/nikola/data/themes/jinja-default/templates/post.tmpl @@ -7,7 +7,7 @@ {% endif %} <hr> <small> - {{messages[lang]["Posted"]}}: {{post.date}} | + {{messages[lang]["Posted"]}}: {{post.date.strftime(date_format)}} | {% if translations|length > 1 %} {% for langname in translations.keys() %} diff --git a/nikola/data/themes/jinja-default/templates/tag.tmpl b/nikola/data/themes/jinja-default/templates/tag.tmpl index 59facb4..42720fd 100644 --- a/nikola/data/themes/jinja-default/templates/tag.tmpl +++ b/nikola/data/themes/jinja-default/templates/tag.tmpl @@ -1,4 +1,4 @@ -{% extends "list.tmpl"%} +{% extends "list_post.tmpl"%} {%block extra_head %} {% for language in translations %} <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for tag {{tag}} ({{language}})" href="{{_link("tag_rss", tag, lang)}}"> |