diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:02 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:02 -0300 |
| commit | 58c4878526dec5510f23c812274686787d8724ba (patch) | |
| tree | 5f2374bc17adb10e15f7e5b4576595d9cc2ef17e /nikola/data | |
| parent | fa50632a9d87c3989566fed3e49c160a132e0d14 (diff) | |
Imported Upstream version 7.0.1upstream/7.0.1
Diffstat (limited to 'nikola/data')
223 files changed, 3082 insertions, 612 deletions
diff --git a/nikola/data/samplesite/galleries/demo/tesla2_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla2_lg.jpg Binary files differindex 8be0531..43ea5db 100644 --- a/nikola/data/samplesite/galleries/demo/tesla2_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla2_lg.jpg diff --git a/nikola/data/samplesite/galleries/demo/tesla4_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla4_lg.jpg Binary files differindex e350491..9274950 100644 --- a/nikola/data/samplesite/galleries/demo/tesla4_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla4_lg.jpg diff --git a/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg Binary files differindex 7549d09..f47d2ae 100644 --- a/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg diff --git a/nikola/data/samplesite/galleries/demo/tesla_lightning1_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla_lightning1_lg.jpg Binary files differindex 7e4a6a0..3c12b0e 100644 --- a/nikola/data/samplesite/galleries/demo/tesla_lightning1_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla_lightning1_lg.jpg diff --git a/nikola/data/samplesite/galleries/demo/tesla_lightning2_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla_lightning2_lg.jpg Binary files differindex 730b4de..8355d86 100644 --- a/nikola/data/samplesite/galleries/demo/tesla_lightning2_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla_lightning2_lg.jpg diff --git a/nikola/data/samplesite/galleries/demo/tesla_tower1_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla_tower1_lg.jpg Binary files differindex 1b9edcb..7d8b95b 100644 --- a/nikola/data/samplesite/galleries/demo/tesla_tower1_lg.jpg +++ b/nikola/data/samplesite/galleries/demo/tesla_tower1_lg.jpg diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst index 25e56f8..7116a7a 100644 --- a/nikola/data/samplesite/posts/1.rst +++ b/nikola/data/samplesite/posts/1.rst @@ -1,7 +1,8 @@ .. title: Welcome to Nikola .. slug: welcome-to-nikola -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: nikola, python, demo, blog +.. author: Roberto Alsina .. link: http://getnikola.com .. description: diff --git a/nikola/data/samplesite/stories/1.rst b/nikola/data/samplesite/stories/1.rst index 27c75d8..b662fae 100644 --- a/nikola/data/samplesite/stories/1.rst +++ b/nikola/data/samplesite/stories/1.rst @@ -1,6 +1,6 @@ .. title: Nikola: it generates static .. slug: about-nikola -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/a-study-in-scarlet.txt b/nikola/data/samplesite/stories/a-study-in-scarlet.txt index 10f9528..2dfee52 100644 --- a/nikola/data/samplesite/stories/a-study-in-scarlet.txt +++ b/nikola/data/samplesite/stories/a-study-in-scarlet.txt @@ -1,7 +1,7 @@ .. link: .. description: .. tags: -.. date: 2013/08/27 18:20:55 +.. date: 2013-08-27 18:20:55 UTC-03:00 .. title: A STUDY IN SCARLET. .. slug: a-study-in-scarlet diff --git a/nikola/data/samplesite/stories/bootstrap-demo.rst b/nikola/data/samplesite/stories/bootstrap-demo.rst index 520e4b0..a7be1a9 100644 --- a/nikola/data/samplesite/stories/bootstrap-demo.rst +++ b/nikola/data/samplesite/stories/bootstrap-demo.rst @@ -1,6 +1,6 @@ .. title: Bootstrap Demo .. slug: bootstrap-demo -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: bootstrap, demo .. link: http://getnikola.com .. description: diff --git a/nikola/data/samplesite/stories/charts.txt b/nikola/data/samplesite/stories/charts.txt index 2c90fdf..72fedb1 100644 --- a/nikola/data/samplesite/stories/charts.txt +++ b/nikola/data/samplesite/stories/charts.txt @@ -1,7 +1,7 @@ .. link: .. description: .. tags: -.. date: 2013/08/27 18:20:55 +.. date: 2013-08-27 18:20:55 UTC-03:00 .. title: Charts .. slug: charts diff --git a/nikola/data/samplesite/stories/listings-demo.rst b/nikola/data/samplesite/stories/listings-demo.rst index 7875f17..3bb8dc6 100644 --- a/nikola/data/samplesite/stories/listings-demo.rst +++ b/nikola/data/samplesite/stories/listings-demo.rst @@ -1,6 +1,6 @@ .. title: Listings Demo .. slug: listings-demo -.. date: 2012/12/15 10:16:20 +.. date: 2012-12-15 10:16:20 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/quickref.rst b/nikola/data/samplesite/stories/quickref.rst index 52e786f..7886cd1 100644 --- a/nikola/data/samplesite/stories/quickref.rst +++ b/nikola/data/samplesite/stories/quickref.rst @@ -1,6 +1,6 @@ .. title: A reStructuredText Reference .. slug: quickref -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/quickstart.rst b/nikola/data/samplesite/stories/quickstart.rst index 4282b23..5b78807 100644 --- a/nikola/data/samplesite/stories/quickstart.rst +++ b/nikola/data/samplesite/stories/quickstart.rst @@ -1,6 +1,6 @@ .. title: A reStructuredText Primer .. slug: quickstart -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/slides-demo.rst b/nikola/data/samplesite/stories/slides-demo.rst index fb1356b..0d07bbc 100644 --- a/nikola/data/samplesite/stories/slides-demo.rst +++ b/nikola/data/samplesite/stories/slides-demo.rst @@ -1,6 +1,6 @@ .. title: Slides Demo .. slug: slides-demo -.. date: 2012/12/27 10:16:20 +.. date: 2012-12-27 10:16:20 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt new file mode 100644 index 0000000..5a08781 --- /dev/null +++ b/nikola/data/symlinked.txt @@ -0,0 +1,151 @@ +docs/sphinx/creating-a-site.txt +docs/sphinx/creating-a-theme.txt +docs/sphinx/extending.txt +docs/sphinx/internals.txt +docs/sphinx/manual.txt +docs/sphinx/social_buttons.txt +docs/sphinx/theming.txt +docs/sphinx/upgrading-to-v6.txt +nikola/data/samplesite/stories/creating-a-theme.rst +nikola/data/samplesite/stories/extending.txt +nikola/data/samplesite/stories/internals.txt +nikola/data/samplesite/stories/manual.rst +nikola/data/samplesite/stories/social_buttons.txt +nikola/data/samplesite/stories/theming.rst +nikola/data/samplesite/stories/upgrading-to-v6.txt +nikola/data/themes/base/messages/messages_cz.py +nikola/data/themes/bootstrap-jinja/assets/css/bootstrap-responsive.css +nikola/data/themes/bootstrap-jinja/assets/css/bootstrap-responsive.min.css +nikola/data/themes/bootstrap-jinja/assets/css/bootstrap.css +nikola/data/themes/bootstrap-jinja/assets/css/bootstrap.min.css +nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css +nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png +nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif +nikola/data/themes/bootstrap-jinja/assets/css/theme.css +nikola/data/themes/bootstrap-jinja/assets/img/glyphicons-halflings-white.png +nikola/data/themes/bootstrap-jinja/assets/img/glyphicons-halflings.png +nikola/data/themes/bootstrap-jinja/assets/js/bootstrap.js +nikola/data/themes/bootstrap-jinja/assets/js/bootstrap.min.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js +nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js +nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js +nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox-min.js +nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js +nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.js +nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.map +nikola/data/themes/bootstrap-jinja/bundles +nikola/data/themes/bootstrap/assets/css/colorbox.css +nikola/data/themes/bootstrap/assets/css/images/controls.png +nikola/data/themes/bootstrap/assets/css/images/loading.gif +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js +nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js +nikola/data/themes/bootstrap/assets/js/jquery.colorbox-min.js +nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js +nikola/data/themes/bootstrap/assets/js/jquery.min.js +nikola/data/themes/bootstrap/assets/js/jquery.min.map +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css.map +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css.map +nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css +nikola/data/themes/bootstrap3-jinja/assets/css/docs.css +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderBottomCenter.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderBottomLeft.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderBottomRight.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderMiddleLeft.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderMiddleRight.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderTopCenter.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderTopLeft.png +nikola/data/themes/bootstrap3-jinja/assets/css/images/ie6/borderTopRight.png +nikola/data/themes/bootstrap3-jinja/assets/css/rst.css +nikola/data/themes/bootstrap3-jinja/assets/css/theme.css +nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.eot +nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.svg +nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.ttf +nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff +nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.js +nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.min.js +nikola/data/themes/bootstrap3-jinja/bundles +nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css +nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css.map +nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css +nikola/data/themes/bootstrap3/assets/css/bootstrap.css +nikola/data/themes/bootstrap3/assets/css/bootstrap.css.map +nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css +nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot +nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg +nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf +nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff +nikola/data/themes/bootstrap3/assets/js/bootstrap.js +nikola/data/themes/bootstrap3/assets/js/bootstrap.min.js diff --git a/nikola/data/themes/base-jinja/AUTHORS.txt b/nikola/data/themes/base-jinja/AUTHORS.txt new file mode 100644 index 0000000..043d497 --- /dev/null +++ b/nikola/data/themes/base-jinja/AUTHORS.txt @@ -0,0 +1 @@ +Roberto Alsina <https://github.com/ralsina> diff --git a/nikola/data/themes/base-jinja/README.md b/nikola/data/themes/base-jinja/README.md new file mode 100644 index 0000000..5d1da94 --- /dev/null +++ b/nikola/data/themes/base-jinja/README.md @@ -0,0 +1,4 @@ +This theme has almost no styling, it's meant as a basis from which other +themes can be developed. + +Therefore, most "advanced" features, such as slides or galleries, are broken. diff --git a/nikola/data/themes/base-jinja/bundles b/nikola/data/themes/base-jinja/bundles new file mode 100644 index 0000000..4760181 --- /dev/null +++ b/nikola/data/themes/base-jinja/bundles @@ -0,0 +1,2 @@ +assets/css/all.css=rst.css,code.css,theme.css +assets/css/all-nocdn.css=rst.css,code.css,theme.css diff --git a/nikola/data/themes/base-jinja/engine b/nikola/data/themes/base-jinja/engine new file mode 100644 index 0000000..6f04b30 --- /dev/null +++ b/nikola/data/themes/base-jinja/engine @@ -0,0 +1 @@ +jinja diff --git a/nikola/data/themes/base-jinja/parent b/nikola/data/themes/base-jinja/parent new file mode 100644 index 0000000..df967b9 --- /dev/null +++ b/nikola/data/themes/base-jinja/parent @@ -0,0 +1 @@ +base diff --git a/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl b/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl new file mode 100644 index 0000000..86d09b2 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl @@ -0,0 +1,16 @@ +{% macro css() %} + <link rel="stylesheet" href="http://assets.annotateit.org/annotator/v1.2.5/annotator.min.css"> +{% endmacro %} + +{% macro code() %} + <script src="http://code.jquery.com/jquery-migrate-1.2.1.js"></script> + <script src="http://assets.annotateit.org/annotator/v1.2.7/annotator-full.js"></script> + <script> + jQuery(function ($) { + $('body').annotator().annotator('setupPlugins', {}, { + // Disable filter bar + Filter: false + }); + }); + </script> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl new file mode 100644 index 0000000..2b15177 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/base.tmpl @@ -0,0 +1,25 @@ +{# -*- coding: utf-8 -*- #} +{% import 'base_helper.tmpl' as base with context %} +{% import 'base_header.tmpl' as header with context %} +{% import 'base_footer.tmpl' as footer with context %} +{% import 'annotation_helper.tmpl' as annotations with context %} +{{ set_locale(lang) }} +{{ base.html_headstart() }} +{% block extra_head %} +{# Leave this block alone. #} +{% endblock %} +{{ template_hooks['extra_head']() }} +</head> +<body> + <div id="container"> + {{ header.html_header() }} + <main id="content"> + {% block content %}{% endblock %} + </main> + {{ footer.html_footer() }} + </div> + {{ body_end }} + {{ template_hooks['body_end']() }} + {{ base.late_load_js() }} +</body> +</html> diff --git a/nikola/data/themes/base-jinja/templates/base_footer.tmpl b/nikola/data/themes/base-jinja/templates/base_footer.tmpl new file mode 100644 index 0000000..7fcf616 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/base_footer.tmpl @@ -0,0 +1,11 @@ +{# -*- coding: utf-8 -*- #} +{% import 'base_helper.tmpl' as base with context %} + +{% macro html_footer() %} + {% if content_footer %} + <footer id="footer" role="contentinfo"> + <p>{{ content_footer }}</p> + {{ template_hooks['page_footer']() }} + </footer> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl new file mode 100644 index 0000000..1001db3 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl @@ -0,0 +1,66 @@ +{# -*- coding: utf-8 -*- #} +{% import 'base_helper.tmpl' as base with context %} + +{% macro html_header() %} + <header id="header" role="banner"> + {{ html_site_title() }} + {{ html_translation_header() }} + {{ html_navigation_links() }} + {% if search_form %} + <div class="searchform" role="search"> + {{ search_form }} + </div> + {% endif %} + </header> + {{ template_hooks['page_header']() }} +{% endmacro %} + +{% macro html_site_title() %} + <h1 id="brand"><a href="{{ abs_link('/') }}" title="{{ blog_title }}" rel="home"> + {% 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></h1> +{% endmacro %} + +{% macro html_navigation_links() %} + <nav id="menu" role="navigation"> + <ul> + {% for url, text in navigation_links[lang] %} + {% if url is mapping %} + <li> {{ text }} + <ul> + {% for suburl, text in url %} + {% if rel_link(permalink, suburl) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a></li> + {% else %} + <li><a href="{{ suburl }}">{{ text }}</a></li> + {% endif %} + {% endfor %} + </ul> + {% else %} + {% if rel_link(permalink, url) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a></li> + {% else %} + <li><a href="{{ url }}">{{ text }}</a></li> + {% endif %} + {% endif %} + {% endfor %} + {{ template_hooks['menu']() }} + {{ template_hooks['menu_alt']() }} + </ul> + </nav> +{% endmacro %} + +{% macro html_translation_header() %} + {% if translations|length > 1 %} + <div id="toptranslations"> + <h2>{{ messages("Languages:") }}</h2> + {{ base.html_translations() }} + </div> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl new file mode 100644 index 0000000..2dda87b --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl @@ -0,0 +1,103 @@ +{# -*- coding: utf-8 -*- #} + +{% macro html_headstart() %} +<!DOCTYPE html> +<html + +{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook') %} +prefix=' +{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %} +og: http://ogp.me/ns# +{% endif %} +{% if use_open_graph %} +article: http://ogp.me/ns/article# +{% endif %} +{% if comment_system == 'facebook' %} +fb: http://ogp.me/ns/fb# +{% endif %} +' +{% endif %} + +{% if is_rtl %} +dir="rtl" +{% endif %} + +lang="{{ lang }}"> + <head> + <meta charset="utf-8"> + {% if description %} + <meta name="description" content="{{ description }}"> + {% endif %} + <meta name="viewport" content="width=device-width"> + <title>{{ title|e }} | {{ blog_title|e }}</title> + + {{ html_stylesheets() }} + {{ html_feedlinks() }} + {% if permalink %} + <link rel="canonical" href="{{ abs_link(permalink) }}"> + {% endif %} + + {% if favicons %} + {% for name, file, size in favicons %} + <link rel="{{ name }}" href="{{ file }}" sizes="{{ size }}"/> + {% endfor %} + {% endif %} + + {% if comment_system == 'facebook' %} + <meta property="fb:app_id" content="{{ comment_system_id }}"> + {% endif %} + + {{ mathjax_config }} + {% if use_cdn %} + <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> + {% else %} + <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]--> + {% endif %} + + {{ extra_head_data }} +{% endmacro %} + +{% macro late_load_js() %} + {{ social_buttons_code }} +{% endmacro %} + +{% macro html_stylesheets() %} + {% if use_bundles %} + {% if use_cdn %} + <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> + {% else %} + <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> + {% endif %} + {% else %} + <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/theme.css" rel="stylesheet" type="text/css"> + {% if has_custom_css %} + <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> + {% endif %} + {% endif %} +{% endmacro %} + +{% macro html_feedlinks() %} + {% if rss_link %} + {{ rss_link }} + {% elif generate_rss %} + {% if translations|length > 1 %} + {% for language in translations %} + <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}"> + {% endfor %} + {% else %} + <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}"> + {% endif %} + {% endif %} +{% endmacro %} + +{% macro html_translations() %} + <ul class="translations"> + {% for langname in translations.keys() %} + {% if langname != lang %} + <li><a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> + {% endif %} + {% endfor %} + </ul> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper.tmpl new file mode 100644 index 0000000..aba7294 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper.tmpl @@ -0,0 +1,63 @@ +{# -*- coding: utf-8 -*- #} + +{% import 'comments_helper_disqus.tmpl' as disqus with context %} +{% import 'comments_helper_livefyre.tmpl' as livefyre with context %} +{% import 'comments_helper_intensedebate.tmpl' as intensedebate with context %} +{% import 'comments_helper_muut.tmpl' as muut with context %} +{% import 'comments_helper_googleplus.tmpl' as googleplus with context %} +{% import 'comments_helper_facebook.tmpl' as facebook with context %} +{% import 'comments_helper_isso.tmpl' as isso with context %} + +{% macro comment_form(url, title, identifier) %} + {% if comment_system == 'disqus' %} + {{ disqus.comment_form(url, title, identifier) }} + {% elif comment_system == 'livefyre' %} + {{ livefyre.comment_form(url, title, identifier) }} + {% elif comment_system == 'intensedebate' %} + {{ intensedebate.comment_form(url, title, identifier) }} + {% elif comment_system == 'muut' %} + {{ muut.comment_form(url, title, identifier) }} + {% elif comment_system == 'googleplus' %} + {{ googleplus.comment_form(url, title, identifier) }} + {% elif comment_system == 'facebook' %} + {{ facebook.comment_form(url, title, identifier) }} + {% elif comment_system == 'isso' %} + {{ isso.comment_form(url, title, identifier) }} + {% endif %} +{% endmacro %} + +{% macro comment_link(link, identifier) %} + {% if comment_system == 'disqus' %} + {{ disqus.comment_link(link, identifier) }} + {% elif comment_system == 'livefyre' %} + {{ livefyre.comment_link(link, identifier) }} + {% elif comment_system == 'intensedebate' %} + {{ intensedebate.comment_link(link, identifier) }} + {% elif comment_system == 'muut' %} + {{ muut.comment_link(link, identifier) }} + {% elif comment_system == 'googleplus' %} + {{ googleplus.comment_link(link, identifier) }} + {% elif comment_system == 'facebook' %} + {{ facebook.comment_link(link, identifier) }} + {% elif comment_system == 'isso' %} + {{ isso.comment_link(link, identifier) }} + {% endif %} +{% endmacro %} + +{% macro comment_link_script() %} + {% if comment_system == 'disqus' %} + {{ disqus.comment_link_script() }} + {% elif comment_system == 'livefyre' %} + {{ livefyre.comment_link_script() }} + {% elif comment_system == 'intensedebate' %} + {{ intensedebate.comment_link_script() }} + {% elif comment_system == 'muut' %} + {{ muut.comment_link_script() }} + {% elif comment_system == 'googleplus' %} + {{ googleplus.comment_link_script() }} + {% elif comment_system == 'facebook' %} + {{ facebook.comment_link_script() }} + {% elif comment_system == 'isso' %} + {{ isso.comment_link_script() }} + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl new file mode 100644 index 0000000..8288bd4 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_disqus.tmpl @@ -0,0 +1,44 @@ +{# -*- coding: utf-8 -*- #} +<%! + import json + translations = { + 'es': 'es_ES', + } +%> + +{% macro comment_form(url, title, identifier) %} + {% if comment_system_id %} + <div id="disqus_thread"></div> + <script> + var disqus_shortname ="{{ comment_system_id }}", + {% if url %} + disqus_url="{{ url }}", + {% endif %} + disqus_title={{ title|tojson }}, + disqus_identifier="{{ identifier }}", + disqus_config = function () { + this.language = "{{ translations.get(lang, lang) }}"; + }; + (function() { + var dsq = document.createElement('script'); dsq.async = true; + dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); + </script> + <noscript>Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript> + <a href="//disqus.com" class="dsq-brlink" rel="nofollow">Comments powered by <span class="logo-disqus">Disqus</span></a> + {% endif %} +{% endmacro %} + +{% macro comment_link(link, identifier) %} + {% if comment_system_id %} + <a href="{{ link }}#disqus_thread" data-disqus-identifier="{{ identifier }}">Comments</a> + {% endif %} +{% endmacro %} + + +{% macro comment_link_script() %} + {% if comment_system_id %} + <script>var disqus_shortname="{{ comment_system_id }}";(function(){var a=document.createElement("script");a.async=true;a.src="//"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_facebook.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_facebook.tmpl new file mode 100644 index 0000000..21dac2a --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_facebook.tmpl @@ -0,0 +1,62 @@ +{# -*- coding: utf-8 -*- #} +{% macro comment_form(url, title, identifier) %} +<div id="fb-root"></div> +<script> + window.fbAsyncInit = function() { + // init the FB JS SDK + FB.init({ + appId : '{{ comment_system_id }}', + status : true, + xfbml : true + }); + + }; + + // Load the SDK asynchronously + (function(d, s, id){ + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) {return;} + js = d.createElement(s); js.id = id; + js.src = "//connect.facebook.net/en_US/all.js"; + fjs.parentNode.insertBefore(js, fjs); + }(document, 'script', 'facebook-jssdk')); +</script> + +<div class="fb-comments" data-href="{{ url }}" data-width="470"></div> +{% endmacro %} + +{% macro comment_link(link, identifier) %} +<span class="fb-comments-count" data-url="{{ link }}"> +{% endmacro %} + +{% macro comment_link_script() %} +<div id="fb-root"></div> +<script> + // thank lxml for this + $('.fb-comments-count').each(function(i, obj) { + var url = obj.attributes['data-url'].value; + // change here if you dislike the default way of displaying + // this + obj.innerHTML = '<fb:comments-count href="' + url + '"></fb:comments-count> comments'; + }); + + window.fbAsyncInit = function() { + // init the FB JS SDK + FB.init({ + appId : '{{ comment_system_id }}', + status : true, + xfbml : true + }); + + }; + + // Load the SDK asynchronously + (function(d, s, id){ + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) {return;} + js = d.createElement(s); js.id = id; + js.src = "//connect.facebook.net/en_US/all.js"; + fjs.parentNode.insertBefore(js, fjs); + }(document, 'script', 'facebook-jssdk')); +</script> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_googleplus.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_googleplus.tmpl new file mode 100644 index 0000000..cf153e0 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_googleplus.tmpl @@ -0,0 +1,17 @@ +{# -*- coding: utf-8 -*- #} +{% macro comment_form(url, title, identifier) %} +<script src="https://apis.google.com/js/plusone.js"></script> +<div class="g-comments" + data-href="{{ url }}" + data-first_party_property="BLOGGER" + data-view_type="FILTERED_POSTMOD"> +</div> +{% endmacro %} + +{% macro comment_link(link, identifier) %} +<div class="g-commentcount" data-href="{{ link }}"></div> +<script src="https://apis.google.com/js/plusone.js"></script> +{% endmacro %} + +{% macro comment_link_script() %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_intensedebate.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_intensedebate.tmpl new file mode 100644 index 0000000..042409b --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_intensedebate.tmpl @@ -0,0 +1,25 @@ +{# -*- coding: utf-8 -*- #} +{% macro comment_form(url, title, identifier) %} +<script> +var idcomments_acct = '{{ comment_system_id }}'; +var idcomments_post_id = "{{ identifier }}"; +var idcomments_post_url = "{{ url }}"; +</script> +<span id="IDCommentsPostTitle" style="display:none"></span> +<script src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script> +</script> +{% endmacro %} + +{% macro comment_link(link, identifier) %} +<a href="{link}" onclick="this.href='{{ link }}'; this.target='_self';"><span class='IDCommentsReplace' style='display:none'>{{ identifier }}</span> +<script> +var idcomments_acct = '{{ comment_system_id }}'; +var idcomments_post_id = "{{ identifier }}"; +var idcomments_post_url = "{{ link }}"; +</script> +<script src="http://www.intensedebate.com/js/genericLinkWrapperV2.js"></script> +</a> +{% endmacro %} + +{% macro comment_link_script() %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_isso.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_isso.tmpl new file mode 100644 index 0000000..22a9595 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_isso.tmpl @@ -0,0 +1,20 @@ +{# -*- coding: utf-8 -*- #} +{% macro comment_form(url, title, identifier) %} + {% if comment_system_id %} + <div data-title="{{ title|urlencode }}" id="isso-thread"></div> + <script src="{{ comment_system_id }}js/embed.min.js" data-isso="{{ comment_system_id }}"></script> + {% endif %} +{% endmacro %} + +{% macro comment_link(link, identifier) %} + {% if comment_system_id %} + <a href="{{ link }}#isso-thread">Comments</a> + {% endif %} +{% endmacro %} + + +{% macro comment_link_script() %} + {% if comment_system_id %} + <script src="{{ comment_system_id }}js/count.min.js" data-isso="{{ comment_system_id }}"></script> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_livefyre.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_livefyre.tmpl new file mode 100644 index 0000000..5b01fbf --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_livefyre.tmpl @@ -0,0 +1,33 @@ +{# -*- coding: utf-8 -*- #} +{% macro comment_form(url, title, identifier) %} +<div id="livefyre-comments"></div> +<script src="http://zor.livefyre.com/wjs/v3.0/javascripts/livefyre.js"></script> +<script> +(function () { + var articleId = "{{ identifier }}"; + fyre.conv.load({}, [{ + el: 'livefyre-comments', + network: "livefyre.com", + siteId: "{{ comment_system_id }}", + articleId: articleId, + signed: false, + collectionMeta: { + articleId: articleId, + url: fyre.conv.load.makeCollectionUrl(), + } + }], function() {}); +}()); +</script> +{% endmacro %} + +{% macro comment_link(link, identifier) %} + <a href="{{ link }}"> + <span class="livefyre-commentcount" data-lf-site-id="{{ comment_system_id }}" data-lf-article-id="{{ identifier }}"> + 0 Comments + </span> +{% endmacro %} + + +{% macro comment_link_script() %} +<script src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js"></script> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_mustache.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_mustache.tmpl new file mode 100644 index 0000000..8912e19 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_mustache.tmpl @@ -0,0 +1,5 @@ +{# -*- coding: utf-8 -*- #} +{% import 'comments_helper.tmpl' as comments with context %} +{% if not post.meta('nocomments') %} + {{ comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path) }} +{% endif %} diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_muut.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_muut.tmpl new file mode 100644 index 0000000..79ae523 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/comments_helper_muut.tmpl @@ -0,0 +1,13 @@ +{# -*- coding: utf-8 -*- #} + +{% macro comment_form(url, title, identifier) %} + <a class="muut" href="https://muut.com/i/{{ comment_system_id }}/{{ identifier }}">{{ comment_system_id }} forums</a> +{% endmacro %} + +{% macro comment_link(link, identifier) %} +{% endmacro %} + + +{% macro comment_link_script() %} +<script src="//cdn.muut.com/1/moot.min.js"></script> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/crumbs.tmpl b/nikola/data/themes/base-jinja/templates/crumbs.tmpl new file mode 100644 index 0000000..eede9c2 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/crumbs.tmpl @@ -0,0 +1,13 @@ +{# -*- coding: utf-8 -*- #} + +{% macro bar(crumbs) %} +{% if crumbs %} +<nav class="breadcrumbs"> +<ul class="breadcrumb"> + {% for link, text in crumbs %} + <li><a href="{{ link }}">{{ text }}</a></li> + {% endfor %} +</ul> +</nav> +{% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/gallery.tmpl b/nikola/data/themes/base-jinja/templates/gallery.tmpl new file mode 100644 index 0000000..86eea12 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/gallery.tmpl @@ -0,0 +1,36 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} +{% import 'comments_helper.tmpl' as comments with context %} +{% import 'crumbs.tmpl' as ui with context %} +{% block sourcelink %}{% endblock %} + +{% block content %} + {{ ui.bar(crumbs) }} + {% if title %} + <h1>{{ title }}</h1> + {% endif %} + {% if post %} + <p> + {{ post.text() }} + </p> + {% endif %} + {% if folders %} + <ul> + {% for folder, ftitle in folders %} + <li><a href="{{ folder }}"><i + class="icon-folder-open"></i> {{ ftitle }}</a></li> + {% endfor %} + </ul> + {% endif %} + {% if photo_array %} + <ul class="thumbnails"> + {% for image in photo_array %} + <li><a href="{{ image['url'] }}" class="thumbnail image-reference" title="{{ image['title'] }}"> + <img src="{{ image['url_thumb'] }}" alt="{{ image['title'] }}" /></a> + {% endfor %} + </ul> + {% endif %} +{% if site_has_comments and enable_comments %} + {{ comments.comment_form(None, permalink, title) }} +{% endif %} +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl new file mode 100644 index 0000000..206fc34 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/index.tmpl @@ -0,0 +1,34 @@ +{# -*- coding: utf-8 -*- #} +{% import 'index_helper.tmpl' as helper with context %} +{% import 'comments_helper.tmpl' as comments with context %} +{% extends 'base.tmpl' %} + +{% block content %} +<div class="postindex"> +{% for post in posts %} + <article class="h-entry post-{{ post.meta('type') }}"> + <header> + <h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title() }}</h1></a> + <div class="metadata"> + <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p> + {% if not post.meta('nocomments') and site_has_comments %} + <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }} + {% endif %} + </div> + </header> + {% if index_teasers %} + <div class="p-summary entry-summary"> + {{ post.text(teaser_only=True) }} + {% else %} + <div class="e-content entry-content"> + {{ post.text(teaser_only=False) }} + {% endif %} + </div> + </article> +{% endfor %} +</div> +{{ helper.html_pager() }} +{{ comments.comment_link_script() }} +{{ helper.mathjax_script(posts) }} +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/index_helper.tmpl b/nikola/data/themes/base-jinja/templates/index_helper.tmpl new file mode 100644 index 0000000..2f9e8ea --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/index_helper.tmpl @@ -0,0 +1,27 @@ +{# -*- coding: utf-8 -*- #} +{% macro html_pager() %} + {% if prevlink or nextlink %} + <nav class="postindexpager"> + <ul class="pager"> + {% if prevlink %} + <li class="previous"> + <a href="{{ prevlink }}" rel="prev">{{ messages("Newer posts") }}</a> + </li> + {% endif %} + {% if nextlink %} + <li class="next"> + <a href="{{ nextlink }}" rel="next">{{ messages("Older posts") }}</a> + </li> + {% endif %} + </ul> + </nav> + {% endif %} +{% endmacro %} + +{% macro mathjax_script(posts) %} + {% if posts|selectattr("is_mathjax")|list %} + <script type="text/x-mathjax-config"> + MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script> + <script src="/assets/js/mathjax.js"></script> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/list.tmpl b/nikola/data/themes/base-jinja/templates/list.tmpl new file mode 100644 index 0000000..e442864 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/list.tmpl @@ -0,0 +1,19 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} + +{% block content %} +<article class="listpage"> + <header> + <h1>{{ title }}</h1> + </header> + {% if items %} + <ul class="postlist"> + {% for text, link in items %} + <li><a href="{{ link }}">{{ text }}</a> + {% endfor %} + </ul> + {% else %} + <p>{{ messages("Nothing found.") }}</p> + {% endif %} +</article> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/list_post.tmpl b/nikola/data/themes/base-jinja/templates/list_post.tmpl new file mode 100644 index 0000000..b90f237 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/list_post.tmpl @@ -0,0 +1,19 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} + +{% block content %} +<article class="listpage"> + <header> + <h1>{{ title }}</h1> + </header> + {% if posts %} + <ul class="postlist"> + {% for post in posts %} + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title() }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></li> + {% endfor %} + </ul> + {% else %} + <p>{{ messages("No posts found.") }}</p> + {% endif %} +</article> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/listing.tmpl b/nikola/data/themes/base-jinja/templates/listing.tmpl new file mode 100644 index 0000000..ccbc5ba --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/listing.tmpl @@ -0,0 +1,23 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} +{% import 'crumbs.tmpl' as ui with context %} +{% block content %} +{{ ui.bar(crumbs) }} +{% if folders or files %} +<ul> +{% for name in folders %} + <li><a href="{{ name }}"><i class="icon-folder-open"></i> {{ name }}</a> +{% endfor %} +{% for name in files %} + <li><a href="{{ name }}.html"><i class="icon-file"></i> {{ name }}</a> +{% endfor %} +</ul> +{% endif %} +{% if code %} + {{ code }} +{% endif %} +{% if source_link %} + <p class="sourceline"><a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a></p> +{% endif %} +{% endblock %} + diff --git a/nikola/data/themes/base-jinja/templates/post.tmpl b/nikola/data/themes/base-jinja/templates/post.tmpl new file mode 100644 index 0000000..75c7690 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/post.tmpl @@ -0,0 +1,39 @@ +{# -*- coding: utf-8 -*- #} +{% import 'post_helper.tmpl' as helper with context %} +{% import 'post_header.tmpl' as pheader with context %} +{% import 'comments_helper.tmpl' as comments with context %} +{% extends 'base.tmpl' %} + +{% block extra_head %} + {{ super() }} + {% if post.meta('keywords') %} + <meta name="keywords" content="{{ post.meta('keywords')|e }}"> + {% endif %} + <meta name="author" content="{{ post.author() }}"> + {{ helper.open_graph_metadata(post) }} + {{ helper.twitter_card_information(post) }} + {{ helper.meta_translations(post) }} +{% endblock %} + +{% block content %} +<article class="post-{{ post.meta('type') }} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article"> + {{ pheader.html_post_header() }} + <div class="e-content entry-content" itemprop="articleBody text"> + {{ post.text() }} + </div> + <aside class="postpromonav"> + <nav> + {{ helper.html_tags(post) }} + {{ helper.html_pager(post) }} + </nav> + </aside> + {% if not post.meta('nocomments') and site_has_comments %} + <section class="comments"> + <h2>{{ messages("Comments") }}</h2> + {{ comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path) }} + </section> + {% endif %} + {{ helper.mathjax_script(post) }} +</article> +{{ comments.comment_link_script() }} +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl new file mode 100644 index 0000000..0ed40b9 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/post_header.tmpl @@ -0,0 +1,49 @@ +{# -*- coding: utf-8 -*- #} +{% import 'post_helper.tmpl' as helper with context %} +{% import 'comments_helper.tmpl' as comments with context %} + +{% macro html_title() %} +{% if title and not post.meta('hidetitle') %} + <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ title|e }}</a></h1> +{% endif %} +{% endmacro %} + +{% macro html_translations(post) %} + {% if translations|length > 1 %} + <div class="metadata posttranslations translations"> + <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3> + {% for langname in translations.keys() %} + {% if langname != lang and post.is_translation_available(langname) %} + <p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p> + {% endif %} + {% endfor %} + </div> + {% endif %} +{% endmacro %} + +{% macro html_sourcelink() %} + {% if show_sourcelink %} + <p class="sourceline"><a href="{{ post.source_link() }}" id="sourcelink">{{ messages("Source") }}</a></p> + {% endif %} +{% endmacro %} + +{% macro html_post_header() %} + <header> + {{ html_title() }} + <div class="metadata"> + <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p> + {% if not post.meta('nocomments') and site_has_comments %} + <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }} + {% endif %} + {{ html_sourcelink() }} + {% if post.meta('link') %} + <p><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p> + {% endif %} + {% if post.description() %} + <meta name="description" itemprop="description" content="{{ post.description() }}"> + {% endif %} + </div> + {{ html_translations(post) }} + </header> +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/post_helper.tmpl b/nikola/data/themes/base-jinja/templates/post_helper.tmpl new file mode 100644 index 0000000..c695e57 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/post_helper.tmpl @@ -0,0 +1,76 @@ +{# -*- coding: utf-8 -*- #} + +{% macro meta_translations(post) %} + {% if translations|length > 1 %} + {% for langname in translations.keys() %} + {% if langname != lang and post.is_translation_available(langname) %} + <link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}"> + {% endif %} + {% endfor %} + {% endif %} +{% endmacro %} + +{% macro html_tags(post) %} + {% if post.tags %} + <ul itemprop="keywords" class="tags"> + {% for tag in post.tags %} + <li><a class="tag p-category" href="{{ _link('tag', tag) }}" rel="tag">{{ tag }}</a></li> + {% endfor %} + </ul> + {% endif %} +{% endmacro %} + +{% macro html_pager(post) %} + {% if post.prev_post or post.next_post %} + <ul class="pager"> + {% if post.prev_post %} + <li class="previous"> + <a href="{{ post.prev_post.permalink() }}" rel="prev" title="{{ post.prev_post.title() }}">{{ messages("Previous post") }}</a> + </li> + {% endif %} + {% if post.next_post %} + <li class="next"> + <a href="{{ post.next_post.permalink() }}" rel="next" title="{{ post.next_post.title() }}">{{ messages("Next post") }}</a> + </li> + {% endif %} + </ul> + {% endif %} +{% endmacro %} + +{% macro open_graph_metadata(post) %} + {% if use_open_graph %} + <meta name="og:title" content="{{ post.title()[:70]|e }}"> + <meta name="og:url" content="{{ abs_link(permalink) }}"> + {% if post.description() %} + <meta name="og:description" content="{{ post.description()[:200]|e }}"> + {% else %} + <meta name="og:description" content="{{ post.text(strip_html=True)[:200]|e }}"> + {% endif %} + <meta name="og:site_name" content="{{ blog_title|e }}"> + <meta name="og:type" content="article"> + {% endif %} +{% endmacro %} + +{% macro twitter_card_information(post) %} + {% if twitter_card and twitter_card['use_twitter_cards'] %} + <meta name="twitter:card" content="{{ twitter_card.get('card', 'summary')|e }}"> + {% if 'site:id' in twitter_card %} + <meta name="twitter:site:id" content="{{ twitter_card['site:id'] }}"> + {% elif 'site' in twitter_card %} + <meta name="twitter:site" content="{{ twitter_card['site'] }}"> + {% endif %} + {% if 'creator:id' in twitter_card %} + <meta name="twitter:creator:id" content="{{ twitter_card['creator:id'] }}"> + {% elif 'creator' in twitter_card %} + <meta name="twitter:creator" content="{{ twitter_card['creator'] }}"> + {% endif %} + {% endif %} +{% endmacro %} + +{% macro mathjax_script(post) %} + {% if post.is_mathjax %} + <script type="text/x-mathjax-config"> + MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script> + <script src="/assets/js/mathjax.js"></script> + {% endif %} +{% endmacro %} diff --git a/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl b/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl new file mode 100644 index 0000000..ceaec3f --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/post_list_directive.tmpl @@ -0,0 +1,18 @@ +{# -*- coding: utf-8 -*- #} +{% block content %} +<!-- Begin post-list {{ post_list_id }} --> +<div id="{{ post_list_id }}" class="post-list"> + {% if posts %} + <ul class="post-list"> + {% for post in posts %} + <li class="post-list-item"> + {{ post.formatted_date(date_format) }} + + <a href="{{ post.permalink(lang) }}">{{ post.title(lang) }}</a> + </li> + {% endfor %} + </ul> + {% endif %} +</div> +<!-- End post-list {{ post_list_id }} --> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/slides.tmpl b/nikola/data/themes/base-jinja/templates/slides.tmpl new file mode 100644 index 0000000..0ae8fe8 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/slides.tmpl @@ -0,0 +1,24 @@ +{% block content %} +<div id="{{ carousel_id }}" class="carousel slide"> + <ol class="carousel-indicators"> + {% for i in range(slides_content|length) %} + {% if i == 0 %} + <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}" class="active"></li> + {% else %} + <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}"></li> + {% endif %} + {% endfor %} + </ol> + <div class="carousel-inner"> + {% for i, image in enumerate(slides_content) %} + {% if i == 0 %} + <div class="item active"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div> + {% else %} + <div class="item"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div> + {% endif %} + {% endfor %} + </div> + <a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev">‹</a> + <a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next">›</a> +</div> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/story.tmpl b/nikola/data/themes/base-jinja/templates/story.tmpl new file mode 100644 index 0000000..99caaee --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/story.tmpl @@ -0,0 +1,37 @@ +{# -*- coding: utf-8 -*- #} +{% import 'post_helper.tmpl' as helper with context %} +{% import 'post_header.tmpl' as pheader with context %} +{% import 'comments_helper.tmpl' as comments with context %} +{% extends 'post.tmpl' %} + +{% block extra_head %} + {{ super() }} + {% if post.meta('keywords') %} + <meta name="keywords" content="{{ post.meta('keywords')|e }}"> + {% endif %} + <meta name="author" content="{{ post.author() }}"> + {{ helper.open_graph_metadata(post) }} + {{ helper.twitter_card_information(post) }} + {{ helper.meta_translations(post) }} + {% if post.description() %} + <meta name="description" itemprop="description" content="{{ post.description() }}"> + {% endif %} +{% endblock %} + +{% block content %} +<article class="storypage" itemscope="itemscope" itemtype="http://schema.org/Article"> + <header> + {{ pheader.html_title() }} + {{ pheader.html_translations(post) }} + </header> + <div itemprop="articleBody text"> + {{ post.text() }} + </div> + {% if site_has_comments and enable_comments and not post.meta('nocomments') %} + <section class="comments"> + <h2>{{ messages("Comments") }}</h2> + {{ comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path) }} + </section> + {% endif %} +</article> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl new file mode 100644 index 0000000..84f9e68 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/tag.tmpl @@ -0,0 +1,40 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'list_post.tmpl' %} + +{% block extra_head %} + {{ super() }} + {% if translations|length > 1 and generate_rss %} + {% for language in translations %} + <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}"> + {% endfor %} + {% elif generate_rss %} + <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }}" href="{{ _link(kind + "_rss", tag) }}"> + {% endif %} +{% endblock %} + + +{% block content %} +<article class="tagpage"> + <header> + <h1>{{ title }}</h1> + <div class="metadata"> + {% if translations|length > 1 and generate_rss %} + {% for language in translations %} + <p class="feedlink"> + <a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a> + </p> + {% endfor %} + {% elif generate_rss %} + <p class="feedlink"><a href="{{ _link(kind + "_rss", tag) }}" type="application/rss+xml">{{ messages('RSS feed') }}</a></p> + {% endif %} + </div> + </header> + {% if posts %} + <ul class="postlist"> + {% for post in posts %} + <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title() }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></li> + {% endfor %} + </ul> + {% endif %} +</article> +{% endblock %} diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl new file mode 100644 index 0000000..af0a992 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/tagindex.tmpl @@ -0,0 +1,2 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'index.tmpl' %} diff --git a/nikola/data/themes/base-jinja/templates/tags.tmpl b/nikola/data/themes/base-jinja/templates/tags.tmpl new file mode 100644 index 0000000..7bcb7b2 --- /dev/null +++ b/nikola/data/themes/base-jinja/templates/tags.tmpl @@ -0,0 +1,30 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} + +{% block content %} +<article class="tagindex"> + <header> + <h1>{{ title }}</h1> + </header> + {% if cat_items %} + <h2>{{ messages("Categories") }}</h2> + <ul class="postlist"> + {% for text, link in cat_items %} + {% if text %} + <li><a class="reference" href="{{ link }}">{{ text }}</a></li> + {% endif %} + {% endfor %} + </ul> + {% if items %} + <h2>{{ messages("Tags") }}</h2> + {% endif %} + {% endif %} + {% if items %} + <ul class="postlist"> + {% for text, link in items %} + <li><a class="reference listtitle" href="{{ link }}">{{ text }}</a></li> + {% endfor %} + </ul> + {% endif %} +</article> +{% endblock %} diff --git a/nikola/data/themes/base/README.md b/nikola/data/themes/base/README.md index f92f490..5d1da94 100644 --- a/nikola/data/themes/base/README.md +++ b/nikola/data/themes/base/README.md @@ -1,4 +1,4 @@ This theme has almost no styling, it's meant as a basis from which other -teams can be developed. +themes can be developed. Therefore, most "advanced" features, such as slides or galleries, are broken. diff --git a/nikola/data/themes/base/assets/css/theme.css b/nikola/data/themes/base/assets/css/theme.css index 2a924f1..6fd1072 100644 --- a/nikola/data/themes/base/assets/css/theme.css +++ b/nikola/data/themes/base/assets/css/theme.css @@ -1 +1,255 @@ -/* This file intentionally left blank. */ +@charset "UTF-8"; + +/* + Copyright © 2014 Daniel Aleksandersen and others. + + Permission is hereby granted, free of charge, to any + person obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the + Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the + Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice + shall be included in all copies or substantial portions of + the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS + OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +body { + color: #4F5151; + font-family: Helvetica, Arial, sans-serif; + font-size: 17px; + line-height: 1.4; + padding: 1em; +} +@media print { + body { + font-family: Garamond, serif; + } +} + +#container { + margin: 1em auto; + max-width: 770px; +} +#menu ul, +#menu ul li, +.postpromonav .tags, +.postpromonav .tags li, +.pager, +.pager li, +#toptranslations ul, +#toptranslations ul li { + list-style: none; + padding-left: 0; + padding-right: 0; +} + +#toptranslations ul { + display: inline; +} + +#menu ul li, +#toptranslations ul li { + display: inline-block; + margin-right: 1.5em; +} + +#toptranslations h2 { + display: inline; + font-size: 1em; + margin-right: 1.5em; +} + +#menu ul li:dir(rtl), +#toptranslations ul li:dir(rtl), +#toptranslations h2:dir(rtl) { + margin-left: 1.5em; + margin-right: 0; +} + +#toptranslations { + text-align: right; + float: right; +} + +#toptranslations:dir(rtl) { + text-align: left; + float: left; +} + +.posttranslations h3 { + display: inline; + font-size: 1em; +} + +.entry-title { + font-size: 2em; +} + +.posttranslations h3:last-child { + display: none; +} + +.postindex article { + border-bottom: 1px solid #4F5151; + padding-bottom: 1em; +} +#header { + border-bottom: 1px solid #4F5151; +} +#footer { + border-top: 1px solid #4F5151; +} + +/* Tags */ +.postpromonav { + border-bottom: 1px solid #4F5151; + border-top: 1px solid #4F5151; + margin-top: 1em; + padding: .5em 0; +} +.postpromonav .tags { + text-align: center; +} +.metadata p:before, +.postpromonav .tags li:before, +.postlist .listdate:before { + content: " — "; +} +.postlist li { + margin-bottom: .33em; +} + +/* Post and archive pagers */ +.postindexpager .pager .next:before { + content: "↓ "; +} +.postindexpager .pager .previous:before { + content: "↑ "; +} +.postpromonav .pager .next:after { + content: " →"; +} +.postpromonav .pager .previous:dir(rtl):after { + content: " →"; +} +.postpromonav .pager .previous:before { + content: "← "; +} +.postpromonav .pager .next:dir(rtl):before { + content: "← "; +} + +.metadata p:first-of-type:before, +.postpromonav .tags li:first-of-type:before { + content: ""; +} +.postpromonav .pager { + height: 1em; +} +.postpromonav .tags li, +.postpromonav .pager li { + display: inline-block; +} +.postpromonav .pager .next { + float: right; +} +.postpromonav .pager .next:dir(rtl) { + float: left; +} +.metadata p { + display: inline; +} + +#brand { + font-size: 3em; + line-height: 1; +} + +/* Links */ +:link { + color: #1168CC; + text-decoration: none; +} +:visited { + color: #6830BB; +} +:link:hover, :visited:hover { + color: #0d53a3; +} + +#brand :link, +#brand :visited { + color: inherit; +} + +/* Images */ +img { + border: none; + line-height: 1; +} + +.postpage img, +.postpage object, +.postindex article img, +.postindex article object { + height: auto; + max-width: 100%; +} + +/* Comment helpers */ +#disqus_thread { + min-height: 325px; +} + +.breadcrumb { + padding: 8px 15px; + margin-bottom: 20px; + list-style: none; +} + +.breadcrumb > li { + display: inline-block; + margin-right: 0; + margin-left: 0; +} + +.breadcrumb > li:after { + content: ' / '; + color: #888; +} + +.breadcrumb > li:last-of-type:after { + content: ''; + margin-left: 0; +} + +.thumbnails { + list-style: none; + padding: 0; +} + +.thumbnails > li { + display: inline-block; + margin-right: 10px; +} + +.thumbnails > li:last-of-type { + margin-right: 0; +} + +.codetable .linenos { + padding-right: 10px; +} diff --git a/nikola/data/themes/base/assets/js/html5.js b/nikola/data/themes/base/assets/js/html5.js new file mode 100644 index 0000000..448cebd --- /dev/null +++ b/nikola/data/themes/base/assets/js/html5.js @@ -0,0 +1,8 @@ +/* + HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed +*/ +(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag(); +a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>"; +c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| +"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f); +if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document); diff --git a/nikola/data/themes/base/assets/js/mathjax.js b/nikola/data/themes/base/assets/js/mathjax.js index 82c1f6c..5e14369 100644 --- a/nikola/data/themes/base/assets/js/mathjax.js +++ b/nikola/data/themes/base/assets/js/mathjax.js @@ -5,7 +5,6 @@ window.onload = function () { setTimeout(function () { var script = document.createElement("script"); - script.type = "text/javascript"; if (location.protocol == 'https:') { scriptbase = "https://c328740.ssl.cf1.rackcdn.com/"; } else { diff --git a/nikola/data/themes/base/bundles b/nikola/data/themes/base/bundles index 4760181..d87b458 100644 --- a/nikola/data/themes/base/bundles +++ b/nikola/data/themes/base/bundles @@ -1,2 +1,2 @@ -assets/css/all.css=rst.css,code.css,theme.css -assets/css/all-nocdn.css=rst.css,code.css,theme.css +assets/css/all.css=rst.css,code.css,theme.css,custom.css +assets/css/all-nocdn.css=rst.css,code.css,theme.css,custom.css diff --git a/nikola/data/themes/base/messages/messages_bg.py b/nikola/data/themes/base/messages/messages_bg.py index 6e85212..4158ac8 100644 --- a/nikola/data/themes/base/messages/messages_bg.py +++ b/nikola/data/themes/base/messages/messages_bg.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Също достъпно в", + "%d min remaining to read": "", "Also available in:": "Също достъпно в:", "Archive": "Архив", "Categories": "Категории", + "Comments": "", "LANGUAGE": "Български", + "Languages:": "", "More posts about %s": "Още публикации относно %s", - "More posts about": "Още публикации относно", "Newer posts": "Нови публикации", "Next post": "Следваща публикация", "No posts found.": "", "Nothing found.": "", "Older posts": "Стари публикации", "Original site": "Оригиналния сайт", - "Posted": "Публиковано", "Posted:": "Публиковано:", "Posts about %s": "Публикации относно %s", "Posts for year %s": "Публикации за %s година", "Posts for {month} {year}": "Публикации за {month} {year}", "Previous post": "Предишна публикация", + "Publication date": "", + "RSS feed": "", "Read in English": "Прочетете на български", "Read more": "Прочети още", "Source": "Source", diff --git a/nikola/data/themes/base/messages/messages_ca.py b/nikola/data/themes/base/messages/messages_ca.py index 220d571..7723f3e 100644 --- a/nikola/data/themes/base/messages/messages_ca.py +++ b/nikola/data/themes/base/messages/messages_ca.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "També disponibles en", + "%d min remaining to read": "", "Also available in:": "També disponibles en:", "Archive": "Arxiu", "Categories": "", + "Comments": "", "LANGUAGE": "Català", + "Languages:": "", "More posts about %s": "Més entrades sobre %s", - "More posts about": "Més entrades sobre", "Newer posts": "Entrades posteriors", "Next post": "Entrada següent", "No posts found.": "", "Nothing found.": "", "Older posts": "Entrades anteriors", "Original site": "Lloc original", - "Posted": "Publicat", "Posted:": "Publicat:", "Posts about %s": "Entrades sobre %s", "Posts for year %s": "Entrades de l'any %s", "Posts for {month} {year}": "", "Previous post": "Entrada anterior", + "Publication date": "", + "RSS feed": "", "Read in English": "Llegeix-ho en català", "Read more": "Llegeix-ne més", "Source": "Codi", diff --git a/nikola/data/themes/base/messages/messages_cs.py b/nikola/data/themes/base/messages/messages_cs.py index f66c2c4..f80a79f 100644 --- a/nikola/data/themes/base/messages/messages_cs.py +++ b/nikola/data/themes/base/messages/messages_cs.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Dostupné také v", + "%d min remaining to read": "", "Also available in:": "Dostupné také v", "Archive": "Archiv", "Categories": "Kategorie", + "Comments": "", "LANGUAGE": "Čeština", + "Languages:": "", "More posts about %s": "Další příspěvky o %s", - "More posts about": "Další příspěvky o", "Newer posts": "Novější příspěvky", "Next post": "Další příspěvek", "No posts found.": "", "Nothing found.": "", "Older posts": "Starší příspěvky", "Original site": "Původní stránka", - "Posted": "Zveřejněno", "Posted:": "Zveřejněno:", "Posts about %s": "Příspěvky o %s", "Posts for year %s": "Příspěvky v roce %s", "Posts for {month} {year}": "Příspěvky v {month} {year}", "Previous post": "Předchozí příspěvek", + "Publication date": "", + "RSS feed": "", "Read in English": "Číst v češtině", "Read more": "Číst dál", "Source": "Zdroj", diff --git a/nikola/data/themes/base/messages/messages_de.py b/nikola/data/themes/base/messages/messages_de.py index 41fe015..737e63b 100644 --- a/nikola/data/themes/base/messages/messages_de.py +++ b/nikola/data/themes/base/messages/messages_de.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Auch verfügbar in", + "%d min remaining to read": "", "Also available in:": "Auch verfügbar in:", "Archive": "Archiv", "Categories": "Kategorien", + "Comments": "Kommentare", "LANGUAGE": "Deutsch", + "Languages:": "Sprachen:", "More posts about %s": "Weitere Einträge über %s", - "More posts about": "Weitere Einträge über", "Newer posts": "Neuere Einträge", "Next post": "Nächster Eintrag", - "No posts found.": "Keine einträge gefunden.", + "No posts found.": "Keine Einträge gefunden.", "Nothing found.": "Nichts gefunden.", "Older posts": "Ältere Einträge", "Original site": "Original-Seite", - "Posted": "Veröffentlicht", "Posted:": "Veröffentlicht:", "Posts about %s": "Einträge über %s", "Posts for year %s": "Einträge aus dem Jahr %s", "Posts for {month} {year}": "Einträge aus {month} {year}", "Previous post": "Vorheriger Eintrag", + "Publication date": "Veröffentlichungsdatum", + "RSS feed": "RSS-Feed", "Read in English": "Auf Deutsch lesen", "Read more": "Weiterlesen", "Source": "Source", diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py index f658fa0..aeca302 100644 --- a/nikola/data/themes/base/messages/messages_el.py +++ b/nikola/data/themes/base/messages/messages_el.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Διαθέσιμο και στα", + "%d min remaining to read": "", "Also available in:": "Διαθέσιμο και στα:", "Archive": "Αρχείο", "Categories": "Κατηγορίες", + "Comments": "", "LANGUAGE": "Ελληνικά", + "Languages:": "", "More posts about %s": "Περισσότερες αναρτήσεις για %s", - "More posts about": "Περισσότερες αναρτήσεις για", "Newer posts": "Νεότερες αναρτήσεις", "Next post": "Επόμενη ανάρτηση", "No posts found.": "", "Nothing found.": "", "Older posts": "Παλαιότερες αναρτήσεις", "Original site": "Ιστοσελίδα αρχικής ανάρτησης", - "Posted": "Αναρτήθηκε", "Posted:": "Αναρτήθηκε:", "Posts about %s": "Αναρτήσεις για %s", "Posts for year %s": "Αναρτήσεις για το έτος %s", "Posts for {month} {year}": "Αναρτήσεις για τον {month} του {year}", "Previous post": "Προηγούμενη ανάρτηση", + "Publication date": "", + "RSS feed": "", "Read in English": "Διαβάστε στα Ελληνικά", "Read more": "Διαβάστε περισσότερα", "Source": "Πηγαίος κώδικας", diff --git a/nikola/data/themes/base/messages/messages_en.py b/nikola/data/themes/base/messages/messages_en.py index e2bff53..bdf2d42 100644 --- a/nikola/data/themes/base/messages/messages_en.py +++ b/nikola/data/themes/base/messages/messages_en.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Also available in", + "%d min remaining to read": "%d min remaining to read", "Also available in:": "Also available in:", "Archive": "Archive", "Categories": "Categories", + "Comments": "Comments", "LANGUAGE": "English", + "Languages:": "Languages:", "More posts about %s": "More posts about %s", - "More posts about": "More posts about", "Newer posts": "Newer posts", "Next post": "Next post", "No posts found.": "No posts found.", "Nothing found.": "Nothing found.", "Older posts": "Older posts", "Original site": "Original site", - "Posted": "Posted", "Posted:": "Posted:", "Posts about %s": "Posts about %s", "Posts for year %s": "Posts for year %s", "Posts for {month} {year}": "Posts for {month} {year}", "Previous post": "Previous post", + "Publication date": "Publication date", + "RSS feed": "RSS feed", "Read in English": "Read in English", "Read more": "Read more", "Source": "Source", diff --git a/nikola/data/themes/base/messages/messages_eo.py b/nikola/data/themes/base/messages/messages_eo.py index f59a441..e439e6b 100644 --- a/nikola/data/themes/base/messages/messages_eo.py +++ b/nikola/data/themes/base/messages/messages_eo.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Ankaŭ disponebla en", + "%d min remaining to read": "", "Also available in:": "Ankaŭ disponebla en:", "Archive": "Arĥivo", "Categories": "Kategorioj", + "Comments": "", "LANGUAGE": "Anglalingve", + "Languages:": "", "More posts about %s": "Pli artikoloj pri %s", - "More posts about": "Pli artikoloj pri", "Newer posts": "Pli novaj artikoloj", "Next post": "Venonta artikolo", "No posts found.": "", "Nothing found.": "", "Older posts": "Pli malnovaj artikoloj", "Original site": "Originala interretejo", - "Posted": "Skribita", "Posted:": "Skribita:", "Posts about %s": "Artikoloj pri %s", "Posts for year %s": "Artikoloj de la jaro %s", "Posts for {month} {year}": "Artikoloj skribitaj en {month} {year}", "Previous post": "Antaŭa artikolo", + "Publication date": "", + "RSS feed": "", "Read in English": "Legu ĝin en Esperanto", "Read more": "Legu plu", "Source": "Fonto", diff --git a/nikola/data/themes/base/messages/messages_es.py b/nikola/data/themes/base/messages/messages_es.py index 1923683..0905f00 100644 --- a/nikola/data/themes/base/messages/messages_es.py +++ b/nikola/data/themes/base/messages/messages_es.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "También disponible en", + "%d min remaining to read": "restan %d minutos", "Also available in:": "También disponible en:", "Archive": "Archivo", "Categories": "Categorías", + "Comments": "Comentarios", "LANGUAGE": "Español", + "Languages:": "Idiomas:", "More posts about %s": "Más posts sobre %s", - "More posts about": "Más posts sobre", "Newer posts": "Posts posteriores", "Next post": "Siguiente post", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "No se encontraron posts", + "Nothing found.": "No encontrado", "Older posts": "Posts anteriores", "Original site": "Sitio original", - "Posted": "Publicado", "Posted:": "Publicado:", "Posts about %s": "Posts sobre %s", "Posts for year %s": "Posts del año %s", "Posts for {month} {year}": "Posts de {month} {year}", "Previous post": "Post anterior", + "Publication date": "Fecha de publicación", + "RSS feed": "feed RSS", "Read in English": "Leer en español", "Read more": "Leer más", "Source": "Código", diff --git a/nikola/data/themes/base/messages/messages_et.py b/nikola/data/themes/base/messages/messages_et.py index 058ab5f..f473985 100644 --- a/nikola/data/themes/base/messages/messages_et.py +++ b/nikola/data/themes/base/messages/messages_et.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Saadaval ka", + "%d min remaining to read": "", "Also available in:": "Saadaval ka:", "Archive": "Arhiiv", "Categories": "Kategooriad", + "Comments": "", "LANGUAGE": "Eesti", + "Languages:": "", "More posts about %s": "Veel postitusi %s kohta", - "More posts about": "Veel postitusi kohta", "Newer posts": "Uued postitused", "Next post": "Järgmine postitus", "No posts found.": "", "Nothing found.": "", "Older posts": "Vanemad postitused", "Original site": "Algallikas", - "Posted": "Postitatud", "Posted:": "Postitatud:", "Posts about %s": "Postitused %s kohta", "Posts for year %s": "Postitused aastast %s", "Posts for {month} {year}": "Postitused {year} aasta kuust {month} ", "Previous post": "Eelmine postitus", + "Publication date": "", + "RSS feed": "", "Read in English": "Loe eesti keeles", "Read more": "Loe veel", "Source": "Lähtekood", diff --git a/nikola/data/themes/base/messages/messages_eu.py b/nikola/data/themes/base/messages/messages_eu.py index a8eb743..8958d42 100644 --- a/nikola/data/themes/base/messages/messages_eu.py +++ b/nikola/data/themes/base/messages/messages_eu.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Eskuragarria hemen ere", + "%d min remaining to read": "", "Also available in:": "Eskuragarria hemen ere:", "Archive": "Artxiboa", "Categories": "Kategoriak", + "Comments": "", "LANGUAGE": "Euskara", + "Languages:": "", "More posts about %s": "%s-ri buruzko post gehiago", - "More posts about": "-ri buruzko post gehiago", "Newer posts": "Post berrienak", "Next post": "Hurrengo posta", "No posts found.": "", "Nothing found.": "", "Older posts": "Post zaharrenak", "Original site": "Jatorrizko orria", - "Posted": "Argitaratuta", "Posted:": "Argitaratuta:", "Posts about %s": "%s-ri buruzko postak", "Posts for year %s": "%s. urteko postak", "Posts for {month} {year}": "{year}ko {month}ren postak", "Previous post": "Aurreko posta", + "Publication date": "", + "RSS feed": "", "Read in English": "Euskaraz irakurri", "Read more": "Irakurri gehiago", "Source": "Iturria", diff --git a/nikola/data/themes/base/messages/messages_fa.py b/nikola/data/themes/base/messages/messages_fa.py index 4475e1b..49cfda5 100644 --- a/nikola/data/themes/base/messages/messages_fa.py +++ b/nikola/data/themes/base/messages/messages_fa.py @@ -2,30 +2,32 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "همچنین قابل دسترس از", + "%d min remaining to read": "", "Also available in:": "همچنین قابل دسترس از:", "Archive": "آرشیو", "Categories": "دستهها", + "Comments": "دیدگاهها", "LANGUAGE": "فارسی", + "Languages:": "زبانها:", "More posts about %s": "ارسالهای بیشتر دربارهٔ%s", - "More posts about": "ارسالهای بیشتر دربارهٔ", "Newer posts": "ارسالهای جدیدتر", "Next post": "ارسال بعدی", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "هیچ پستی پیدا نشد.", + "Nothing found.": "هیچچیزی پیدا نشد.", "Older posts": "پستهای قدیمیتر", "Original site": "سایت اصلی", - "Posted": "ارسال شده", "Posted:": "ارسال شده:", "Posts about %s": "ارسالها دربارهٔ %s", "Posts for year %s": "ارسالها برای سال %s", "Posts for {month} {year}": "ارسال برای {month} {year}", "Previous post": "ارسال پیشین", + "Publication date": "تاریخ انتشار", + "RSS feed": "خوراک", "Read in English": "به فارسی بخوانید", "Read more": "بیشتر بخوانید", "Source": "منبع", "Tags and Categories": "برچسبها و دستهها", "Tags": "برچسبها", "old posts, page %d": "صفحهٔ ارسالهای قدیمی %d", - "page %d": "", + "page %d": "برگه %d", } diff --git a/nikola/data/themes/base/messages/messages_fi.py b/nikola/data/themes/base/messages/messages_fi.py index 42e6fa2..b621459 100644 --- a/nikola/data/themes/base/messages/messages_fi.py +++ b/nikola/data/themes/base/messages/messages_fi.py @@ -2,30 +2,32 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Saatavilla myös", + "%d min remaining to read": "", "Also available in:": "Saatavilla myös:", "Archive": "Arkisto", "Categories": "Kategoriat", + "Comments": "Kommentit", "LANGUAGE": "Suomi", + "Languages:": "Kielet:", "More posts about %s": "Lisää postauksia aiheesta %s", - "More posts about": "Lisää postauksia aiheesta", "Newer posts": "Uudempia postauksia", "Next post": "Seuraava postaus", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Postauksia ei löytynyt.", + "Nothing found.": "Ei hakutuloksia.", "Older posts": "Vanhempia postauksia", "Original site": "Alkuperäinen sivusto", - "Posted": "Postattu", "Posted:": "Postattu:", "Posts about %s": "Postauksia aiheesta %s", "Posts for year %s": "Postauksia vuodelta %s", "Posts for {month} {year}": "Postauksia ajalle {month} {year}", "Previous post": "Vanhempia postauksia", + "Publication date": "Julkaisupäivämäärä", + "RSS feed": "RSS syöte", "Read in English": "Lue suomeksi", "Read more": "Lue lisää", "Source": "Lähde", "Tags and Categories": "Tagit ja kategoriat", "Tags": "Tagit", - "old posts, page %d": "vanhojen postauksien, sivu %d", + "old posts, page %d": "vanhoja postauksia, sivu %d", "page %d": "sivu %d", } diff --git a/nikola/data/themes/base/messages/messages_fr.py b/nikola/data/themes/base/messages/messages_fr.py index 484d695..316ba20 100644 --- a/nikola/data/themes/base/messages/messages_fr.py +++ b/nikola/data/themes/base/messages/messages_fr.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Egalement disponible en", + "%d min remaining to read": "", "Also available in:": "Egalement disponible en:", "Archive": "Archives", "Categories": "Catégories", + "Comments": "Commentaires", "LANGUAGE": "Français", + "Languages:": "Langues:", "More posts about %s": "Plus d'articles sur %s", - "More posts about": "Plus d'articles sur", "Newer posts": "Billets récents", "Next post": "Article suivant", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Pas de billets.", + "Nothing found.": "Pas de résultats.", "Older posts": "Anciens articles", "Original site": "Site d'origine", - "Posted": "Publié", "Posted:": "Publié:", "Posts about %s": "Articles sur %s", "Posts for year %s": "Articles de l'année %s", "Posts for {month} {year}": "Articles de {month} {year}", "Previous post": "Article précédent", + "Publication date": "Date de publication", + "RSS feed": "Flux RSS", "Read in English": "Lire en français", "Read more": "Lire la suite", "Source": "Source", diff --git a/nikola/data/themes/base/messages/messages_hi.py b/nikola/data/themes/base/messages/messages_hi.py index f72d5af..6b53e01 100644 --- a/nikola/data/themes/base/messages/messages_hi.py +++ b/nikola/data/themes/base/messages/messages_hi.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "उपलब्ध भाषाएँ", + "%d min remaining to read": "", "Also available in:": "उपलब्ध भाषाएँ:", "Archive": "आर्काइव", "Categories": "श्रेणियाँ", + "Comments": "", "LANGUAGE": "हिन्दी", + "Languages:": "", "More posts about %s": "%s के बारे में अौर पोस्टें", - "More posts about": " के बारे में अौर पोस्टें", "Newer posts": "नई पोस्टें", "Next post": "अगली पोस्ट", "No posts found.": "", "Nothing found.": "", "Older posts": "पुरानी पोस्टें", "Original site": "असली साइट", - "Posted": "पोस्टेड", "Posted:": "पोस्टेड:", "Posts about %s": "%s के बारे में पोस्टें", "Posts for year %s": "साल %s की पोस्टें", "Posts for {month} {year}": "{month} {year} की पोस्टें", "Previous post": "पिछली पोस्ट", + "Publication date": "", + "RSS feed": "", "Read in English": "हिन्दी में पढ़िए", "Read more": "और पढ़िए", "Source": "सोर्स", diff --git a/nikola/data/themes/base/messages/messages_hr.py b/nikola/data/themes/base/messages/messages_hr.py index ee5ce41..c3343c9 100644 --- a/nikola/data/themes/base/messages/messages_hr.py +++ b/nikola/data/themes/base/messages/messages_hr.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Također dostupno i u", + "%d min remaining to read": "", "Also available in:": "Također dostupno i u:", "Archive": "Arhiva", "Categories": "Kategorije", + "Comments": "Komentari", "LANGUAGE": "hrvatski", + "Languages:": "Jezici:", "More posts about %s": "Više postova o %s", - "More posts about": "Više postova o", "Newer posts": "Noviji postovi", "Next post": "Sljedeći post", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Nema postova.", + "Nothing found.": "Nema ničeg.", "Older posts": "Stariji postovi", "Original site": "Izvorna stranica", - "Posted": "Objavljeno", "Posted:": "Objavljeno:", "Posts about %s": "Postovi o %s", "Posts for year %s": "Postovi za godinu %s", "Posts for {month} {year}": "Postovi za {month} {year}", "Previous post": "Prethodni post", + "Publication date": "Nadnevak objave", + "RSS feed": "RSS kanal", "Read in English": "Čitaj na hrvatskom", "Read more": "Čitaj dalje", "Source": "Izvor", diff --git a/nikola/data/themes/base/messages/messages_it.py b/nikola/data/themes/base/messages/messages_it.py index 87e25e5..b248d34 100644 --- a/nikola/data/themes/base/messages/messages_it.py +++ b/nikola/data/themes/base/messages/messages_it.py @@ -2,27 +2,29 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Anche disponibile in", + "%d min remaining to read": "ancora %d minuti", "Also available in:": "Anche disponibile in:", "Archive": "Archivio", "Categories": "Categorie", + "Comments": "Commenti", "LANGUAGE": "Italiano", + "Languages:": "Lingue:", "More posts about %s": "Altri articoli collegati %s", - "More posts about": "Altri articoli collegati", "Newer posts": "Articoli recenti", "Next post": "Articolo successivo", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Nessun articolo trovato.", + "Nothing found.": "Non trovato.", "Older posts": "Articoli precedenti", "Original site": "Sito originale", - "Posted": "Pubblicato", "Posted:": "Pubblicato:", "Posts about %s": "Articoli su %s", "Posts for year %s": "Articoli per l'anno %s", "Posts for {month} {year}": "Articoli per {month} {year}", "Previous post": "Articolo precedente", + "Publication date": "Data di pubblicazione", + "RSS feed": "Flusso RSS", "Read in English": "Leggi in italiano", - "Read more": "Espandi", + "Read more": "Continua la lettura", "Source": "Sorgente", "Tags and Categories": "Tags e Categorie", "Tags": "Tags", diff --git a/nikola/data/themes/base/messages/messages_ja.py b/nikola/data/themes/base/messages/messages_ja.py index 2df16a4..4b0fd54 100644 --- a/nikola/data/themes/base/messages/messages_ja.py +++ b/nikola/data/themes/base/messages/messages_ja.py @@ -2,30 +2,32 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "他の言語で読む", + "%d min remaining to read": "", "Also available in:": "他の言語で読む：", "Archive": "過去の記事", "Categories": "カテゴリー", + "Comments": "コメント", "LANGUAGE": "日本語", + "Languages:": "言語 :", "More posts about %s": "タグ： %s", - "More posts about": "タグ：", "Newer posts": "新しい記事", "Next post": "次の記事", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "記事はありません", + "Nothing found.": "なにも見つかりませんでした", "Older posts": "過去の記事", "Original site": "元のサイト", - "Posted": "投稿日時", "Posted:": "投稿日時：", "Posts about %s": "%sについての記事", "Posts for year %s": "%s年の記事", "Posts for {month} {year}": "{year}年{month}月の記事", "Previous post": "前の記事", + "Publication date": "投稿日", + "RSS feed": "RSS フィード", "Read in English": "日本語で読む", "Read more": "続きを読む", "Source": "ソース", "Tags and Categories": "タグとカテゴリー", "Tags": "タグ", "old posts, page %d": "前の記事 %dページ目", - "page %d": "", + "page %d": "ページ %d", } diff --git a/nikola/data/themes/base/messages/messages_nb.py b/nikola/data/themes/base/messages/messages_nb.py index 44fde8a..f6232df 100644 --- a/nikola/data/themes/base/messages/messages_nb.py +++ b/nikola/data/themes/base/messages/messages_nb.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Også tilgjengelig på", + "%d min remaining to read": "", "Also available in:": "Også tilgjengelig på:", "Archive": "Arkiv", "Categories": "Kategorier", + "Comments": "", "LANGUAGE": "norsk", + "Languages:": "", "More posts about %s": "Flere innlegg om %s", - "More posts about": "Flere innlegg om", "Newer posts": "Nyere innlegg", "Next post": "Neste innlegg", "No posts found.": "", "Nothing found.": "", "Older posts": "Eldre innlegg", "Original site": "Opprinnelig side", - "Posted": "Publisert", "Posted:": "Publisert:", "Posts about %s": "Innlegg om %s", "Posts for year %s": "Innlegg fra %s", "Posts for {month} {year}": "Innlegg fra {month} {year}", "Previous post": "Forrige innlegg", + "Publication date": "", + "RSS feed": "", "Read in English": "Les på norsk", "Read more": "Les mer", "Source": "Kilde", diff --git a/nikola/data/themes/base/messages/messages_nl.py b/nikola/data/themes/base/messages/messages_nl.py index 1952d2e..7cba96b 100644 --- a/nikola/data/themes/base/messages/messages_nl.py +++ b/nikola/data/themes/base/messages/messages_nl.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Ook beschikbaar in", + "%d min remaining to read": "%d min resterende leestijd ", "Also available in:": "Ook beschikbaar in:", "Archive": "Archief", "Categories": "Categorieën", + "Comments": "Commentaar", "LANGUAGE": "Nederlands", + "Languages:": "Talen:", "More posts about %s": "Meer berichten over %s", - "More posts about": "Meer berichten over", "Newer posts": "Nieuwere berichten", "Next post": "Volgend bericht", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Geen berichten gevonden.", + "Nothing found.": "Niets gevonden.", "Older posts": "Oudere berichten", "Original site": "Originele site", - "Posted": "Geplaatst", "Posted:": "Geplaatst:", "Posts about %s": "Berichten over %s", "Posts for year %s": "Berichten voor het jaar %s", "Posts for {month} {year}": "Berichten voor {month} {year}", "Previous post": "Vorig bericht", + "Publication date": "Publicatiedatum", + "RSS feed": "RSS-feed", "Read in English": "Lees in het Nederlands", "Read more": "Lees verder", "Source": "Bron", diff --git a/nikola/data/themes/base/messages/messages_pl.py b/nikola/data/themes/base/messages/messages_pl.py index a1183ba..6b6e48d 100644 --- a/nikola/data/themes/base/messages/messages_pl.py +++ b/nikola/data/themes/base/messages/messages_pl.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Również dostępny w językach", + "%d min remaining to read": "zostało %d minut czytania", "Also available in:": "Również dostępny w językach:", "Archive": "Archiwum", "Categories": "Kategorie", + "Comments": "Komentarze", "LANGUAGE": "polski", + "Languages:": "Języki:", "More posts about %s": "Więcej postów o %s", - "More posts about": "Więcej postów o", "Newer posts": "Nowsze posty", "Next post": "Następny post", "No posts found.": "Nie znaleziono żadnych postów.", "Nothing found.": "Nic nie znaleziono.", "Older posts": "Starsze posty", "Original site": "Oryginalna strona", - "Posted": "Opublikowano", "Posted:": "Opublikowano:", "Posts about %s": "Posty o %s", "Posts for year %s": "Posty z roku %s", "Posts for {month} {year}": "Posty z {month} {year}", "Previous post": "Poprzedni post", + "Publication date": "Data publikacji", + "RSS feed": "Kanał RSS", "Read in English": "Czytaj po polsku", "Read more": "Czytaj więcej", "Source": "Źródło", diff --git a/nikola/data/themes/base/messages/messages_pt_br.py b/nikola/data/themes/base/messages/messages_pt_br.py index bf515e4..c86b2f8 100644 --- a/nikola/data/themes/base/messages/messages_pt_br.py +++ b/nikola/data/themes/base/messages/messages_pt_br.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Também disponível em", + "%d min remaining to read": "%d mín restante para leitura", "Also available in:": "Também disponível em:", "Archive": "Arquivo", "Categories": "Categorias", + "Comments": "Comentários", "LANGUAGE": "Português", + "Languages:": "Idiomas:", "More posts about %s": "Mais posts sobre %s", - "More posts about": "Mais posts sobre", "Newer posts": "Posts mais recentes", "Next post": "Próximo post", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Nenhum tópico encontrado.", + "Nothing found.": "Nada encontrado.", "Older posts": "Posts mais antigos", "Original site": "Site original", - "Posted": "Publicado", "Posted:": "Publicado:", "Posts about %s": "Posts sobre %s", "Posts for year %s": "Posts do ano %s", "Posts for {month} {year}": "Posts de {month} {year}", "Previous post": "Post anterior", + "Publication date": "Data de publicação", + "RSS feed": "Feed RSS", "Read in English": "Ler em português", "Read more": "Leia mais", "Source": "Código", diff --git a/nikola/data/themes/base/messages/messages_ru.py b/nikola/data/themes/base/messages/messages_ru.py index fb33b85..7c038cc 100644 --- a/nikola/data/themes/base/messages/messages_ru.py +++ b/nikola/data/themes/base/messages/messages_ru.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Также доступно на", + "%d min remaining to read": "%d минут чтения осталось", "Also available in:": "Также доступно на:", "Archive": "Архив", "Categories": "Категории", + "Comments": "Комментарии", "LANGUAGE": "Русский", + "Languages:": "Языки:", "More posts about %s": "Больше записей о %s", - "More posts about": "Больше записей о", "Newer posts": "Новые записи", "Next post": "Следующая запись", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Записей не найдено.", + "Nothing found.": "Ничего не найдено.", "Older posts": "Старые записи", "Original site": "Оригинальный сайт", - "Posted": "Опубликовано", "Posted:": "Опубликовано:", "Posts about %s": "Записи о %s", "Posts for year %s": "Записи за %s год", "Posts for {month} {year}": "Записи за {month} {year}", "Previous post": "Предыдущая запись", + "Publication date": "Дата опубликования", + "RSS feed": "RSS лента", "Read in English": "Прочесть по-русски", "Read more": "Читать далее", "Source": "Источник", diff --git a/nikola/data/themes/base/messages/messages_sk.py b/nikola/data/themes/base/messages/messages_sk.py new file mode 100644 index 0000000..3b56a58 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_sk.py @@ -0,0 +1,33 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "%d min remaining to read": "", + "Also available in:": "Tiež dostupné v:", + "Archive": "Archív", + "Categories": "Kategórie", + "Comments": "Komentáre", + "LANGUAGE": "Slovenčina", + "Languages:": "Jazyky:", + "More posts about %s": "Viac príspevkov o %s", + "Newer posts": "Novšie príspevky", + "Next post": "Nasledujúci príspevok", + "No posts found.": "Žiadne príspevky nenájdené", + "Nothing found.": "Nič nenájdené.", + "Older posts": "Staršie príspevky", + "Original site": "Pôvodná stránka", + "Posted:": "Zverejnené:", + "Posts about %s": "Príspevky o %s", + "Posts for year %s": "Príspevky z roku %s", + "Posts for {month} {year}": "Príspevky za mesiac {month} z roku {year}", + "Previous post": "Predchádzajúci príspevok", + "Publication date": "Dátum zverejnenia", + "RSS feed": "RSS kanál", + "Read in English": "Čítať v slovenčine", + "Read more": "Čítať ďalej", + "Source": "Zdroj", + "Tags and Categories": "Štítky a kategórie", + "Tags": "Štítky", + "old posts, page %d": "staré príspevky, strana %d", + "page %d": "stránka %d", +} diff --git a/nikola/data/themes/base/messages/messages_sl.py b/nikola/data/themes/base/messages/messages_sl.py index 92ad483..53045e3 100644 --- a/nikola/data/themes/base/messages/messages_sl.py +++ b/nikola/data/themes/base/messages/messages_sl.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Na voljo tudi v", + "%d min remaining to read": "za prebrati preostalo še %d min", "Also available in:": "Na voljo tudi v:", "Archive": "Arhiv", "Categories": "Kategorije", + "Comments": "Komentarji", "LANGUAGE": "Slovenščina", + "Languages:": "Jeziki:", "More posts about %s": "Več objav o %s", - "More posts about": "Več objav o", "Newer posts": "Novejše objave", "Next post": "Naslednja objava", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "Ni najdenih objav.", + "Nothing found.": "Brez zadetkov.", "Older posts": "Starejše objave", "Original site": "Izvorna spletna stran", - "Posted": "Objavljeno", "Posted:": "Objavljeno:", "Posts about %s": "Objave o %s", "Posts for year %s": "Objave za leto %s", "Posts for {month} {year}": "Objave za {month} {year}", "Previous post": "Prejšnja objava", + "Publication date": "Datum objave", + "RSS feed": "vir RSS", "Read in English": "Beri v slovenščini", "Read more": "Več o tem", "Source": "Izvor", diff --git a/nikola/data/themes/base/messages/messages_sl_si.py b/nikola/data/themes/base/messages/messages_sl_si.py deleted file mode 120000 index 152e151..0000000 --- a/nikola/data/themes/base/messages/messages_sl_si.py +++ /dev/null @@ -1 +0,0 @@ -messages_sl.py
\ No newline at end of file diff --git a/nikola/data/themes/base/messages/messages_tr.py b/nikola/data/themes/base/messages/messages_tr.py index ad92768..df9c4eb 120000..100644 --- a/nikola/data/themes/base/messages/messages_tr.py +++ b/nikola/data/themes/base/messages/messages_tr.py @@ -1 +1,33 @@ -messages_tr_tr.py
\ No newline at end of file +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "%d min remaining to read": "", + "Also available in:": "Şu dilde de mevcut:", + "Archive": "Arşiv", + "Categories": "Kategoriler", + "Comments": "Yorumlar", + "LANGUAGE": "Türkçe", + "Languages:": "Diller:", + "More posts about %s": "%s ilgili diğer yazılar", + "Newer posts": "Daha yeni yazılar", + "Next post": "Sonraki yazı", + "No posts found.": "Yazı bulunamadı.", + "Nothing found.": "Hiçbir şey bulunamadı.", + "Older posts": "Daha eski yazılar", + "Original site": "Orjinal web sayfası", + "Posted:": "Yayın tarihi:", + "Posts about %s": "%s ile ilgili yazılar", + "Posts for year %s": "%s yılındaki yazılar", + "Posts for {month} {year}": "{month} {year} göre yazılar", + "Previous post": "Önceki yazı", + "Publication date": "Yayınlanma tarihi", + "RSS feed": "RSS kaynağı", + "Read in English": "Türkçe olarak oku", + "Read more": "Devamını oku", + "Source": "Kaynak", + "Tags and Categories": "Etiketler ve Kategoriler", + "Tags": "Etiketler", + "old posts, page %d": "eski yazılar, sayfa %d", + "page %d": "sayfa %d", +} diff --git a/nikola/data/themes/base/messages/messages_tr_tr.py b/nikola/data/themes/base/messages/messages_tr_tr.py deleted file mode 100644 index 95c5736..0000000 --- a/nikola/data/themes/base/messages/messages_tr_tr.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- encoding:utf-8 -*- -from __future__ import unicode_literals - -MESSAGES = { - "Also available in": "Şu dilde de mevcut", - "Also available in:": "Şu dilde de mevcut:", - "Archive": "Arşiv", - "Categories": "Kategoriler", - "LANGUAGE": "Türkçe", - "More posts about %s": "%s ilgili diğer yazılar", - "More posts about": " ilgili diğer yazılar", - "Newer posts": "Daha yeni yazılar", - "Next post": "Sonraki yazı", - "No posts found.": "", - "Nothing found.": "", - "Older posts": "Daha eski yazılar", - "Original site": "Orjinal web sayfası", - "Posted": "Yayın tarihi", - "Posted:": "Yayın tarihi:", - "Posts about %s": "%s ile ilgili yazılar", - "Posts for year %s": "%s yılındaki yazılar", - "Posts for {month} {year}": "{month} {year} göre yazılar", - "Previous post": "Önceki yazı", - "Read in English": "Türkçe olarak oku", - "Read more": "Devamını oku", - "Source": "Kaynak", - "Tags and Categories": "Etiketler ve Kategoriler", - "Tags": "Etiketler", - "old posts, page %d": "eski yazılar, sayfa %d", - "page %d": "sayfa %d", -} diff --git a/nikola/data/themes/base/messages/messages_ur.py b/nikola/data/themes/base/messages/messages_ur.py index 794861d..204d95f 100644 --- a/nikola/data/themes/base/messages/messages_ur.py +++ b/nikola/data/themes/base/messages/messages_ur.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "ان زبانوں میں بھی دستیاب", + "%d min remaining to read": "%d منٹ کا مطالعہ باقی", "Also available in:": "ان زبانوں میں بھی دستیاب:", "Archive": "آرکائیو", "Categories": "زمرے", + "Comments": "تبصرے", "LANGUAGE": "اردو", + "Languages:": "زبانیں:", "More posts about %s": "%s کے بارے میں مزید تحاریر", - "More posts about": " کے بارے میں مزید تحاریر", "Newer posts": "نئی تحاریر", "Next post": "اگلی تحریر", - "No posts found.": "", - "Nothing found.": "", + "No posts found.": "کوئی تحریر نہیں مل سکی۔", + "Nothing found.": "کچھ نہیں مل سکا۔", "Older posts": "پرانی تحاریر", "Original site": "اصلی سائٹ", - "Posted": "اشاعت", "Posted:": "اشاعت:", "Posts about %s": "%s کے بارے میں تحاریر", "Posts for year %s": "سال %s کی تحاریر", "Posts for {month} {year}": "{month} {year} کی تحاریر", "Previous post": "پچھلی تحریر", + "Publication date": "تاریخِ اشاعت", + "RSS feed": "آر ایس ایس فیڈ", "Read in English": "اردو میں پڑھیے", "Read more": "مزید پڑھیے", "Source": "سورس", diff --git a/nikola/data/themes/base/messages/messages_zh_cn.py b/nikola/data/themes/base/messages/messages_zh_cn.py index 2f937c7..525cb45 100644 --- a/nikola/data/themes/base/messages/messages_zh_cn.py +++ b/nikola/data/themes/base/messages/messages_zh_cn.py @@ -2,25 +2,27 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "其他语言版本", + "%d min remaining to read": "", "Also available in:": "其他语言版本：", "Archive": "文章存档", "Categories": "分类", + "Comments": "", "LANGUAGE": "简体中文", + "Languages:": "", "More posts about %s": "更多相关文章： %s", - "More posts about": "更多相关文章：", "Newer posts": "新一篇", "Next post": "后一篇", "No posts found.": "", "Nothing found.": "", "Older posts": "旧一篇", "Original site": "原文地址", - "Posted": "发表于", "Posted:": "发表于：", "Posts about %s": "文章分类：%s", "Posts for year %s": "%s年文章", "Posts for {month} {year}": "{year}年{month}月文章", "Previous post": "前一篇", + "Publication date": "", + "RSS feed": "", "Read in English": "中文版", "Read more": "更多", "Source": "源代码", diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl index 8a90349..f587593 100644 --- a/nikola/data/themes/base/templates/base.tmpl +++ b/nikola/data/themes/base/templates/base.tmpl @@ -1,45 +1,25 @@ ## -*- coding: utf-8 -*- <%namespace name="base" file="base_helper.tmpl" import="*"/> +<%namespace name="header" file="base_header.tmpl" import="*"/> +<%namespace name="footer" file="base_footer.tmpl" import="*"/> <%namespace name="annotations" file="annotation_helper.tmpl"/> ${set_locale(lang)} -<!DOCTYPE html> -<html -%if comment_system == 'facebook': -xmlns:fb="http://ogp.me/ns/fb#" -%endif -lang="${lang}"> -<head> - ${base.html_head()} - <%block name="extra_head"> - </%block> - ${extra_head_data} +${base.html_headstart()} +<%block name="extra_head"> +### Leave this block alone. +</%block> +${template_hooks['extra_head']()} </head> <body> - <h1 id="blog-title"> - <a href="${abs_link('/')}" title="${blog_title}" rel="home">${blog_title}</a> - </h1> - <%block name="belowtitle"> - %if len(translations) > 1: - <small> - ${messages("Also available in:")} - ${base.html_translations()} - </small> - %endif - </%block> - <%block name="content"></%block> - <small>${content_footer}</small> - <!--Sidebar content--> - <ul class="unstyled"> - %if license: - <li>${license} - %endif - ${base.html_social()} - ${base.html_navigation_links()} - %if search_form: - <li>${search_form} - %endif - </ul> + <div id="container"> + ${header.html_header()} + <main id="content"> + <%block name="content"></%block> + </main> + ${footer.html_footer()} + </div> + ${body_end} + ${template_hooks['body_end']()} ${base.late_load_js()} - ${social_buttons_code} </body> </html> diff --git a/nikola/data/themes/base/templates/base_footer.tmpl b/nikola/data/themes/base/templates/base_footer.tmpl new file mode 100644 index 0000000..9a1c00f --- /dev/null +++ b/nikola/data/themes/base/templates/base_footer.tmpl @@ -0,0 +1,11 @@ +## -*- coding: utf-8 -*- +<%namespace name="base" file="base_helper.tmpl" import="*"/> + +<%def name="html_footer()"> + %if content_footer: + <footer id="footer" role="contentinfo"> + <p>${content_footer}</p> + ${template_hooks['page_footer']()} + </footer> + %endif +</%def> diff --git a/nikola/data/themes/base/templates/base_header.tmpl b/nikola/data/themes/base/templates/base_header.tmpl new file mode 100644 index 0000000..0c6e12d --- /dev/null +++ b/nikola/data/themes/base/templates/base_header.tmpl @@ -0,0 +1,66 @@ +## -*- coding: utf-8 -*- +<%namespace name="base" file="base_helper.tmpl" import="*"/> + +<%def name="html_header()"> + <header id="header" role="banner"> + ${html_site_title()} + ${html_translation_header()} + ${html_navigation_links()} + %if search_form: + <div class="searchform" role="search"> + ${search_form} + </div> + %endif + </header> + ${template_hooks['page_header']()} +</%def> + +<%def name="html_site_title()"> + <h1 id="brand"><a href="${abs_link('/')}" title="${blog_title}" rel="home"> + %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></h1> +</%def> + +<%def name="html_navigation_links()"> + <nav id="menu" role="navigation"> + <ul> + %for url, text in navigation_links[lang]: + % if isinstance(url, tuple): + <li> ${text} + <ul> + %for suburl, text in url: + % if rel_link(permalink, suburl) == "#": + <li class="active"><a href="${permalink}">${text}</a></li> + %else: + <li><a href="${suburl}">${text}</a></li> + %endif + %endfor + </ul> + % else: + % if rel_link(permalink, url) == "#": + <li class="active"><a href="${permalink}">${text}</a></li> + %else: + <li><a href="${url}">${text}</a></li> + %endif + % endif + %endfor + ${template_hooks['menu']()} + ${template_hooks['menu_alt']()} + </ul> + </nav> +</%def> + +<%def name="html_translation_header()"> + %if len(translations) > 1: + <div id="toptranslations"> + <h2>${messages("Languages:")}</h2> + ${base.html_translations()} + </div> + %endif +</%def> diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl index 501c06e..beeff99 100644 --- a/nikola/data/themes/base/templates/base_helper.tmpl +++ b/nikola/data/themes/base/templates/base_helper.tmpl @@ -1,12 +1,67 @@ ## -*- coding: utf-8 -*- -<%def name="html_head()"> + +<%def name="html_headstart()"> +<!DOCTYPE html> +<html +\ +% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'): +prefix='\ +%if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']): +og: http://ogp.me/ns# \ +%endif +%if use_open_graph: +article: http://ogp.me/ns/article# \ +%endif +%if comment_system == 'facebook': +fb: http://ogp.me/ns/fb# \ +%endif +'\ +%endif +\ +% if is_rtl: +dir="rtl" \ +% endif +\ +lang="${lang}"> + <head> <meta charset="utf-8"> %if description: <meta name="description" content="${description}"> %endif - <meta name="author" content="${blog_author}"> + <meta name="viewport" content="width=device-width"> <title>${title|striphtml} | ${blog_title|striphtml}</title> + + ${html_stylesheets()} + ${html_feedlinks()} + %if permalink: + <link rel="canonical" href="${abs_link(permalink)}"> + %endif + + %if favicons: + %for name, file, size in favicons: + <link rel="${name}" href="${file}" sizes="${size}"/> + %endfor + %endif + + % if comment_system == 'facebook': + <meta property="fb:app_id" content="${comment_system_id}"> + % endif + ${mathjax_config} + %if use_cdn: + <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> + %else: + <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]--> + %endif + + ${extra_head_data} +</%def> + +<%def name="late_load_js()"> + ${social_buttons_code} +</%def> + +<%def name="html_stylesheets()"> %if use_bundles: %if use_cdn: <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> @@ -16,20 +71,17 @@ %else: <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/theme.css" rel="stylesheet" type="text/css"/> + <link href="/assets/css/theme.css" rel="stylesheet" type="text/css"> %if has_custom_css: <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif %endif - %if permalink: - <link rel="canonical" href="${abs_link(permalink)}"> - %endif - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> - <![endif]--> +</%def> + +<%def name="html_feedlinks()"> %if rss_link: ${rss_link} - %else: + %elif generate_rss: %if len(translations) > 1: %for language in translations: <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> @@ -38,56 +90,14 @@ <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}"> %endif %endif - %if favicons: - %for name, file, size in favicons: - <link rel="${name}" href="${file}" sizes="${size}"/> - %endfor - %endif - % if comment_system == 'facebook': - <meta property="fb:app_id" content="${comment_system_id}"> - % endif </%def> -<%def name="late_load_js()"> -</%def> - -<%def name="html_social()"> - ${social_buttons_code} -</%def> - -<!--FIXME: remove in v7 --> -<%def name="html_sidebar_links()"> - ${html_navigation_links()} -</%def> - -<%def name="html_navigation_links()"> - %for url, text in navigation_links[lang]: - % if isinstance(url, tuple): - <li> ${text} - <ul> - %for suburl, text in url: - % if rel_link(permalink, suburl) == "#": - <li class="active"><a href="${permalink}">${text}</a> - %else: - <li><a href="${suburl}">${text}</a> - %endif - %endfor - </ul> - % else: - % if rel_link(permalink, url) == "#": - <li class="active"><a href="${permalink}">${text}</a> - %else: - <li><a href="${url}">${text}</a> - %endif - % endif - %endfor -</%def> - - <%def name="html_translations()"> + <ul class="translations"> %for langname in translations.keys(): %if langname != lang: - <a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a> + <li><a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> %endif %endfor + </ul> </%def> diff --git a/nikola/data/themes/base/templates/comments_helper.tmpl b/nikola/data/themes/base/templates/comments_helper.tmpl index d3a2704..1459888 100644 --- a/nikola/data/themes/base/templates/comments_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper.tmpl @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- -<%namespace name="disqus" file="disqus_helper.tmpl"/> -<%namespace name="livefyre" file="livefyre_helper.tmpl"/> -<%namespace name="intensedebate" file="intensedebate_helper.tmpl"/> -<%namespace name="moot" file="moot_helper.tmpl"/> -<%namespace name="googleplus" file="googleplus_helper.tmpl"/> -<%namespace name="facebook" file="facebook_helper.tmpl"/> -<%namespace name="isso" file="isso_helper.tmpl"/> +<%namespace name="disqus" file="comments_helper_disqus.tmpl"/> +<%namespace name="livefyre" file="comments_helper_livefyre.tmpl"/> +<%namespace name="intensedebate" file="comments_helper_intensedebate.tmpl"/> +<%namespace name="muut" file="comments_helper_muut.tmpl"/> +<%namespace name="googleplus" file="comments_helper_googleplus.tmpl"/> +<%namespace name="facebook" file="comments_helper_facebook.tmpl"/> +<%namespace name="isso" file="comments_helper_isso.tmpl"/> <%def name="comment_form(url, title, identifier)"> %if comment_system == 'disqus': @@ -15,8 +15,8 @@ ${livefyre.comment_form(url, title, identifier)} % elif comment_system == 'intensedebate': ${intensedebate.comment_form(url, title, identifier)} - % elif comment_system == 'moot': - ${moot.comment_form(url, title, identifier)} + % elif comment_system == 'muut': + ${muut.comment_form(url, title, identifier)} % elif comment_system == 'googleplus': ${googleplus.comment_form(url, title, identifier)} % elif comment_system == 'facebook': @@ -33,8 +33,8 @@ ${livefyre.comment_link(link, identifier)} % elif comment_system == 'intensedebate': ${intensedebate.comment_link(link, identifier)} - % elif comment_system == 'moot': - ${moot.comment_link(link, identifier)} + % elif comment_system == 'muut': + ${muut.comment_link(link, identifier)} % elif comment_system == 'googleplus': ${googleplus.comment_link(link, identifier)} % elif comment_system == 'facebook': @@ -51,8 +51,8 @@ ${livefyre.comment_link_script()} % elif comment_system == 'intensedebate': ${intensedebate.comment_link_script()} - % elif comment_system == 'moot': - ${moot.comment_link_script()} + % elif comment_system == 'muut': + ${muut.comment_link_script()} % elif comment_system == 'googleplus': ${googleplus.comment_link_script()} % elif comment_system == 'facebook': diff --git a/nikola/data/themes/base/templates/disqus_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_disqus.tmpl index 74187b0..8a94eaf 100644 --- a/nikola/data/themes/base/templates/disqus_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_disqus.tmpl @@ -25,15 +25,14 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); </script> - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript> - <a href="http://disqus.com" class="dsq-brlink" rel="nofollow">Comments powered by <span class="logo-disqus">Disqus</span></a> + <noscript>Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript> + <a href="//disqus.com" class="dsq-brlink" rel="nofollow">Comments powered by <span class="logo-disqus">Disqus</span></a> %endif </%def> <%def name="comment_link(link, identifier)"> - <p> %if comment_system_id: - <a href="${link}#disqus_thread" data-disqus-identifier="${identifier}">Comments</a> + <a href="${link}#disqus_thread" data-disqus-identifier="${identifier}">Comments</a> %endif </%def> @@ -43,16 +42,3 @@ <script>var disqus_shortname="${comment_system_id}";(function(){var a=document.createElement("script");a.async=true;a.src="//"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script> %endif </%def> - -## FIXME: remove aliases in v7 -<%def name="html_disqus(url, title, identifier)"> - ${comment_form(url, title, identifier)} -</%def> - -<%def name="html_disqus_link(link, identifier)"> - ${comment_link(link, identifier)} -</%def> - -<%def name="html_disqus_script()"> - ${comment_link_script()} -</%def> diff --git a/nikola/data/themes/base/templates/facebook_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_facebook.tmpl index d6059a1..d6059a1 100644 --- a/nikola/data/themes/base/templates/facebook_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_facebook.tmpl diff --git a/nikola/data/themes/base/templates/googleplus_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl index 5a5c4d7..5a5c4d7 100644 --- a/nikola/data/themes/base/templates/googleplus_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl diff --git a/nikola/data/themes/base/templates/intensedebate_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_intensedebate.tmpl index 6462f74..c47b6c7 100644 --- a/nikola/data/themes/base/templates/intensedebate_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_intensedebate.tmpl @@ -6,7 +6,7 @@ var idcomments_post_id = "${identifier}"; var idcomments_post_url = "${url}"; </script> <span id="IDCommentsPostTitle" style="display:none"></span> -<script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script> +<script src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script> </script> </%def> @@ -17,7 +17,7 @@ var idcomments_acct = '${comment_system_id}'; var idcomments_post_id = "${identifier}"; var idcomments_post_url = "${link}"; </script> -<script type="text/javascript" src="http://www.intensedebate.com/js/genericLinkWrapperV2.js"></script> +<script src="http://www.intensedebate.com/js/genericLinkWrapperV2.js"></script> </a> </%def> diff --git a/nikola/data/themes/base/templates/isso_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_isso.tmpl index 8dc95f5..8dc95f5 100644 --- a/nikola/data/themes/base/templates/isso_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_isso.tmpl diff --git a/nikola/data/themes/base/templates/livefyre_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_livefyre.tmpl index 6916459..68d99e5 100644 --- a/nikola/data/themes/base/templates/livefyre_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_livefyre.tmpl @@ -1,8 +1,8 @@ ## -*- coding: utf-8 -*- <%def name="comment_form(url, title, identifier)"> <div id="livefyre-comments"></div> -<script type="text/javascript" src="http://zor.livefyre.com/wjs/v3.0/javascripts/livefyre.js"></script> -<script type="text/javascript"> +<script src="http://zor.livefyre.com/wjs/v3.0/javascripts/livefyre.js"></script> +<script> (function () { var articleId = "${identifier}"; fyre.conv.load({}, [{ @@ -21,17 +21,13 @@ </%def> <%def name="comment_link(link, identifier)"> - <p> <a href="${link}"> <span class="livefyre-commentcount" data-lf-site-id="${comment_system_id}" data-lf-article-id="${identifier}"> 0 Comments - </span></a> + </span> </%def> <%def name="comment_link_script()"> -<script - type="text/javascript" - src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js"> -</script> +<script src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js"></script> </%def> diff --git a/nikola/data/themes/base/templates/mustache-comment-form.tmpl b/nikola/data/themes/base/templates/comments_helper_mustache.tmpl index 593d0aa..593d0aa 100644 --- a/nikola/data/themes/base/templates/mustache-comment-form.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_mustache.tmpl diff --git a/nikola/data/themes/base/templates/moot_helper.tmpl b/nikola/data/themes/base/templates/comments_helper_muut.tmpl index 951553e..94532d9 100644 --- a/nikola/data/themes/base/templates/moot_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper_muut.tmpl @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%def name="comment_form(url, title, identifier)"> - <a class="moot" href="https://moot.it/i/${comment_system_id}/${identifier}">${comment_system_id} forums</a> + <a class="muut" href="https://muut.com/i/${comment_system_id}/${identifier}">${comment_system_id} forums</a> </%def> <%def name="comment_link(link, identifier)"> @@ -9,5 +9,5 @@ <%def name="comment_link_script()"> -<script src="https://cdn.moot.it/1/moot.min.js"></script> +<script src="//cdn.muut.com/1/moot.min.js"></script> </%def> diff --git a/nikola/data/themes/base/templates/crumbs.tmpl b/nikola/data/themes/base/templates/crumbs.tmpl index 8fbafcf..de8e570 100644 --- a/nikola/data/themes/base/templates/crumbs.tmpl +++ b/nikola/data/themes/base/templates/crumbs.tmpl @@ -2,10 +2,12 @@ <%def name="bar(crumbs)"> %if crumbs: +<nav class="breadcrumbs"> <ul class="breadcrumb"> % for link, text in crumbs: <li><a href="${link}">${text}</a></li> % endfor </ul> +</nav> %endif </%def> diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl index 731a75a..ca9da05 100644 --- a/nikola/data/themes/base/templates/gallery.tmpl +++ b/nikola/data/themes/base/templates/gallery.tmpl @@ -9,9 +9,9 @@ %if title: <h1>${title}</h1> %endif - %if text: + %if post: <p> - ${text} + ${post.text()} </p> %endif %if folders: @@ -30,7 +30,7 @@ %endfor </ul> %endif -%if enable_comments: +%if site_has_comments and enable_comments: ${comments.comment_form(None, permalink, title)} %endif </%block> diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl index 1a280b0..e833eb0 100644 --- a/nikola/data/themes/base/templates/index.tmpl +++ b/nikola/data/themes/base/templates/index.tmpl @@ -2,28 +2,33 @@ <%namespace name="helper" file="index_helper.tmpl"/> <%namespace name="comments" file="comments_helper.tmpl"/> <%inherit file="base.tmpl"/> + <%block name="content"> - % for post in posts: - <article class="postbox h-entry post-${post.meta('type')}"> - <h1 class="p-name"><a href="${post.permalink()}" class="u-url">${post.title()}</a> - <small> - ${messages("Posted:")} <time class="published dt-published" datetime="${post.date.isoformat()}">${post.formatted_date(date_format)}</time> - </small></h1> - <hr> - %if index_teasers: - <div class="p-summary"> - ${post.text(teaser_only=True)} - %else: - <div class="e-content"> - ${post.text(teaser_only=False)} - %endif +<div class="postindex"> +% for post in posts: + <article class="h-entry post-${post.meta('type')}"> + <header> + <h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()}</h1></a> + <div class="metadata"> + <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p> + <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p> + % if not post.meta('nocomments') and site_has_comments: + <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)} + % endif </div> - % if not post.meta('nocomments'): - ${comments.comment_link(post.permalink(), post._base_path)} - % endif - </article> - % endfor - ${helper.html_pager()} - ${comments.comment_link_script()} - ${helper.mathjax_script(posts)} + </header> + %if index_teasers: + <div class="p-summary entry-summary"> + ${post.text(teaser_only=True)} + %else: + <div class="e-content entry-content"> + ${post.text(teaser_only=False)} + %endif + </div> + </article> +% endfor +</div> +${helper.html_pager()} +${comments.comment_link_script()} +${helper.mathjax_script(posts)} </%block> diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl index c925559..9331b93 100644 --- a/nikola/data/themes/base/templates/index_helper.tmpl +++ b/nikola/data/themes/base/templates/index_helper.tmpl @@ -1,30 +1,27 @@ ## -*- coding: utf-8 -*- <%def name="html_pager()"> %if prevlink or nextlink: - <div> + <nav class="postindexpager"> <ul class="pager"> %if prevlink: <li class="previous"> - <a href="${prevlink}" rel="prev">← ${messages("Newer posts")}</a> + <a href="${prevlink}" rel="prev">${messages("Newer posts")}</a> </li> %endif %if nextlink: <li class="next"> - <a href="${nextlink}" rel="next">${messages("Older posts")} →</a> + <a href="${nextlink}" rel="next">${messages("Older posts")}</a> </li> %endif </ul> - </div> + </nav> %endif </%def> <%def name="mathjax_script(posts)"> %if any(post.is_mathjax for post in posts): <script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]} - }); - </script> + MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script> <script src="/assets/js/mathjax.js"></script> %endif </%def> diff --git a/nikola/data/themes/base/templates/list.tmpl b/nikola/data/themes/base/templates/list.tmpl index 4136eb9..4082516 100644 --- a/nikola/data/themes/base/templates/list.tmpl +++ b/nikola/data/themes/base/templates/list.tmpl @@ -1,16 +1,19 @@ ## -*- coding: utf-8 -*- <%inherit file="base.tmpl"/> + <%block name="content"> - <!--Body content--> - <div class="postbox"> +<article class="listpage"> + <header> <h1>${title}</h1> - %if items: - <ul class="unstyled"> - % for text, link in items: - <li><a href="${link}">${text}</a> - % endfor - </ul> - %endif - </div> - <!--End of body content--> + </header> + %if items: + <ul class="postlist"> + % for text, link in items: + <li><a href="${link}">${text}</a> + % endfor + </ul> + %else: + <p>${messages("Nothing found.")}</p> + %endif +</article> </%block> diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl index b27f230..0ef164f 100644 --- a/nikola/data/themes/base/templates/list_post.tmpl +++ b/nikola/data/themes/base/templates/list_post.tmpl @@ -1,16 +1,19 @@ ## -*- coding: utf-8 -*- <%inherit file="base.tmpl"/> + <%block name="content"> - <!--Body content--> - <div class="postbox"> +<article class="listpage"> + <header> <h1>${title}</h1> - %if posts: - <ul class="unstyled"> - % for post in posts: - <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a> - % endfor - </ul> - %endif - </div> - <!--End of body content--> + </header> + %if posts: + <ul class="postlist"> + % for post in posts: + <li><a href="${post.permalink()}" class="listtitle">${post.title()}</a> <time class="listdate" datetime="${post.date.isoformat()}" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></li> + % endfor + </ul> + %else: + <p>${messages("No posts found.")}</p> + %endif +</article> </%block> diff --git a/nikola/data/themes/base/templates/listing.tmpl b/nikola/data/themes/base/templates/listing.tmpl index 0662360..e0bf91b 100644 --- a/nikola/data/themes/base/templates/listing.tmpl +++ b/nikola/data/themes/base/templates/listing.tmpl @@ -4,7 +4,7 @@ <%block name="content"> ${ui.bar(crumbs)} %if folders or files: -<ul class="unstyled"> +<ul> % for name in folders: <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a> % endfor @@ -16,4 +16,8 @@ ${ui.bar(crumbs)} % if code: ${code} % endif +% if source_link: + <p class="sourceline"><a href="${source_link}" id="sourcelink">${messages("Source")}</a></p> +% endif </%block> + diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl index 981fd97..0babb2b 100644 --- a/nikola/data/themes/base/templates/post.tmpl +++ b/nikola/data/themes/base/templates/post.tmpl @@ -1,42 +1,39 @@ ## -*- coding: utf-8 -*- <%namespace name="helper" file="post_helper.tmpl"/> +<%namespace name="pheader" file="post_header.tmpl"/> <%namespace name="comments" file="comments_helper.tmpl"/> <%inherit file="base.tmpl"/> + <%block name="extra_head"> -${helper.twitter_card_information(post)} -% if post.meta('keywords'): - <meta name="keywords" content="${post.meta('keywords')|h}"> -% endif -${helper.meta_translations(post)} + ${parent.extra_head()} + % if post.meta('keywords'): + <meta name="keywords" content="${post.meta('keywords')|h}"> + % endif + <meta name="author" content="${post.author()}"> + ${helper.open_graph_metadata(post)} + ${helper.twitter_card_information(post)} + ${helper.meta_translations(post)} </%block> + <%block name="content"> - <article class="postbox post-${post.meta('type')}"> - <div class="h-entry" itemscope="itemscope" itemtype="http://schema.org/Article"> - ${helper.html_title()} - <hr> - <small> - ${messages("Posted:")} <time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished">${post.formatted_date(date_format)}</time> - ${helper.html_translations(post)} - ${helper.html_tags(post)} - | - <%block name="sourcelink"> - % if not post.meta('password'): - <a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a> - % endif - </%block> - </small> - <hr> - <div class="e-content" itemprop="articleBody text"> +<article class="post-${post.meta('type')} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article"> + ${pheader.html_post_header()} + <div class="e-content entry-content" itemprop="articleBody text"> ${post.text()} </div> - %if post.description(): - <meta content="${post.description()}" itemprop="description"> - %endif - </div> + <aside class="postpromonav"> + <nav> + ${helper.html_tags(post)} ${helper.html_pager(post)} - % if not post.meta('nocomments'): + </nav> + </aside> + % if not post.meta('nocomments') and site_has_comments: + <section class="comments"> + <h2>${messages("Comments")}</h2> ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)} + </section> % endif ${helper.mathjax_script(post)} - </article> +</article> +${comments.comment_link_script()} </%block> diff --git a/nikola/data/themes/base/templates/post_header.tmpl b/nikola/data/themes/base/templates/post_header.tmpl new file mode 100644 index 0000000..c848186 --- /dev/null +++ b/nikola/data/themes/base/templates/post_header.tmpl @@ -0,0 +1,49 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> +<%namespace name="comments" file="comments_helper.tmpl"/> + +<%def name="html_title()"> +%if title and not post.meta('hidetitle'): + <h1 class="p-name entry-title" itemprop="headline name"><a href="${post.permalink()}" class="u-url">${title|h}</a></h1> +%endif +</%def> + +<%def name="html_translations(post)"> + % if len(translations) > 1: + <div class="metadata posttranslations translations"> + <h3 class="posttranslations-intro">${messages("Also available in:")}</h3> + % for langname in translations.keys(): + % if langname != lang and post.is_translation_available(langname): + <p><a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></p> + % endif + % endfor + </div> + % endif +</%def> + +<%def name="html_sourcelink()"> + % if show_sourcelink: + <p class="sourceline"><a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a></p> + % endif +</%def> + +<%def name="html_post_header()"> + <header> + ${html_title()} + <div class="metadata"> + <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p> + <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p> + % if not post.meta('nocomments') and site_has_comments: + <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)} + % endif + ${html_sourcelink()} + % if post.meta('link'): + <p><a href='${post.meta('link')}'>${messages("Original site")}</a></p> + % endif + %if post.description(): + <meta name="description" itemprop="description" content="${post.description()}"> + %endif + </div> + ${html_translations(post)} + </header> +</%def> diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl index 391350d..85ba378 100644 --- a/nikola/data/themes/base/templates/post_helper.tmpl +++ b/nikola/data/themes/base/templates/post_helper.tmpl @@ -1,22 +1,4 @@ ## -*- coding: utf-8 -*- -<%def name="html_title()"> - <h1 class="p-name" itemprop="headline name">${title|h}</h1> - % if link: - <p><a href='${link}'>${messages("Original site")}</a></p> - % endif -</%def> - - -<%def name="html_translations(post)"> - %if len(translations) > 1: - %for langname in translations.keys(): - %if langname != lang and post.is_translation_available(langname): - | - <a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("Read in English", langname)}</a> - %endif - %endfor - %endif -</%def> <%def name="meta_translations(post)"> %if len(translations) > 1: @@ -28,18 +10,13 @@ %endif </%def> -<%def name="html_list_tags(post)" buffered="True"> - <span itemprop="keywords"> - %for tag in post.tags: - <a class="tag p-category" href="${_link('tag', tag)}"><span class="badge badge-info">${tag}</span></a> - %endfor - </span> -</%def> - <%def name="html_tags(post)"> %if post.tags: - | - ${formatmsg(messages("More posts about %s"), html_list_tags(post))} + <ul itemprop="keywords" class="tags"> + %for tag in post.tags: + <li><a class="tag p-category" href="${_link('tag', tag)}" rel="tag">${tag}</a></li> + %endfor + </ul> %endif </%def> @@ -48,22 +25,35 @@ <ul class="pager"> %if post.prev_post: <li class="previous"> - <a href="${post.prev_post.permalink()}" rel="prev">← ${messages("Previous post")}</a> + <a href="${post.prev_post.permalink()}" rel="prev" title="${post.prev_post.title()}">${messages("Previous post")}</a> </li> %endif %if post.next_post: <li class="next"> - <a href="${post.next_post.permalink()}" rel="next">${messages("Next post")} →</a> + <a href="${post.next_post.permalink()}" rel="next" title="${post.next_post.title()}">${messages("Next post")}</a> </li> %endif </ul> %endif </%def> +<%def name="open_graph_metadata(post)"> + %if use_open_graph: + <meta name="og:title" content="${post.title()[:70]|h}"> + <meta name="og:url" content="${abs_link(permalink)}"> + %if post.description(): + <meta name="og:description" content="${post.description()[:200]|h}"> + %else: + <meta name="og:description" content="${post.text(strip_html=True)[:200]|h}"> + %endif + <meta name="og:site_name" content="${blog_title|striphtml}"> + <meta name="og:type" content="article"> + %endif +</%def> + <%def name="twitter_card_information(post)"> %if twitter_card and twitter_card['use_twitter_cards']: <meta name="twitter:card" content="${twitter_card.get('card', 'summary')|h}"> - <meta name="og:url" content="${post.permalink(absolute=True)}"> %if 'site:id' in twitter_card: <meta name="twitter:site:id" content="${twitter_card['site:id']}"> %elif 'site' in twitter_card: @@ -74,22 +64,13 @@ %elif 'creator' in twitter_card: <meta name="twitter:creator" content="${twitter_card['creator']}"> %endif - <meta name="og:title" content="${post.title()[:70]|h}"> - %if post.description(): - <meta name="og:description" content="${post.description()[:200]|h}"> - %else: - <meta name="og:description" content="${post.text(strip_html=True)[:200]|h}"> - %endif %endif </%def> <%def name="mathjax_script(post)"> %if post.is_mathjax: <script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]} - }); - </script> + MathJax.Hub.Config({tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}});</script> <script src="/assets/js/mathjax.js"></script> %endif </%def> diff --git a/nikola/data/themes/base/templates/post_list_directive.tmpl b/nikola/data/themes/base/templates/post_list_directive.tmpl index b31d242..d9166e9 100644 --- a/nikola/data/themes/base/templates/post_list_directive.tmpl +++ b/nikola/data/themes/base/templates/post_list_directive.tmpl @@ -1,4 +1,5 @@ ## -*- coding: utf-8 -*- +<%block name="content"> <!-- Begin post-list ${post_list_id} --> <div id="${post_list_id}" class="post-list"> %if posts: @@ -14,3 +15,4 @@ %endif </div> <!-- End post-list ${post_list_id} --> +</%block> diff --git a/nikola/data/themes/base/templates/slides.tmpl b/nikola/data/themes/base/templates/slides.tmpl index 14983ad..048fb7e 100644 --- a/nikola/data/themes/base/templates/slides.tmpl +++ b/nikola/data/themes/base/templates/slides.tmpl @@ -1,6 +1,7 @@ +<%block name="content"> <div id="${carousel_id}" class="carousel slide"> <ol class="carousel-indicators"> - % for i in range(len(content)): + % for i in range(len(slides_content)): % if i == 0: <li data-target="#${carousel_id}" data-slide-to="${i}" class="active"></li> % else: @@ -9,7 +10,7 @@ % endfor </ol> <div class="carousel-inner"> - % for i, image in enumerate(content): + % for i, image in enumerate(slides_content): % if i == 0: <div class="item active"><img src="${image}" alt="" style="margin: 0 auto 0 auto;"></div> % else: @@ -20,3 +21,4 @@ <a class="left carousel-control" href="#${carousel_id}" data-slide="prev">‹</a> <a class="right carousel-control" href="#${carousel_id}" data-slide="next">›</a> </div> +</%block> diff --git a/nikola/data/themes/base/templates/story.tmpl b/nikola/data/themes/base/templates/story.tmpl index 7406f05..e3e3054 100644 --- a/nikola/data/themes/base/templates/story.tmpl +++ b/nikola/data/themes/base/templates/story.tmpl @@ -1,16 +1,37 @@ ## -*- coding: utf-8 -*- -<%inherit file="post.tmpl"/> <%namespace name="helper" file="post_helper.tmpl"/> +<%namespace name="pheader" file="post_header.tmpl"/> <%namespace name="comments" file="comments_helper.tmpl"/> +<%inherit file="post.tmpl"/> + <%block name="extra_head"> -${helper.twitter_card_information(post)} + ${parent.extra_head()} + % if post.meta('keywords'): + <meta name="keywords" content="${post.meta('keywords')|h}"> + % endif + <meta name="author" content="${post.author()}"> + ${helper.open_graph_metadata(post)} + ${helper.twitter_card_information(post)} + ${helper.meta_translations(post)} + %if post.description(): + <meta name="description" itemprop="description" content="${post.description()}"> + %endif </%block> + <%block name="content"> -%if title and not post.meta('hidetitle'): - <h1>${title}</h1> -%endif +<article class="storypage" itemscope="itemscope" itemtype="http://schema.org/Article"> + <header> + ${pheader.html_title()} + ${pheader.html_translations(post)} + </header> + <div itemprop="articleBody text"> ${post.text()} -%if enable_comments and not post.meta('nocomments'): - ${comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path)} -%endif + </div> + %if site_has_comments and enable_comments and not post.meta('nocomments'): + <section class="comments"> + <h2>${messages("Comments")}</h2> + ${comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path)} + </section> + %endif +</article> </%block> diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl index 43afd54..bff82c2 100644 --- a/nikola/data/themes/base/templates/tag.tmpl +++ b/nikola/data/themes/base/templates/tag.tmpl @@ -1,34 +1,40 @@ ## -*- coding: utf-8 -*- <%inherit file="list_post.tmpl"/> + <%block name="extra_head"> - %if len(translations) > 1: + ${parent.extra_head()} + %if len(translations) > 1 and generate_rss: %for language in translations: <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}"> %endfor - %else: + %elif generate_rss: <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag}" href="${_link(kind + "_rss", tag)}"> %endif </%block> + <%block name="content"> - <!--Body content--> - <div class="postbox"> +<article class="tagpage"> + <header> <h1>${title}</h1> - %if len(translations) > 1: - %for language in translations: - <a href="${_link(kind + "_rss", tag, language)}">RSS (${language})</a> - %endfor - %else: - <a href="${_link(kind + "_rss", tag)}">RSS</a> - %endif - <br> - %if posts: - <ul class="unstyled"> - % for post in posts: - <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a> - % endfor - </ul> - %endif + <div class="metadata"> + %if len(translations) > 1 and generate_rss: + %for language in translations: + <p class="feedlink"> + <a href="${_link(kind + "_rss", tag, language)}" hreflang="${language}" type="application/rss+xml">${messages('RSS feed', language)} (${language})</a> + </p> + %endfor + %elif generate_rss: + <p class="feedlink"><a href="${_link(kind + "_rss", tag)}" type="application/rss+xml">${messages('RSS feed')}</a></p> + %endif </div> - <!--End of body content--> + </header> + %if posts: + <ul class="postlist"> + % for post in posts: + <li><a href="${post.permalink()}" class="listtitle">${post.title()}</a> <time class="listdate" datetime="${post.date.isoformat()}" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></li> + % endfor + </ul> + %endif +</article> </%block> diff --git a/nikola/data/themes/base/templates/tags.tmpl b/nikola/data/themes/base/templates/tags.tmpl index 6c8c5e9..3e0c4b4 100644 --- a/nikola/data/themes/base/templates/tags.tmpl +++ b/nikola/data/themes/base/templates/tags.tmpl @@ -1,10 +1,14 @@ ## -*- coding: utf-8 -*- <%inherit file="base.tmpl"/> + <%block name="content"> - <h1>${title}</h1> +<article class="tagindex"> + <header> + <h1>${title}</h1> + </header> % if cat_items: <h2>${messages("Categories")}</h2> - <ul class="unstyled bricks"> + <ul class="postlist"> % for text, link in cat_items: % if text: <li><a class="reference" href="${link}">${text}</a></li> @@ -16,10 +20,11 @@ % endif %endif % if items: - <ul class="unstyled bricks"> + <ul class="postlist"> % for text, link in items: - <li><a class="reference" href="${link}">${text}</a></li> + <li><a class="reference listtitle" href="${link}">${text}</a></li> % endfor </ul> % endif +</article> </%block> diff --git a/nikola/data/themes/bootstrap-jinja/AUTHORS.txt b/nikola/data/themes/bootstrap-jinja/AUTHORS.txt new file mode 100644 index 0000000..043d497 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/AUTHORS.txt @@ -0,0 +1 @@ +Roberto Alsina <https://github.com/ralsina> diff --git a/nikola/data/themes/bootstrap-jinja/README.md b/nikola/data/themes/bootstrap-jinja/README.md new file mode 100644 index 0000000..5340fe2 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/README.md @@ -0,0 +1,23 @@ +A "website-done-with-bootstrap" theme, so to speak. + +Has a fixed navigation bar at top that displays the NAVIGATION_LINKS +setting and supports nested menus. + +This theme is used in Nikola's website: http://getnikola.com + +Important: To fit in the bootstrap navigation bar, the search form needs the +navbar-form and pull-left CSS classes applied. Here is an example with Nikola's +default duckduckgo search form: + + SEARCH_FORM = """ + <!-- Custom search --> + <form method="get" id="search" action="http://duckduckgo.com/" class="navbar-form pull-left"> + <input type="hidden" name="sites" value="%s"/> + <input type="hidden" name="k8" value="#444444"/> + <input type="hidden" name="k9" value="#D51920"/> + <input type="hidden" name="kt" value="h"/> + <input type="text" name="q" maxlength="255" placeholder="Search…" class="span2" style="margin-top: 4px;"/> + <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;" /> + </form> + <!-- End of custom search --> + """ % SITE_URL diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css b/nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css new file mode 120000 index 0000000..5f8b3b0 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css @@ -0,0 +1 @@ +../../../../../../bower_components/jquery-colorbox/example3/colorbox.css
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png b/nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png new file mode 120000 index 0000000..841a726 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/example3/images/controls.png
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif b/nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif new file mode 120000 index 0000000..b192a75 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/example3/images/loading.gif
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/theme.css b/nikola/data/themes/bootstrap-jinja/assets/css/theme.css new file mode 120000 index 0000000..7566a80 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/css/theme.css @@ -0,0 +1 @@ +../../../bootstrap/assets/css/theme.css
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js new file mode 120000 index 0000000..f83073f --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ar.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js new file mode 120000 index 0000000..bafc4e0 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-bg.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js new file mode 120000 index 0000000..a749232 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ca.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js new file mode 120000 index 0000000..e4a595c --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-cs.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js new file mode 120000 index 0000000..1e9a1d6 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-da.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js new file mode 120000 index 0000000..748f53b --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-de.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js new file mode 120000 index 0000000..1154fb5 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-es.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js new file mode 120000 index 0000000..483e192 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-et.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js new file mode 120000 index 0000000..a30b13c --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fa.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js new file mode 120000 index 0000000..2a7e8ad --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fi.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js new file mode 120000 index 0000000..e359290 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js new file mode 120000 index 0000000..04fa276 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js new file mode 120000 index 0000000..d8105ab --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js new file mode 120000 index 0000000..72dddf5 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-he.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js new file mode 120000 index 0000000..34aa3c0 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js new file mode 120000 index 0000000..a87f03c --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hu.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js new file mode 120000 index 0000000..31053b8 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-id.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js new file mode 120000 index 0000000..aad9d22 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-it.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js new file mode 120000 index 0000000..3ea27c2 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ja.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js new file mode 120000 index 0000000..3e23b4a --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-kr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js new file mode 120000 index 0000000..374b9bb --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lt.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js new file mode 120000 index 0000000..101b476 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lv.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js new file mode 120000 index 0000000..8e14f15 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-my.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js new file mode 120000 index 0000000..2d03d48 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-nl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js new file mode 120000 index 0000000..9af0ba7 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-no.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js new file mode 120000 index 0000000..34f8ab1 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js new file mode 120000 index 0000000..76f289e --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pt-br.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js new file mode 120000 index 0000000..555f2e6 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ro.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js new file mode 120000 index 0000000..bac4855 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ru.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js new file mode 120000 index 0000000..65b0492 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-si.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js new file mode 120000 index 0000000..99859fd --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sk.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js new file mode 120000 index 0000000..c4fd9d5 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js new file mode 120000 index 0000000..d7f26e0 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sv.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js new file mode 120000 index 0000000..86fd98f --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-tr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js new file mode 120000 index 0000000..7cd1336 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-uk.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js new file mode 120000 index 0000000..e6c5965 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-CN.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js new file mode 120000 index 0000000..bd2254c --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-TW.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js b/nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js new file mode 120000 index 0000000..c195756 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js @@ -0,0 +1 @@ +../../../bootstrap/assets/js/flowr.plugin.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js b/nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js new file mode 120000 index 0000000..5ee7a90 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js @@ -0,0 +1 @@ +../../../../../../bower_components/jquery-colorbox/jquery.colorbox.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/bundles b/nikola/data/themes/bootstrap-jinja/bundles new file mode 120000 index 0000000..3e517bb --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/bundles @@ -0,0 +1 @@ +../bootstrap/bundles
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap-jinja/engine b/nikola/data/themes/bootstrap-jinja/engine new file mode 100644 index 0000000..6f04b30 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/engine @@ -0,0 +1 @@ +jinja diff --git a/nikola/data/themes/bootstrap-jinja/parent b/nikola/data/themes/bootstrap-jinja/parent new file mode 100644 index 0000000..e9ed660 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/parent @@ -0,0 +1 @@ +base-jinja diff --git a/nikola/data/themes/bootstrap-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base.tmpl new file mode 100644 index 0000000..a433721 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/base.tmpl @@ -0,0 +1,86 @@ +{# -*- coding: utf-8 -*- #} +{% import 'base_helper.tmpl' as base with context %} +{% import 'annotation_helper.tmpl' as notes with context %} +{{ set_locale(lang) }} +{{ base.html_headstart() }} +{% block extra_head %} +{# Leave this block alone. #} +{% endblock %} +{{ template_hooks['extra_head']() }} +</head> +<body> + +<!-- Menubar --> + +<div class="navbar navbar-fixed-top" id="navbar"> + <div class="navbar-inner"> + <div class="container"> + + <!-- .btn-navbar is used as the toggle for collapsed navbar content --> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + + <a class="brand" href="{{ abs_link('/') }}"> + {% 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"> + {{ base.html_navigation_links() }} + {{ template_hooks['menu']() }} + </ul> + {% if search_form %} + {{ search_form }} + {% endif %} + <ul class="nav pull-right"> + {% block belowtitle %} + {% if translations|length > 1 %} + <li>{{ base.html_translations() }}</li> + {% endif %} + {% endblock %} + {% if show_sourcelink %} + <li>{% block sourcelink %}{% endblock %}</li> + {% endif %} + {{ template_hooks['menu_alt']() }} + </ul> + </div> + </div> + </div> +</div> +<!-- End of Menubar --> +<div class="container-fluid" id="container-fluid"> + <!--Body content--> + <div class="row-fluid"> + <div class="span2"></div> + <div class="span8"> + {{ template_hooks['page_header']() }} + {% block content %}{% endblock %} + </div> + </div> + <!--End of body content--> +</div> +<div class="footerbox"> + {{ content_footer }} + {{ template_hooks['page_footer']() }} +</div> +{{ base.late_load_js() }} + <script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script> + {% block extra_js %}{% endblock %} + {% 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 }} +{{ template_hooks['body_end']() }} +</body> +</html> diff --git a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl new file mode 100644 index 0000000..d8398b8 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl @@ -0,0 +1,161 @@ +{# -*- coding: utf-8 -*- #} + +{% macro html_headstart() %} +<!DOCTYPE html> +<html + +{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook') %} +prefix=' +{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %} +og: http://ogp.me/ns# +{% endif %} +{% if use_open_graph %} +article: http://ogp.me/ns/article# +{% endif %} +{% if comment_system == 'facebook' %} +fb: http://ogp.me/ns/fb# +{% endif %} +' +{% endif %} + +{% if is_rtl %} +dir="rtl" +{% endif %} + +lang="{{ lang }}"> + <head> + <meta charset="utf-8"> + {% if description %} + <meta name="description" content="{{ description }}"> + {% endif %} + <meta name="viewport" content="width=device-width"> + <title>{{ title|e }} | {{ blog_title|e }}</title> + + {{ html_stylesheets() }} + {{ html_feedlinks() }} + {% if permalink %} + <link rel="canonical" href="{{ abs_link(permalink) }}"> + {% endif %} + + {% if favicons %} + {% for name, file, size in favicons %} + <link rel="{{ name }}" href="{{ file }}" sizes="{{ size }}"/> + {% endfor %} + {% endif %} + + {% if comment_system == 'facebook' %} + <meta property="fb:app_id" content="{{ comment_system_id }}"> + {% endif %} + + {{ mathjax_config }} + {% if use_cdn %} + <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> + {% else %} + <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]--> + {% endif %} + + {{ extra_head_data }} +{% endmacro %} + + +{% macro late_load_js() %} + {% if use_bundles %} + {% if use_cdn %} + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> + <script src="/assets/js/all.js"></script> + {% else %} + <script src="/assets/js/all-nocdn.js"></script> + {% endif %} + {% else %} + {% if use_cdn %} + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> + {% else %} + <script src="/assets/js/jquery.min.js"></script> + <script src="/assets/js/bootstrap.min.js"></script> + {% endif %} + <script src="/assets/js/jquery.colorbox-min.js"></script> + {% endif %} + {% if colorbox_locales[lang] %} + <script src="/assets/js/colorbox-i18n/jquery.colorbox-{{ colorbox_locales[lang] }}.js"></script> + {% endif %} + {{ social_buttons_code }} +{% endmacro %} + + +{% macro html_stylesheets() %} + {% if use_bundles %} + {% if use_cdn %} + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet"> + <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> + {% else %} + <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> + {% endif %} + {% else %} + {% if use_cdn %} + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet"> + {% else %} + <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"> + {% endif %} + <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 has_custom_css %} + <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> + {% endif %} + {% endif %} + {% if annotations and post and not post.meta('noannotations') %} + {{ notes.css() }} + {% elif not annotations and post and post.meta('annotations') %} + {{ notes.css() }} + {% endif %} +{% endmacro %} + + +{% macro html_navigation_links() %} + {% for url, text in navigation_links[lang] %} + {% if url is mapping %} + <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }}<b class="caret"></b></a> + <ul class="dropdown-menu"> + {% for suburl, text in url %} + {% if rel_link(permalink, suburl) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a> + {% else %} + <li><a href="{{ suburl }}">{{ text }}</a> + {% endif %} + {% endfor %} + </ul> + {% else %} + {% if rel_link(permalink, url) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a> + {% else %} + <li><a href="{{ url }}">{{ text }}</a> + {% endif %} + {% endif %} + {% endfor %} +{% endmacro %} + +{% macro html_feedlinks() %} + {% if rss_link %} + {{ rss_link }} + {% elif generate_rss %} + {% if translations|length > 1 %} + {% for language in translations %} + <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}"> + {% endfor %} + {% else %} + <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}"> + {% endif %} + {% endif %} +{% endmacro %} + +{% macro html_translations() %} + {% for langname in translations.keys() %} + {% if langname != lang %} + <li><a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li> + {% endif %} + {% endfor %} +{% endmacro %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/bootstrap_helper.tmpl new file mode 100644 index 0000000..e426774 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/bootstrap_helper.tmpl @@ -0,0 +1,78 @@ +{# -*- coding: utf-8 -*- #} +{# Override only the functions that differ from base_helper.tmpl #} + +{% block html_stylesheets %} + {% if use_bundles %} + {% if use_cdn %} + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet"> + <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> + {% else %} + <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> + {% endif %} + {% else %} + {% if use_cdn %} + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet"> + {% else %} + <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"> + {% endif %} + <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 has_custom_css %} + <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> + {% endif %} + {% endif %} + {% if annotations and post and not post.meta('noannotations') %} + {{ notes.css() }} + {% elif not annotations and post and post.meta('annotations') %} + {{ notes.css() }} + {% endif %} +{% endblock %} + + +{% block late_load_js %} + {% if use_bundles %} + {% if use_cdn %} + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script> + <script src="/assets/js/all.js"></script> + {% else %} + <script src="/assets/js/all-nocdn.js"></script> + {% endif %} + {% else %} + {% if use_cdn %} + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script> + {% else %} + <script src="/assets/js/jquery-1.11.0.min.js"></script> + <script src="/assets/js/bootstrap.min.js"></script> + {% endif %} + <script src="/assets/js/jquery.colorbox-min.js"></script> + {% endif %} +{% endblock %} + + +{% block html_navigation_links %} + {% for url, text in navigation_links[lang] %} + {% if url is mapping %} + <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }}<b class="caret"></b></a> + <ul class="dropdown-menu"> + {% for suburl, text in url %} + {% if rel_link(permalink, suburl) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a> + {% else %} + <li><a href="{{ suburl }}">{{ text }}</a> + {% endif %} + {% endfor %} + </ul> + {% else %} + {% if rel_link(permalink, url) == "#" %} + <li class="active"><a href="{{ permalink }}">{{ text }}</a> + {% else %} + <li><a href="{{ url }}">{{ text }}</a> + {% endif %} + {% endif %} + {% endfor %} +{% endblock %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl b/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl new file mode 100644 index 0000000..e3f9f05 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl @@ -0,0 +1,93 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} +{% import 'comments_helper.tmpl' as comments with context %} +{% import 'crumbs.tmpl' as ui with context %} +{% block sourcelink %}{% endblock %} + +{% block content %} + {{ ui.bar(crumbs) }} + {% if title %} + <h1>{{ title }}</h1> + {% endif %} + {% if post %} + <p> + {{ post.text() }} + </p> + {% endif %} + {% if folders %} + <ul> + {% for folder, ftitle in folders %} + <li><a href="{{ folder }}"><i class="icon-folder-open"></i> {{ ftitle }}</a></li> + {% endfor %} + </ul> + {% endif %} + +<div id="gallery_container"></div> +{% if photo_array %} +<noscript> +<ul class="thumbnails"> + {% for image in photo_array %} + <li><a href="{{ image['url'] }}" class="thumbnail image-reference" title="{{ image['title'] }}"> + <img src="{{ image['url_thumb'] }}" alt="{{ image['title'] }}" /></a> + {% endfor %} +</ul> +</noscript> +{% endif %} +{% if site_has_comments and enable_comments %} +{{ comments.comment_form(None, permalink, title) }} +{% endif %} +{% endblock %} + +{% block extra_head %} +{{ super() }} +<style type="text/css"> + .image-block { + display: inline-block; + } + .flowr_row { + width: 100%; + } + </style> +{% endblock %} + + +{% block extra_js %} +<script src="/assets/js/flowr.plugin.js"></script> +<script> +jsonContent = {{ photo_array_json }}; +$("#gallery_container").flowr({ + data : jsonContent, + height : {{ thumbnail_size }}*.6, + padding: 5, + rows: -1, + render : function(params) { + // Just return a div, string or a dom object, anything works fine + img = $("<img />").attr({ + 'src': params.itemData.url_thumb, + 'width' : params.width, + 'height' : params.height + }).css('max-width', '100%'); + link = $( "<a></a>").attr({ + 'href': params.itemData.url, + 'class': 'image-reference' + }); + div = $("<div />").addClass('image-block').attr({ + 'title': params.itemData.title, + 'data-toggle': "tooltip", + }); + link.append(img); + div.append(link); + div.hover(div.tooltip()); + return div; + }, + itemWidth : function(data) { return data.size.w; }, + itemHeight : function(data) { return data.size.h; }, + complete : function(params) { + if( jsonContent.length > params.renderedItems ) { + nextRenderList = jsonContent.slice( params.renderedItems ); + } + } + }); +$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true}); +</script> +{% endblock %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl new file mode 100644 index 0000000..4b99f86 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl @@ -0,0 +1,28 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} +{% import 'crumbs.tmpl' as ui with context %} + +{% block content %} +{{ ui.bar(crumbs) }} +{% if folders or files %} +<ul class="list-unstyled"> +{% for name in folders %} + <li><a href="{{ name }}"><i class="icon-folder-open"></i> {{ name }}</a> +{% endfor %} +{% for name in files %} + <li><a href="{{ name }}.html"><i class="icon-file"></i> {{ name }}</a> +{% endfor %} +</ul> +{% endif %} +{% if code %} + {{ code }} +{% endif %} +{% endblock %} + +{% block sourcelink %} +{% if source_link %} + <li> + <a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a> + </li> +{% endif %} +{% endblock %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/post.tmpl b/nikola/data/themes/bootstrap-jinja/templates/post.tmpl new file mode 100644 index 0000000..531ebd5 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/post.tmpl @@ -0,0 +1,47 @@ +{# -*- coding: utf-8 -*- #} +{% import 'post_helper.tmpl' as helper with context %} +{% import 'post_header.tmpl' as pheader with context %} +{% import 'comments_helper.tmpl' as comments with context %} +{% extends 'base.tmpl' %} + +{% block extra_head %} + {{ super() }} + {% if post.meta('keywords') %} + <meta name="keywords" content="{{ post.meta('keywords')|e }}"> + {% endif %} + <meta name="author" content="{{ post.author() }}"> + {{ helper.open_graph_metadata(post) }} + {{ helper.twitter_card_information(post) }} + {{ helper.meta_translations(post) }} +{% endblock %} + +{% block content %} +<article class="post-{{ post.meta('type') }} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article"> + {{ pheader.html_post_header() }} + <div class="e-content entry-content" itemprop="articleBody text"> + {{ post.text() }} + </div> + <aside class="postpromonav"> + <nav> + {{ helper.html_tags(post) }} + {{ helper.html_pager(post) }} + </nav> + </aside> + {% if not post.meta('nocomments') and site_has_comments %} + <section class="comments"> + <h2>{{ messages("Comments") }}</h2> + {{ comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path) }} + </section> + {% endif %} + {{ helper.mathjax_script(post) }} +</article> +{{ comments.comment_link_script() }} +{% endblock %} + +{% block sourcelink %} +{% if show_sourcelink %} + <li> + <a href="{{ post.source_link() }}" id="sourcelink">{{ messages("Source") }}</a> + </li> +{% endif %} +{% endblock %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/post_header.tmpl b/nikola/data/themes/bootstrap-jinja/templates/post_header.tmpl new file mode 100644 index 0000000..b565244 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/post_header.tmpl @@ -0,0 +1,40 @@ +{# -*- coding: utf-8 -*- #} +{% import 'post_helper.tmpl' as helper with context %} +{% import 'comments_helper.tmpl' as comments with context %} + +{% macro html_title() %} + <h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ title|e }}</a></h1> +{% endmacro %} + +{% macro html_translations(post) %} + {% if translations|length > 1 %} + <div class="metadata posttranslations translations"> + <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3> + {% for langname in translations.keys() %} + {% if langname != lang and post.is_translation_available(langname) %} + <p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p> + {% endif %} + {% endfor %} + </div> + {% endif %} +{% endmacro %} + +{% macro html_post_header() %} + <header> + {{ html_title() }} + <div class="metadata"> + <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p> + <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ messages("Publication date") }}">{{ post.formatted_date(date_format) }}</time></a></p> + {% if not post.meta('nocomments') and site_has_comments %} + <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }} + {% endif %} + {% if post.meta('link') %} + <p><a href='{{ post.meta('link') }}'>{{ messages("Original site") }}</a></p> + {% endif %} + {% if post.description() %} + <meta content="{{ post.description() }}" itemprop="description"> + {% endif %} + </div> + {{ html_translations(post) }} + </header> +{% endmacro %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl b/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl new file mode 100644 index 0000000..0ae8fe8 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl @@ -0,0 +1,24 @@ +{% block content %} +<div id="{{ carousel_id }}" class="carousel slide"> + <ol class="carousel-indicators"> + {% for i in range(slides_content|length) %} + {% if i == 0 %} + <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}" class="active"></li> + {% else %} + <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}"></li> + {% endif %} + {% endfor %} + </ol> + <div class="carousel-inner"> + {% for i, image in enumerate(slides_content) %} + {% if i == 0 %} + <div class="item active"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div> + {% else %} + <div class="item"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div> + {% endif %} + {% endfor %} + </div> + <a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev">‹</a> + <a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next">›</a> +</div> +{% endblock %} diff --git a/nikola/data/themes/bootstrap-jinja/templates/tags.tmpl b/nikola/data/themes/bootstrap-jinja/templates/tags.tmpl new file mode 100644 index 0000000..080e621 --- /dev/null +++ b/nikola/data/themes/bootstrap-jinja/templates/tags.tmpl @@ -0,0 +1,26 @@ +{# -*- coding: utf-8 -*- #} +{% extends 'base.tmpl' %} + +{% block content %} +<h1>{{ title }}</h1> +{% if cat_items %} + <h2>{{ messages("Categories") }}</h2> + <ul class="unstyled"> + {% for text, link in cat_items %} + {% if text %} + <li><a class="reference badge" href="{{ link }}">{{ text }}</a></li> + {% endif %} + {% endfor %} + </ul> + {% if items %} + <h2>{{ messages("Tags") }}</h2> + {% endif %} +{% endif %} +{% if items %} + <ul class="list-inline"> + {% for text, link in items %} + <li><a class="reference badge" href="{{ link }}">{{ text }}</a></li> + {% endfor %} + </ul> +{% endif %} +{% endblock %} diff --git a/nikola/data/themes/bootstrap/assets/css/colorbox.css b/nikola/data/themes/bootstrap/assets/css/colorbox.css index 13c3308..5f8b3b0 100644..120000 --- a/nikola/data/themes/bootstrap/assets/css/colorbox.css +++ b/nikola/data/themes/bootstrap/assets/css/colorbox.css @@ -1,69 +1 @@ -/* - Colorbox Core Style: - The following CSS is consistent between example themes and should not be altered. -*/ -#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} -#cboxOverlay{position:fixed; width:100%; height:100%;} -#cboxMiddleLeft, #cboxBottomLeft{clear:left;} -#cboxContent{position:relative;} -#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;} -#cboxTitle{margin:0;} -#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} -#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} -.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;} -.cboxIframe{width:100%; height:100%; display:block; border:0;} -#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;} - -/* - User Style: - Change the following styles to modify the appearance of Colorbox. They are - ordered & tabbed in a way that represents the nesting of the generated HTML. -*/ -#cboxOverlay{background:url(images/overlay.png) repeat 0 0;} -#colorbox{outline:0;} - #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;} - #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;} - #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;} - #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;} - #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} - #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} - #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} - #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} - #cboxContent{background:#fff; overflow:hidden;} - .cboxIframe{background:#fff;} - #cboxError{padding:50px; border:1px solid #ccc;} - #cboxLoadedContent{margin-bottom:28px;} - #cboxTitle{position:absolute; bottom:4px; right: 29px; text-align: right; width:100%; color:#949494;} - #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} - #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;} - #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;} - - /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */ - #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; } - - /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */ - #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;} - - #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} - #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} - #cboxPrevious:hover{background-position:-75px -25px;} - #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} - #cboxNext:hover{background-position:-50px -25px;} - #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} - #cboxClose:hover{background-position:-25px -25px;} - -/* - The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill - when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9. - See: http://jacklmoore.com/notes/ie-transparency-problems/ -*/ -.cboxIE #cboxTopLeft, -.cboxIE #cboxTopCenter, -.cboxIE #cboxTopRight, -.cboxIE #cboxBottomLeft, -.cboxIE #cboxBottomCenter, -.cboxIE #cboxBottomRight, -.cboxIE #cboxMiddleLeft, -.cboxIE #cboxMiddleRight { - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF); -} +../../../../../../bower_components/jquery-colorbox/example3/colorbox.css
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/css/images/border.png b/nikola/data/themes/bootstrap/assets/css/images/border.png Binary files differdeleted file mode 100644 index f463a10..0000000 --- a/nikola/data/themes/bootstrap/assets/css/images/border.png +++ /dev/null diff --git a/nikola/data/themes/bootstrap/assets/css/images/controls.png b/nikola/data/themes/bootstrap/assets/css/images/controls.png Binary files differindex dcfd6fb..841a726 100644..120000 --- a/nikola/data/themes/bootstrap/assets/css/images/controls.png +++ b/nikola/data/themes/bootstrap/assets/css/images/controls.png diff --git a/nikola/data/themes/bootstrap/assets/css/images/loading.gif b/nikola/data/themes/bootstrap/assets/css/images/loading.gif Binary files differindex b4695d8..b192a75 100644..120000 --- a/nikola/data/themes/bootstrap/assets/css/images/loading.gif +++ b/nikola/data/themes/bootstrap/assets/css/images/loading.gif diff --git a/nikola/data/themes/bootstrap/assets/css/images/loading_background.png b/nikola/data/themes/bootstrap/assets/css/images/loading_background.png Binary files differdeleted file mode 100644 index 6ae83e6..0000000 --- a/nikola/data/themes/bootstrap/assets/css/images/loading_background.png +++ /dev/null diff --git a/nikola/data/themes/bootstrap/assets/css/images/overlay.png b/nikola/data/themes/bootstrap/assets/css/images/overlay.png Binary files differdeleted file mode 100644 index 53ea98f..0000000 --- a/nikola/data/themes/bootstrap/assets/css/images/overlay.png +++ /dev/null diff --git a/nikola/data/themes/bootstrap/assets/css/theme.css b/nikola/data/themes/bootstrap/assets/css/theme.css index 952073f..ccdfda2 100644 --- a/nikola/data/themes/bootstrap/assets/css/theme.css +++ b/nikola/data/themes/bootstrap/assets/css/theme.css @@ -101,3 +101,74 @@ h4, h5, h6 { margin-top: -50px; padding-top: 60px; } + +.image-block { + display: inline-block; +} + +.flowr_row { + width: 100%; +} + +.tags { + padding-left: 0; + margin-left: -5px; + list-style: none; + text-align: center; + +} + +.tags > li { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #999; + border-radius: 10px; +} + +.tags > li a { + color: #fff; +} + +.metadata p:before, +.postlist .listdate:before { + content: " — "; +} + +.metadata p:first-of-type:before { + content: ""; +} + +.metadata p { + display: inline; +} + +.posttranslations h3 { + display: inline; + font-size: 1em; + font-weight: bold; +} + +.posttranslations h3:last-child { + display: none; +} + +.entry-content { + margin-top: 1em; +} + +.navbar .brand { + padding: 0 20px; +} + +.navbar .brand #blog-title { + padding: 10px 0; + display: inline-block; +} diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js new file mode 120000 index 0000000..f83073f --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ar.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js new file mode 120000 index 0000000..bafc4e0 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-bg.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js new file mode 120000 index 0000000..a749232 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ca.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js new file mode 120000 index 0000000..e4a595c --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-cs.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js new file mode 120000 index 0000000..1e9a1d6 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-da.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js new file mode 120000 index 0000000..748f53b --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-de.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js new file mode 120000 index 0000000..1154fb5 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-es.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js new file mode 120000 index 0000000..483e192 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-et.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js new file mode 120000 index 0000000..a30b13c --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fa.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js new file mode 120000 index 0000000..2a7e8ad --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fi.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js new file mode 120000 index 0000000..e359290 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js new file mode 120000 index 0000000..04fa276 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js new file mode 120000 index 0000000..d8105ab --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js new file mode 120000 index 0000000..72dddf5 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-he.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js new file mode 120000 index 0000000..34aa3c0 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js new file mode 120000 index 0000000..a87f03c --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hu.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js new file mode 120000 index 0000000..31053b8 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-id.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js new file mode 120000 index 0000000..aad9d22 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-it.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js new file mode 120000 index 0000000..3ea27c2 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ja.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js new file mode 120000 index 0000000..3e23b4a --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-kr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js new file mode 120000 index 0000000..374b9bb --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lt.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js new file mode 120000 index 0000000..101b476 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lv.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js new file mode 120000 index 0000000..8e14f15 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-my.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js new file mode 120000 index 0000000..2d03d48 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-nl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js new file mode 120000 index 0000000..9af0ba7 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-no.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js new file mode 120000 index 0000000..34f8ab1 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pl.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js new file mode 120000 index 0000000..76f289e --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pt-br.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js new file mode 120000 index 0000000..555f2e6 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ro.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js new file mode 120000 index 0000000..bac4855 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ru.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js new file mode 120000 index 0000000..65b0492 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-si.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js new file mode 120000 index 0000000..99859fd --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sk.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js new file mode 120000 index 0000000..c4fd9d5 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js new file mode 120000 index 0000000..d7f26e0 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sv.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js new file mode 120000 index 0000000..86fd98f --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-tr.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js new file mode 120000 index 0000000..7cd1336 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-uk.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js new file mode 120000 index 0000000..e6c5965 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-CN.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js new file mode 120000 index 0000000..bd2254c --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js @@ -0,0 +1 @@ +../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-TW.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js b/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js new file mode 120000 index 0000000..5ee7a90 --- /dev/null +++ b/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js @@ -0,0 +1 @@ +../../../../../../bower_components/jquery-colorbox/jquery.colorbox.js
\ No newline at end of file diff --git a/nikola/data/themes/bootstrap/bundles b/nikola/data/themes/bootstrap/bundles index 14124a3..089b036 100644 --- a/nikola/data/themes/bootstrap/bundles +++ b/nikola/data/themes/bootstrap/bundles @@ -1,4 +1,4 @@ assets/css/all-nocdn.css=bootstrap.css,bootstrap-responsive.css,rst.css,code.css,colorbox.css,theme.css,custom.css assets/css/all.css=rst.css,code.css,colorbox.css,theme.css,custom.css -assets/js/all-nocdn.js=jquery-1.10.2.min.js,bootstrap.min.js,jquery.colorbox-min.js +assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js assets/js/all.js=jquery.colorbox-min.js 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> diff --git a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap/templates/base_helper.tmpl index c041e50..2dcc138 100644 --- a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl +++ b/nikola/data/themes/bootstrap/templates/base_helper.tmpl @@ -1,77 +1,117 @@ -## Override only the functions that differ from base_helper.tmpl -<%def name="html_head()"> +## -*- coding: utf-8 -*- + +<%def name="html_headstart()"> +<!DOCTYPE html> +<html +\ +% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'): +prefix='\ +%if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']): +og: http://ogp.me/ns# \ +%endif +%if use_open_graph: +article: http://ogp.me/ns/article# \ +%endif +%if comment_system == 'facebook': +fb: http://ogp.me/ns/fb# \ +%endif +'\ +%endif +\ +% if is_rtl: +dir="rtl" \ +% endif +\ +lang="${lang}"> + <head> <meta charset="utf-8"> %if description: <meta name="description" content="${description}"> %endif - <meta name="author" content="${blog_author}"> + <meta name="viewport" content="width=device-width"> <title>${title|striphtml} | ${blog_title|striphtml}</title> + + ${html_stylesheets()} + ${html_feedlinks()} + %if permalink: + <link rel="canonical" href="${abs_link(permalink)}"> + %endif + + %if favicons: + %for name, file, size in favicons: + <link rel="${name}" href="${file}" sizes="${size}"/> + %endfor + %endif + + % if comment_system == 'facebook': + <meta property="fb:app_id" content="${comment_system_id}"> + % endif + ${mathjax_config} + %if use_cdn: + <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> + %else: + <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]--> + %endif + + ${extra_head_data} +</%def> + + +<%def name="late_load_js()"> %if use_bundles: %if use_cdn: - <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet"> - <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> + <script src="/assets/js/all.js"></script> %else: - <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> + <script src="/assets/js/all-nocdn.js"></script> %endif %else: %if use_cdn: - <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet"> - %else: - <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css"> - <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"> - %endif - <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 has_custom_css: - <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> - %endif - %endif - %if permalink: - <link rel="canonical" href="${abs_link(permalink)}"> - %endif - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> - <![endif]--> - %if rss_link: - ${rss_link} - %else: - %if len(translations) > 1: - %for language in translations: - <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> - %endfor + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> %else: - <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}"> + <script src="/assets/js/jquery.min.js"></script> + <script src="/assets/js/bootstrap.min.js"></script> %endif + <script src="/assets/js/jquery.colorbox-min.js"></script> %endif - %if favicons: - %for name, file, size in favicons: - <link rel="${name}" href="${file}" sizes="${size}"/> - %endfor + %if colorbox_locales[lang]: + <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script> %endif + ${social_buttons_code} </%def> -<%def name="late_load_js()"> + +<%def name="html_stylesheets()"> %if use_bundles: %if use_cdn: - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript"></script> - <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script> - <script src="/assets/js/all.js" type="text/javascript"></script> + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet"> + <link href="/assets/css/all.css" rel="stylesheet" type="text/css"> %else: - <script src="/assets/js/all-nocdn.js" type="text/javascript"></script> + <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css"> %endif %else: %if use_cdn: - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript"></script> - <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script> + <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet"> %else: - <script src="/assets/js/jquery-1.10.2.min.js" type="text/javascript"></script> - <script src="/assets/js/bootstrap.min.js" type="text/javascript"></script> + <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"> + %endif + <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 has_custom_css: + <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif - <script src="/assets/js/jquery.colorbox-min.js" type="text/javascript"></script> %endif + % if annotations and post and not post.meta('noannotations'): + ${notes.css()} + % elif not annotations and post and post.meta('annotations'): + ${notes.css()} + % endif </%def> @@ -97,3 +137,25 @@ % endif %endfor </%def> + +<%def name="html_feedlinks()"> + %if rss_link: + ${rss_link} + %elif generate_rss: + %if len(translations) > 1: + %for language in translations: + <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}"> + %endfor + %else: + <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}"> + %endif + %endif +</%def> + +<%def name="html_translations()"> + %for langname in translations.keys(): + %if langname != lang: + <li><a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li> + %endif + %endfor +</%def> diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl index 7b0d505..8ad4eb4 100644 --- a/nikola/data/themes/bootstrap/templates/gallery.tmpl +++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl @@ -9,38 +9,37 @@ %if title: <h1>${title}</h1> %endif - %if text: + %if post: <p> - ${text} + ${post.text()} </p> %endif %if folders: <ul> % for folder, ftitle in folders: - <li><a href="${folder}"><i - class="icon-folder-open"></i> ${ftitle}</a></li> + <li><a href="${folder}"><i class="icon-folder-open"></i> ${ftitle}</a></li> % endfor </ul> %endif - <div id="gallery_container"></div> - %if photo_array: - <noscript> - <ul class="thumbnails"> - %for image in photo_array: - <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}"> - <img src="${image['url_thumb']}" alt="${image['title']}" /></a> - %endfor - </ul> - </noscript> - %endif -%if enable_comments: - ${comments.comment_form(None, permalink, title)} +<div id="gallery_container"></div> +%if photo_array: +<noscript> +<ul class="thumbnails"> + %for image in photo_array: + <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}"> + <img src="${image['url_thumb']}" alt="${image['title']}" /></a> + %endfor +</ul> +</noscript> +%endif +%if site_has_comments and enable_comments: +${comments.comment_form(None, permalink, title)} %endif </%block> - <%block name="extra_head"> +${parent.extra_head()} <style type="text/css"> .image-block { display: inline-block; diff --git a/nikola/data/themes/bootstrap/templates/listing.tmpl b/nikola/data/themes/bootstrap/templates/listing.tmpl new file mode 100644 index 0000000..f03ea23 --- /dev/null +++ b/nikola/data/themes/bootstrap/templates/listing.tmpl @@ -0,0 +1,28 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%namespace name="ui" file="crumbs.tmpl" import="bar"/> + +<%block name="content"> +${ui.bar(crumbs)} +%if folders or files: +<ul class="list-unstyled"> +% for name in folders: + <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a> +% endfor +% for name in files: + <li><a href="${name}.html"><i class="icon-file"></i> ${name}</a> +% endfor +</ul> +%endif +% if code: + ${code} +% endif +</%block> + +<%block name="sourcelink"> +% if source_link: + <li> + <a href="${source_link}" id="sourcelink">${messages("Source")}</a> + </li> +% endif +</%block> diff --git a/nikola/data/themes/bootstrap/templates/post.tmpl b/nikola/data/themes/bootstrap/templates/post.tmpl new file mode 100644 index 0000000..29a5b75 --- /dev/null +++ b/nikola/data/themes/bootstrap/templates/post.tmpl @@ -0,0 +1,47 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> +<%namespace name="pheader" file="post_header.tmpl"/> +<%namespace name="comments" file="comments_helper.tmpl"/> +<%inherit file="base.tmpl"/> + +<%block name="extra_head"> + ${parent.extra_head()} + % if post.meta('keywords'): + <meta name="keywords" content="${post.meta('keywords')|h}"> + % endif + <meta name="author" content="${post.author()}"> + ${helper.open_graph_metadata(post)} + ${helper.twitter_card_information(post)} + ${helper.meta_translations(post)} +</%block> + +<%block name="content"> +<article class="post-${post.meta('type')} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article"> + ${pheader.html_post_header()} + <div class="e-content entry-content" itemprop="articleBody text"> + ${post.text()} + </div> + <aside class="postpromonav"> + <nav> + ${helper.html_tags(post)} + ${helper.html_pager(post)} + </nav> + </aside> + % if not post.meta('nocomments') and site_has_comments: + <section class="comments"> + <h2>${messages("Comments")}</h2> + ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)} + </section> + % endif + ${helper.mathjax_script(post)} +</article> +${comments.comment_link_script()} +</%block> + +<%block name="sourcelink"> +% if show_sourcelink: + <li> + <a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a> + </li> +% endif +</%block> diff --git a/nikola/data/themes/bootstrap/templates/slides.tmpl b/nikola/data/themes/bootstrap/templates/slides.tmpl index 14983ad..048fb7e 100644 --- a/nikola/data/themes/bootstrap/templates/slides.tmpl +++ b/nikola/data/themes/bootstrap/templates/slides.tmpl @@ -1,6 +1,7 @@ +<%block name="content"> <div id="${carousel_id}" class="carousel slide"> <ol class="carousel-indicators"> - % for i in range(len(content)): + % for i in range(len(slides_content)): % if i == 0: <li data-target="#${carousel_id}" data-slide-to="${i}" class="active"></li> % else: @@ -9,7 +10,7 @@ % endfor </ol> <div class="carousel-inner"> - % for i, image in enumerate(content): + % for i, image in enumerate(slides_content): % if i == 0: <div class="item active"><img src="${image}" alt="" style="margin: 0 auto 0 auto;"></div> % else: @@ -20,3 +21,4 @@ <a class="left carousel-control" href="#${carousel_id}" data-slide="prev">‹</a> <a class="right carousel-control" href="#${carousel_id}" data-slide="next">›</a> </div> +</%block> diff --git a/nikola/data/themes/bootstrap/templates/tags.tmpl b/nikola/data/themes/bootstrap/templates/tags.tmpl new file mode 100644 index 0000000..9afeca7 --- /dev/null +++ b/nikola/data/themes/bootstrap/templates/tags.tmpl @@ -0,0 +1,26 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> + +<%block name="content"> +<h1>${title}</h1> +% if cat_items: + <h2>${messages("Categories")}</h2> + <ul class="unstyled"> + % for text, link in cat_items: + % if text: + <li><a class="reference badge" href="${link}">${text}</a></li> + % endif + % endfor + </ul> + % if items: + <h2>${messages("Tags")}</h2> + % endif +%endif +% if items: + <ul class="list-inline"> + % for text, link in items: + <li><a class="reference badge" href="${link}">${text}</a></li> + % endfor + </ul> +% endif +</%block> |
