diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-02-28 08:49:38 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-02-28 08:49:38 -0300 |
| commit | 2828399ba5cbb14502b023d4de1ba02f13dd5055 (patch) | |
| tree | 38012b6bacaa508ca56fb6f4ba87b912bb54b8c9 /nikola/data | |
| parent | ca94afc07df55cb7fc6fe3b4f3011877b7881195 (diff) | |
Imported Upstream version 6.3.0upstream/6.3.0
Diffstat (limited to 'nikola/data')
45 files changed, 422 insertions, 109 deletions
diff --git a/nikola/data/samplesite/files/assets/css/custom.css b/nikola/data/samplesite/files/assets/css/custom.css deleted file mode 100644 index e69de29..0000000 --- a/nikola/data/samplesite/files/assets/css/custom.css +++ /dev/null diff --git a/nikola/data/samplesite/galleries/demo/index.txt b/nikola/data/samplesite/galleries/demo/index.txt index d3d5a44..e29f66e 100644 --- a/nikola/data/samplesite/galleries/demo/index.txt +++ b/nikola/data/samplesite/galleries/demo/index.txt @@ -1,2 +1,4 @@ +.. title: Nikola Tesla + Some public domain pictures of Nikola Tesla -(copied from `here <http://kerryr.net/pioneers/gallery/tesla.htm>`_)
\ No newline at end of file +(copied from `here <http://kerryr.net/pioneers/gallery/tesla.htm>`_) diff --git a/nikola/data/themes/base/assets/css/theme.css b/nikola/data/themes/base/assets/css/theme.css index e69de29..2a924f1 100644 --- a/nikola/data/themes/base/assets/css/theme.css +++ b/nikola/data/themes/base/assets/css/theme.css @@ -0,0 +1 @@ +/* This file intentionally left blank. */ diff --git a/nikola/data/themes/base/assets/js/mathjax.js b/nikola/data/themes/base/assets/js/mathjax.js index 2f4e773..82c1f6c 100644 --- a/nikola/data/themes/base/assets/js/mathjax.js +++ b/nikola/data/themes/base/assets/js/mathjax.js @@ -6,7 +6,12 @@ window.onload = function () { setTimeout(function () { var script = document.createElement("script"); script.type = "text/javascript"; - script.src = "https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML"; + if (location.protocol == 'https:') { + scriptbase = "https://c328740.ssl.cf1.rackcdn.com/"; + } else { + scriptbase = "http://cdn.mathjax.org/"; + } + script.src = scriptbase + "mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; document.getElementsByTagName("body")[0].appendChild(script); },1) -}
\ No newline at end of file +} diff --git a/nikola/data/themes/base/messages/messages_bg.py b/nikola/data/themes/base/messages/messages_bg.py index 2d36959..d4881b5 100644 --- a/nikola/data/themes/base/messages/messages_bg.py +++ b/nikola/data/themes/base/messages/messages_bg.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Също достъпно в", + "Also available in:": "Също достъпно в:", "Archive": "Архив", "Categories": "Категории", "LANGUAGE": "Български", - "More posts about": "Още публикации относно ", + "More posts about %s": "Още публикации относно %s", + "More posts about": "Още публикации относно", "Newer posts": "Нови публикации", "Next post": "Следваща публикация", "Older posts": "Стари публикации", "Original site": "Оригиналния сайт", "Posted": "Публиковано", + "Posted:": "Публиковано:", "Posts about %s": "Публикации относно %s", "Posts for year %s": "Публикации за %s година", "Posts for {month} {year}": "Публикации за {month} {year}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Source", "Tags and Categories": "Тагове и Категории", "Tags": "Тагове", - "old posts page %d": "стари публикации страница %d", + "old posts, page %d": "стари публикации, страница %d", + "page %d": "страница %d", } diff --git a/nikola/data/themes/base/messages/messages_ca.py b/nikola/data/themes/base/messages/messages_ca.py index 80c4ee4..d3a97b5 100644 --- a/nikola/data/themes/base/messages/messages_ca.py +++ b/nikola/data/themes/base/messages/messages_ca.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "També disponibles en", + "Also available in:": "També disponibles en:", "Archive": "Arxiu", "Categories": "", "LANGUAGE": "Català", + "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", "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}": "", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Codi", "Tags and Categories": "", "Tags": "Etiquetes", - "old posts page %d": "entrades antigues pàgina %d", + "old posts, page %d": "entrades antigues, pàgina %d", + "page %d": "pàgina %d", } diff --git a/nikola/data/themes/base/messages/messages_cs.py b/nikola/data/themes/base/messages/messages_cs.py new file mode 100644 index 0000000..33482b5 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_cs.py @@ -0,0 +1,29 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "Also available in": "Dostupné také v", + "Also available in:": "Dostupné také v", + "Archive": "Archiv", + "Categories": "Kategorie", + "LANGUAGE": "Čeština", + "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", + "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", + "Read in English": "Číst v češtině", + "Read more": "Číst dál", + "Source": "Zdroj", + "Tags and Categories": "Štítky a kategorie", + "Tags": "Štítky", + "old posts, page %d": "staré příspěvky, strana %d", + "page %d": "strana %d", +} diff --git a/nikola/data/themes/base/messages/messages_cz.py b/nikola/data/themes/base/messages/messages_cz.py new file mode 120000 index 0000000..d784fd5 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_cz.py @@ -0,0 +1 @@ +messages_cs.py
\ No newline at end of file diff --git a/nikola/data/themes/base/messages/messages_de.py b/nikola/data/themes/base/messages/messages_de.py index c885304..6795031 100644 --- a/nikola/data/themes/base/messages/messages_de.py +++ b/nikola/data/themes/base/messages/messages_de.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Auch verfügbar in", + "Also available in:": "Auch verfügbar in:", "Archive": "Archiv", "Categories": "Kategorien", "LANGUAGE": "Deutsch", + "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", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Source", "Tags and Categories": "Tags und Kategorien", "Tags": "Tags", - "old posts page %d": "Vorherige Einträge %d", + "old posts, page %d": "Vorherige Einträge, Seite %d", + "page %d": "Seite %d", } diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py index a1745fa..710558b 100644 --- a/nikola/data/themes/base/messages/messages_el.py +++ b/nikola/data/themes/base/messages/messages_el.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Διαθέσιμο και στα", + "Also available in:": "Διαθέσιμο και στα:", "Archive": "Αρχείο", "Categories": "Κατηγορίες", "LANGUAGE": "Ελληνικά", + "More posts about %s": "Περισσότερες αναρτήσεις για %s", "More posts about": "Περισσότερες αναρτήσεις για", "Newer posts": "Νεότερες αναρτήσεις", "Next post": "Επόμενη ανάρτηση", "Older posts": "Παλαιότερες αναρτήσεις", "Original site": "Ιστοσελίδα αρχικής ανάρτησης", "Posted": "Αναρτήθηκε", + "Posted:": "Αναρτήθηκε:", "Posts about %s": "Αναρτήσεις για %s", "Posts for year %s": "Αναρτήσεις για το έτος %s", "Posts for {month} {year}": "Αναρτήσεις για τον {month} του {year}", @@ -19,7 +22,8 @@ MESSAGES = { "Read in English": "Διαβάστε στα Ελληνικά", "Read more": "Διαβάστε περισσότερα", "Source": "Πηγαίος κώδικας", - "Tags and Categories": "", + "Tags and Categories": "Ετικέτες και κατηγορίες", "Tags": "Ετικέτες", - "old posts page %d": "σελίδα παλαιότερων αναρτήσεων %d", + "old posts, page %d": "σελίδα παλαιότερων αναρτήσεων %d", + "page %d": "σελίδα %d", } diff --git a/nikola/data/themes/base/messages/messages_en.py b/nikola/data/themes/base/messages/messages_en.py index 1e695ac..021f5e7 100644 --- a/nikola/data/themes/base/messages/messages_en.py +++ b/nikola/data/themes/base/messages/messages_en.py @@ -3,17 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Also available in", + "Also available in:": "Also available in:", "Archive": "Archive", "Categories": "Categories", "LANGUAGE": "English", + "More posts about %s": "More posts about %s", "More posts about": "More posts about", "Newer posts": "Newer posts", "Next post": "Next post", - "No content": "", - "No title": "", "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}", @@ -23,5 +24,6 @@ MESSAGES = { "Source": "Source", "Tags and Categories": "Tags and Categories", "Tags": "Tags", - "old posts page %d": "old posts page %d", + "old posts, page %d": "old posts, page %d", + "page %d": "page %d", } diff --git a/nikola/data/themes/base/messages/messages_eo.py b/nikola/data/themes/base/messages/messages_eo.py index 50bd25a..fdbea88 100644 --- a/nikola/data/themes/base/messages/messages_eo.py +++ b/nikola/data/themes/base/messages/messages_eo.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Ankaŭ disponebla en", + "Also available in:": "Ankaŭ disponebla en:", "Archive": "Arĥivo", "Categories": "Kategorioj", "LANGUAGE": "Anglalingve", - "More posts about": "Pli artikoloj pri...", + "More posts about %s": "Pli artikoloj pri %s", + "More posts about": "Pli artikoloj pri", "Newer posts": "Pli novaj artikoloj", "Next post": "Venonta artikolo", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Fonto", "Tags and Categories": "Etikedoj kaj Kategorioj", "Tags": "Etikedoj", - "old posts page %d": "paĝo de malnovaj artikoloj %d", + "old posts, page %d": "paĝo de malnovaj artikoloj %d", + "page %d": "paĝo %d", } diff --git a/nikola/data/themes/base/messages/messages_es.py b/nikola/data/themes/base/messages/messages_es.py index 79ffac6..6c48fb9 100644 --- a/nikola/data/themes/base/messages/messages_es.py +++ b/nikola/data/themes/base/messages/messages_es.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "También disponible en", + "Also available in:": "También disponible en:", "Archive": "Archivo", "Categories": "Categorías", "LANGUAGE": "Español", + "More posts about %s": "Más posts sobre %s", "More posts about": "Más posts sobre", "Newer posts": "Posts posteriores", "Next post": "Siguiente post", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Código", "Tags and Categories": "Tags y Categorías", "Tags": "Tags", - "old posts page %d": "posts antiguos página %d", + "old posts, page %d": "posts antiguos, página %d", + "page %d": "página %d", } diff --git a/nikola/data/themes/base/messages/messages_et.py b/nikola/data/themes/base/messages/messages_et.py new file mode 100644 index 0000000..314f3b8 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_et.py @@ -0,0 +1,29 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "Also available in": "Saadaval ka", + "Also available in:": "Saadaval ka:", + "Archive": "Arhiiv", + "Categories": "Kategooriad", + "LANGUAGE": "Eesti", + "More posts about %s": "Veel postitusi %s kohta", + "More posts about": "Veel postitusi kohta", + "Newer posts": "Uued postitused", + "Next post": "Järgmine postitus", + "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", + "Read in English": "Loe eesti keeles", + "Read more": "Loe veel", + "Source": "Lähtekood", + "Tags and Categories": "Sildid ja kategooriad", + "Tags": "Märksõnad", + "old posts, page %d": "vanade postituste, leht %d", + "page %d": "leht %d", +} diff --git a/nikola/data/themes/base/messages/messages_eu.py b/nikola/data/themes/base/messages/messages_eu.py new file mode 100644 index 0000000..18d7575 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_eu.py @@ -0,0 +1,29 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "Also available in": "Eskuragarria hemen ere", + "Also available in:": "Eskuragarria hemen ere:", + "Archive": "Artxiboa", + "Categories": "Kategoriak", + "LANGUAGE": "Euskara", + "More posts about %s": "%s-ri buruzko post gehiago", + "More posts about": "-ri buruzko post gehiago", + "Newer posts": "Post berrienak", + "Next post": "Hurrengo posta", + "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", + "Read in English": "Euskaraz irakurri", + "Read more": "Irakurri gehiago", + "Source": "Iturria", + "Tags and Categories": "Etiketak eta Kategoriak", + "Tags": "Etiketak", + "old posts, page %d": "Post zaharren, orria %d", + "page %d": "orria %d", +} diff --git a/nikola/data/themes/base/messages/messages_fa.py b/nikola/data/themes/base/messages/messages_fa.py index 786893c..bd278ca 100644 --- a/nikola/data/themes/base/messages/messages_fa.py +++ b/nikola/data/themes/base/messages/messages_fa.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "همچنین قابل دسترس از", + "Also available in:": "همچنین قابل دسترس از:", "Archive": "آرشیو", "Categories": "دستهها", "LANGUAGE": "فارسی", + "More posts about %s": "ارسالهای بیشتر دربارهٔ%s", "More posts about": "ارسالهای بیشتر دربارهٔ", "Newer posts": "ارسالهای جدیدتر", "Next post": "ارسال بعدی", "Older posts": "پستهای قدیمیتر", "Original site": "سایت اصلی", "Posted": "ارسال شده", + "Posted:": "ارسال شده:", "Posts about %s": "ارسالها دربارهٔ %s", "Posts for year %s": "ارسالها برای سال %s", "Posts for {month} {year}": "ارسال برای {month} {year}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "منبع", "Tags and Categories": "برچسبها و دستهها", "Tags": "برچسبها", - "old posts page %d": "صفحهٔ ارسالهای قدیمی %d", + "old posts, page %d": "صفحهٔ ارسالهای قدیمی %d", + "page %d": "", } diff --git a/nikola/data/themes/base/messages/messages_fi.py b/nikola/data/themes/base/messages/messages_fi.py index ca64919..b24ee2c 100644 --- a/nikola/data/themes/base/messages/messages_fi.py +++ b/nikola/data/themes/base/messages/messages_fi.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Saatavilla myös", + "Also available in:": "Saatavilla myös:", "Archive": "Arkisto", "Categories": "Kategoriat", "LANGUAGE": "Suomi", + "More posts about %s": "Lisää postauksia aiheesta %s", "More posts about": "Lisää postauksia aiheesta", "Newer posts": "Uudempia postauksia", "Next post": "Seuraava postaus", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Lähde", "Tags and Categories": "Tagit ja kategoriat", "Tags": "Tagit", - "old posts page %d": "vanhojen postauksien sivu %d", + "old posts, page %d": "vanhojen postauksien, 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 45c7474..ad4aea0 100644 --- a/nikola/data/themes/base/messages/messages_fr.py +++ b/nikola/data/themes/base/messages/messages_fr.py @@ -2,24 +2,28 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Disponible aussi en", + "Also available in": "Egalement disponible en", + "Also available in:": "Egalement disponible en:", "Archive": "Archives", "Categories": "Catégories", "LANGUAGE": "Français", - "More posts about": "Plus de billets sur", + "More posts about %s": "Plus d'articles sur %s", + "More posts about": "Plus d'articles sur", "Newer posts": "Billets récents", - "Next post": "Billet suivant", - "Older posts": "Anciens billets", + "Next post": "Article suivant", + "Older posts": "Anciens articles", "Original site": "Site d'origine", "Posted": "Publié", - "Posts about %s": "Billets sur %s", - "Posts for year %s": "Billets de l'année %s", - "Posts for {month} {year}": "Billets de {month} {year}", - "Previous post": "Billet précédent", + "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", "Read in English": "Lire en français", "Read more": "Lire la suite", "Source": "Source", "Tags and Categories": "Étiquettes et catégories", "Tags": "Étiquettes", - "old posts page %d": "anciens billets page %d", + "old posts, page %d": "anciens articles, page %d", + "page %d": "page %d", } diff --git a/nikola/data/themes/base/messages/messages_hr.py b/nikola/data/themes/base/messages/messages_hr.py index 420159d..ad74078 100644 --- a/nikola/data/themes/base/messages/messages_hr.py +++ b/nikola/data/themes/base/messages/messages_hr.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Također dostupno i u", + "Also available in:": "Također dostupno i u:", "Archive": "Arhiva", - "Categories": "", + "Categories": "Kategorije", "LANGUAGE": "hrvatski", + "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", "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}", @@ -19,7 +22,8 @@ MESSAGES = { "Read in English": "Čitaj na hrvatskom", "Read more": "Čitaj dalje", "Source": "Izvor", - "Tags and Categories": "", + "Tags and Categories": "Tagovi i kategorije", "Tags": "Tagovi", - "old posts page %d": "stari postovi stranice %d", + "old posts, page %d": "stari postovi, stranice %d", + "page %d": "stranice %d", } diff --git a/nikola/data/themes/base/messages/messages_it.py b/nikola/data/themes/base/messages/messages_it.py index b460f22..912342e 100644 --- a/nikola/data/themes/base/messages/messages_it.py +++ b/nikola/data/themes/base/messages/messages_it.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Anche disponibile in", + "Also available in:": "Anche disponibile in:", "Archive": "Archivio", "Categories": "Categorie", "LANGUAGE": "Italiano", + "More posts about %s": "Altri articoli collegati %s", "More posts about": "Altri articoli collegati", "Newer posts": "Articoli recenti", "Next post": "Articolo successivo", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Sorgente", "Tags and Categories": "Tags e Categorie", "Tags": "Tags", - "old posts page %d": "pagina dei vecchi articoli %d", + "old posts, page %d": "pagina dei vecchi articoli %d", + "page %d": "pagina %d", } diff --git a/nikola/data/themes/base/messages/messages_ja.py b/nikola/data/themes/base/messages/messages_ja.py index 4a238cc..1bdf168 100644 --- a/nikola/data/themes/base/messages/messages_ja.py +++ b/nikola/data/themes/base/messages/messages_ja.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "他の言語で読む", + "Also available in:": "他の言語で読む：", "Archive": "過去の記事", - "Categories": "", + "Categories": "カテゴリー", "LANGUAGE": "日本語", - "More posts about": "タグ", + "More posts about %s": "タグ： %s", + "More posts about": "タグ：", "Newer posts": "新しい記事", "Next post": "次の記事", "Older posts": "過去の記事", "Original site": "元のサイト", "Posted": "投稿日時", + "Posted:": "投稿日時：", "Posts about %s": "%sについての記事", "Posts for year %s": "%s年の記事", "Posts for {month} {year}": "{year}年{month}月の記事", @@ -19,7 +22,8 @@ MESSAGES = { "Read in English": "日本語で読む", "Read more": "続きを読む", "Source": "ソース", - "Tags and Categories": "", + "Tags and Categories": "タグとカテゴリー", "Tags": "タグ", - "old posts page %d": "前の記事 %dページ目", + "old posts, page %d": "前の記事 %dページ目", + "page %d": "", } diff --git a/nikola/data/themes/base/messages/messages_nb.py b/nikola/data/themes/base/messages/messages_nb.py new file mode 100644 index 0000000..154e329 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_nb.py @@ -0,0 +1,29 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "Also available in": "Også tilgjengelig på", + "Also available in:": "Også tilgjengelig på:", + "Archive": "Arkiv", + "Categories": "Kategorier", + "LANGUAGE": "norsk", + "More posts about %s": "Flere innlegg om %s", + "More posts about": "Flere innlegg om", + "Newer posts": "Nyere innlegg", + "Next post": "Neste innlegg", + "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", + "Read in English": "Les på norsk", + "Read more": "Les mer", + "Source": "Kilde", + "Tags and Categories": "Merker og kategorier", + "Tags": "Merker", + "old posts, page %d": "eldre innlegg, side %d", + "page %d": "side %d", +} diff --git a/nikola/data/themes/base/messages/messages_nl.py b/nikola/data/themes/base/messages/messages_nl.py index a2da822..887e85f 100644 --- a/nikola/data/themes/base/messages/messages_nl.py +++ b/nikola/data/themes/base/messages/messages_nl.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Ook beschikbaar in", + "Also available in:": "Ook beschikbaar in:", "Archive": "Archief", "Categories": "Categorieën", "LANGUAGE": "Nederlands", + "More posts about %s": "Meer berichten over %s", "More posts about": "Meer berichten over", "Newer posts": "Nieuwere berichten", "Next post": "Volgend bericht", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Bron", "Tags and Categories": "Tags en Categorieën", "Tags": "Tags", - "old posts page %d": "oude berichten pagina %d", + "old posts, page %d": "oude berichten, pagina %d", + "page %d": "pagina %d", } diff --git a/nikola/data/themes/base/messages/messages_pl.py b/nikola/data/themes/base/messages/messages_pl.py index cf5c51c..352b0ed 100644 --- a/nikola/data/themes/base/messages/messages_pl.py +++ b/nikola/data/themes/base/messages/messages_pl.py @@ -2,16 +2,19 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Również dostępny w", + "Also available in": "Również dostępny w językach", + "Also available in:": "Również dostępny w językach:", "Archive": "Archiwum", "Categories": "Kategorie", "LANGUAGE": "polski", + "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", "Older posts": "Starsze posty", "Original site": "Oryginalna strona", - "Posted": "Opublikowany", + "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Źródło", "Tags and Categories": "Tagi i Kategorie", "Tags": "Tags", - "old posts page %d": "stare posty, strona %d", + "old posts, page %d": "stare posty, strona %d", + "page %d": "strona %d", } diff --git a/nikola/data/themes/base/messages/messages_pt_br.py b/nikola/data/themes/base/messages/messages_pt_br.py index ebf642a..1283a2a 100644 --- a/nikola/data/themes/base/messages/messages_pt_br.py +++ b/nikola/data/themes/base/messages/messages_pt_br.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Também disponível em", + "Also available in:": "Também disponível em:", "Archive": "Arquivo", "Categories": "Categorias", "LANGUAGE": "Português", + "More posts about %s": "Mais posts sobre %s", "More posts about": "Mais posts sobre", "Newer posts": "Posts mais recentes", "Next post": "Próximo post", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Código", "Tags and Categories": "Tags e Categorias", "Tags": "Tags", - "old posts page %d": "Posts antigos página %d", + "old posts, page %d": "Posts antigos, página %d", + "page %d": "página %d", } diff --git a/nikola/data/themes/base/messages/messages_ru.py b/nikola/data/themes/base/messages/messages_ru.py index 44ce1f2..3462292 100644 --- a/nikola/data/themes/base/messages/messages_ru.py +++ b/nikola/data/themes/base/messages/messages_ru.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Также доступно на", + "Also available in:": "Также доступно на:", "Archive": "Архив", "Categories": "Категории", "LANGUAGE": "Русский", + "More posts about %s": "Больше записей о %s", "More posts about": "Больше записей о", "Newer posts": "Новые записи", "Next post": "Следующая запись", "Older posts": "Старые записи", "Original site": "Оригинальный сайт", "Posted": "Опубликовано", + "Posted:": "Опубликовано:", "Posts about %s": "Записи о %s", "Posts for year %s": "Записи за %s год", "Posts for {month} {year}": "Записи за {month} {year}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Источник", "Tags and Categories": "Тэги и категории", "Tags": "Тэги", - "old posts page %d": "%d страница со старыми записями", + "old posts, page %d": "%d страница со старыми записями", + "page %d": "%d страница", } diff --git a/nikola/data/themes/base/messages/messages_sl.py b/nikola/data/themes/base/messages/messages_sl.py index bad3327..817bcee 100644 --- a/nikola/data/themes/base/messages/messages_sl.py +++ b/nikola/data/themes/base/messages/messages_sl.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "Na voljo tudi v", + "Also available in:": "Na voljo tudi v:", "Archive": "Arhiv", "Categories": "Kategorije", "LANGUAGE": "Slovenščina", + "More posts about %s": "Več objav o %s", "More posts about": "Več objav o", "Newer posts": "Novejše objave", "Next post": "Naslednja objava", "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}", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Izvor", "Tags and Categories": "Značke in kategorije", "Tags": "Značke", - "old posts page %d": "stare objave, stran %d", + "old posts, page %d": "stare objave, stran %d", + "page %d": "stran %d", } diff --git a/nikola/data/themes/base/messages/messages_tr.py b/nikola/data/themes/base/messages/messages_tr.py new file mode 120000 index 0000000..ad92768 --- /dev/null +++ b/nikola/data/themes/base/messages/messages_tr.py @@ -0,0 +1 @@ +messages_tr_tr.py
\ No newline at end of file diff --git a/nikola/data/themes/base/messages/messages_tr_tr.py b/nikola/data/themes/base/messages/messages_tr_tr.py index 7cf0e9f..633f057 100644 --- a/nikola/data/themes/base/messages/messages_tr_tr.py +++ b/nikola/data/themes/base/messages/messages_tr_tr.py @@ -2,16 +2,19 @@ from __future__ import unicode_literals MESSAGES = { - "Also available in": "Şu dilde de mevcut:", + "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": "ilgili diğer yazılar", + "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ı", "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", @@ -21,5 +24,6 @@ MESSAGES = { "Source": "Kaynak", "Tags and Categories": "Etiketler ve Kategoriler", "Tags": "Etiketler", - "old posts page %d": "eski yazılar sayfa %d", + "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 new file mode 100644 index 0000000..d9c2f2b --- /dev/null +++ b/nikola/data/themes/base/messages/messages_ur.py @@ -0,0 +1,29 @@ +# -*- encoding:utf-8 -*- +from __future__ import unicode_literals + +MESSAGES = { + "Also available in": "ان زبانوں میں بھی دستیاب", + "Also available in:": "ان زبانوں میں بھی دستیاب:", + "Archive": "آرکائیو", + "Categories": "زمرے", + "LANGUAGE": "اردو", + "More posts about %s": "%s کے بارے میں مزید تحاریر", + "More posts about": " کے بارے میں مزید تحاریر", + "Newer posts": "نئی تحاریر", + "Next post": "اگلی تحریر", + "Older posts": "پرانی تحاریر", + "Original site": "اصلی سائٹ", + "Posted": "اشاعت", + "Posted:": "اشاعت:", + "Posts about %s": "%s کے بارے میں تحاریر", + "Posts for year %s": "سال %s کی تحاریر", + "Posts for {month} {year}": "{month} {year} کی تحاریر", + "Previous post": "پچھلی تحریر", + "Read in English": "اردو میں پڑھیے", + "Read more": "مزید پڑھیے", + "Source": "سورس", + "Tags and Categories": "ٹیگز اور زمرے", + "Tags": "ٹیگز", + "old posts, page %d": "پرانی تحاریر صفحہ %d", + "page %d": "", +} diff --git a/nikola/data/themes/base/messages/messages_zh_cn.py b/nikola/data/themes/base/messages/messages_zh_cn.py index fc79313..cb9a2f7 100644 --- a/nikola/data/themes/base/messages/messages_zh_cn.py +++ b/nikola/data/themes/base/messages/messages_zh_cn.py @@ -3,15 +3,18 @@ from __future__ import unicode_literals MESSAGES = { "Also available in": "其他语言版本", + "Also available in:": "其他语言版本：", "Archive": "文章存档", - "Categories": "", + "Categories": "分类", "LANGUAGE": "简体中文", + "More posts about %s": "更多相关文章： %s", "More posts about": "更多相关文章：", "Newer posts": "新一篇", "Next post": "后一篇", "Older posts": "旧一篇", "Original site": "原文地址", "Posted": "发表于", + "Posted:": "发表于：", "Posts about %s": "文章分类：%s", "Posts for year %s": "%s年文章", "Posts for {month} {year}": "{year}年{month}月文章", @@ -19,7 +22,8 @@ MESSAGES = { "Read in English": "中文版", "Read more": "更多", "Source": "源代码", - "Tags and Categories": "", + "Tags and Categories": "标签和分类", "Tags": "标签", - "old posts page %d": "旧文章页 %d", + "old posts, page %d": "旧文章页 %d", + "page %d": "", } diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl index 31c1747..7c6cc35 100644 --- a/nikola/data/themes/base/templates/base.tmpl +++ b/nikola/data/themes/base/templates/base.tmpl @@ -21,7 +21,7 @@ lang="${lang}"> <%block name="belowtitle"> %if len(translations) > 1: <small> - ${(messages("Also available in"))}: + ${messages("Also available in:")} ${base.html_translations()} </small> %endif diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl index ac1dea3..880a998 100644 --- a/nikola/data/themes/base/templates/base_helper.tmpl +++ b/nikola/data/themes/base/templates/base_helper.tmpl @@ -21,6 +21,7 @@ <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif %endif + <link rel="canonical" href="${abs_link(permalink)}"> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> <![endif]--> @@ -49,7 +50,7 @@ </%def> <%def name="html_social()"> - ${social_buttons_code} + ${social_buttons_code} </%def> <!--FIXME: remove in v7 --> @@ -64,7 +65,7 @@ <ul> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": - <li class="active"><a href="${suburl}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${suburl}">${text}</a> %endif @@ -72,7 +73,7 @@ </ul> % else: % if rel_link(permalink, url) == "#": - <li class="active"><a href="${url}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${url}">${text}</a> %endif @@ -84,7 +85,7 @@ <%def name="html_translations()"> %for langname in translations.keys(): %if langname != lang: - <a href="${_link("index", None, langname)}">${messages("LANGUAGE", langname)}</a> + <a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a> %endif %endfor </%def> diff --git a/nikola/data/themes/base/templates/comments_helper.tmpl b/nikola/data/themes/base/templates/comments_helper.tmpl index e74a146..d3a2704 100644 --- a/nikola/data/themes/base/templates/comments_helper.tmpl +++ b/nikola/data/themes/base/templates/comments_helper.tmpl @@ -5,6 +5,8 @@ <%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"/> <%def name="comment_form(url, title, identifier)"> %if comment_system == 'disqus': @@ -17,6 +19,10 @@ ${moot.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 </%def> @@ -31,6 +37,10 @@ ${moot.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 </%def> @@ -45,5 +55,9 @@ ${moot.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 </%def> diff --git a/nikola/data/themes/base/templates/disqus_helper.tmpl b/nikola/data/themes/base/templates/disqus_helper.tmpl index 211f27a..74187b0 100644 --- a/nikola/data/themes/base/templates/disqus_helper.tmpl +++ b/nikola/data/themes/base/templates/disqus_helper.tmpl @@ -9,24 +9,24 @@ <%def name="comment_form(url, title, identifier)"> %if comment_system_id: <div id="disqus_thread"></div> - <script type="text/javascript"> - var disqus_shortname ="${comment_system_id}"; + <script> + var disqus_shortname ="${comment_system_id}", %if url: - var disqus_url="${url}"; + disqus_url="${url}", %endif - var disqus_title=${json.dumps(title)}; - var disqus_identifier="${identifier}"; - var disqus_config = function () { + disqus_title=${json.dumps(title)}, + disqus_identifier="${identifier}", + disqus_config = function () { this.language = "${translations.get(lang, lang)}"; }; (function() { - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; + 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="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> - <a href="http://disqus.com" class="dsq-brlink">Comments powered by <span class="logo-disqus">Disqus</span></a> + <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> %endif </%def> @@ -40,7 +40,7 @@ <%def name="comment_link_script()"> %if comment_system_id: - <script type="text/javascript">var disqus_shortname="${comment_system_id}";(function(){var a=document.createElement("script");a.async=true;a.type="text/javascript";a.src="http://"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("HEAD")[0]||document.getElementsByTagName("BODY")[0]).appendChild(a)}());</script> + <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> diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl index be9cc6f..e4eab27 100644 --- a/nikola/data/themes/base/templates/gallery.tmpl +++ b/nikola/data/themes/base/templates/gallery.tmpl @@ -6,14 +6,18 @@ <%block name="content"> ${ui.bar(crumbs)} + %if title: + <h1>${title}</h1> + %endif %if text: <p> ${text} </p> %endif <ul> - % for folder in folders: - <li><a href="${folder}"><i class="icon-folder-open"></i> ${folder}</a></li> + % for folder, ftitle in folders: + <li><a href="${folder}"><i + class="icon-folder-open"></i> ${ftitle}</a></li> % endfor </ul> <ul class="thumbnails"> diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl index 6de79e2..1a280b0 100644 --- a/nikola/data/themes/base/templates/index.tmpl +++ b/nikola/data/themes/base/templates/index.tmpl @@ -4,10 +4,10 @@ <%inherit file="base.tmpl"/> <%block name="content"> % for post in posts: - <div class="postbox h-entry"> + <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> + ${messages("Posted:")} <time class="published dt-published" datetime="${post.date.isoformat()}">${post.formatted_date(date_format)}</time> </small></h1> <hr> %if index_teasers: @@ -21,7 +21,7 @@ % if not post.meta('nocomments'): ${comments.comment_link(post.permalink(), post._base_path)} % endif - </div> + </article> % endfor ${helper.html_pager()} ${comments.comment_link_script()} diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl index a914846..56f5127 100644..100755 --- a/nikola/data/themes/base/templates/index_helper.tmpl +++ b/nikola/data/themes/base/templates/index_helper.tmpl @@ -1,23 +1,25 @@ ## -*- coding: utf-8 -*- <%def name="html_pager()"> -<div> -<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> -</div> + %if prevlink or nextlink: + <div> + <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> + </div> + %endif </%def> <%def name="mathjax_script(posts)"> %if any(post.is_mathjax for post in posts): - <script src="/assets/js/mathjax.js" type="text/javascript"></script> + <script src="/assets/js/mathjax.js"></script> %endif </%def> diff --git a/nikola/data/themes/base/templates/isso_helper.tmpl b/nikola/data/themes/base/templates/isso_helper.tmpl new file mode 100644 index 0000000..8dc95f5 --- /dev/null +++ b/nikola/data/themes/base/templates/isso_helper.tmpl @@ -0,0 +1,20 @@ +## -*- coding: utf-8 -*- +<%def name="comment_form(url, title, identifier)"> + %if comment_system_id: + <div data-title="${title|u}" id="isso-thread"></div> + <script src="${comment_system_id}js/embed.min.js" data-isso="${comment_system_id}"></script> + %endif +</%def> + +<%def name="comment_link(link, identifier)"> + %if comment_system_id: + <a href="${link}#isso-thread">Comments</a> + %endif +</%def> + + +<%def name="comment_link_script()"> + %if comment_system_id: + <script src="${comment_system_id}js/count.min.js" data-isso="${comment_system_id}"></script> + %endif +</%def> diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl index fd6316d..981fd97 100644 --- a/nikola/data/themes/base/templates/post.tmpl +++ b/nikola/data/themes/base/templates/post.tmpl @@ -7,14 +7,15 @@ ${helper.twitter_card_information(post)} % if post.meta('keywords'): <meta name="keywords" content="${post.meta('keywords')|h}"> % endif +${helper.meta_translations(post)} </%block> <%block name="content"> - <div class="postbox"> + <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> + ${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)} | @@ -37,5 +38,5 @@ ${helper.twitter_card_information(post)} ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)} % endif ${helper.mathjax_script(post)} - </div> + </article> </%block> diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl index f6b0535..69784ea 100644..100755 --- a/nikola/data/themes/base/templates/post_helper.tmpl +++ b/nikola/data/themes/base/templates/post_helper.tmpl @@ -12,37 +12,52 @@ %for langname in translations.keys(): %if langname != lang and post.is_translation_available(langname): | - <a href="${post.permalink(langname)}">${messages("Read in English", langname)}</a> + <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: + %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 +</%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: - | ${messages("More posts about")} - <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> + | + ${formatmsg(messages("More posts about %s"), html_list_tags(post))} %endif </%def> <%def name="html_pager(post)"> - <ul class="pager"> - %if post.prev_post: - <li class="previous"> - <a href="${post.prev_post.permalink()}" rel="prev">← ${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> - </li> + %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">← ${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> + </li> + %endif + </ul> %endif - </ul> </%def> <%def name="twitter_card_information(post)"> diff --git a/nikola/data/themes/base/templates/tagindex.tmpl b/nikola/data/themes/base/templates/tagindex.tmpl new file mode 100644 index 0000000..9dda70a --- /dev/null +++ b/nikola/data/themes/base/templates/tagindex.tmpl @@ -0,0 +1,2 @@ +## -*- coding: utf-8 -*- +<%inherit file="index.tmpl"/> diff --git a/nikola/data/themes/bootstrap/assets/css/theme.css b/nikola/data/themes/bootstrap/assets/css/theme.css index 2ff1a80..952073f 100644 --- a/nikola/data/themes/bootstrap/assets/css/theme.css +++ b/nikola/data/themes/bootstrap/assets/css/theme.css @@ -84,4 +84,20 @@ pre, pre code { white-space: pre; word-wrap: normal; overflow: auto; -}
\ No newline at end of file +} + +article.post-micro { + font-family: Georgia, 'Times New Roman', Times, serif; + font-size: 1.5em; +} + +/* fix anchors for headers */ +h1, h2, h3 { + margin-top: -40px; + padding-top: 60px; +} + +h4, h5, h6 { + margin-top: -50px; + padding-top: 60px; +} diff --git a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl index 763ac20..f0d1986 100644 --- a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl +++ b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl @@ -29,6 +29,7 @@ <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif %endif + <link rel="canonical" href="${abs_link(permalink)}"> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> <![endif]--> @@ -79,7 +80,7 @@ <ul class="dropdown-menu"> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": - <li class="active"><a href="${suburl}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${suburl}">${text}</a> %endif @@ -87,7 +88,7 @@ </ul> % else: % if rel_link(permalink, url) == "#": - <li class="active"><a href="${url}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${url}">${text}</a> %endif diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl index 17ae61c..0dd5eea 100644 --- a/nikola/data/themes/bootstrap/templates/gallery.tmpl +++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl @@ -6,14 +6,18 @@ <%block name="content"> ${ui.bar(crumbs)} + %if title: + <h1>${title}</h1> + %endif %if text: <p> ${text} </p> %endif <ul> - % for folder in folders: - <li><a href="${folder}"><i class="icon-folder-open"></i> ${folder}</a></li> + % for folder, ftitle in folders: + <li><a href="${folder}"><i + class="icon-folder-open"></i> ${ftitle}</a></li> % endfor </ul> |