Merge branch 'master' into emoji-sc

getnikola · May 9, 2017 · 20d6e92 · 20d6e92
2 parents af7ff6c + bb6d8f6
commit 20d6e92
Show file tree

Hide file tree

Showing 60 changed files with 119 additions and 5 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -27,7 +27,6 @@
 * `Daniel F. Moisset <https://github.com/dmoisset>`_
 * `Daniel Harding <https://github.com/living180>`_
 * `dastagg <https://github.com/dastagg>`_
-* `dastagg <https://github.com/dastagg>`_
 * `David Barragán Merino <https://github.com/bameda>`_
 * `David Beath <https://github.com/DBeath>`_
 * `Dhruv Baldawa <https://github.com/dhruvbaldawa>`_
@@ -48,6 +47,7 @@
 * `George Leslie-Waksman <https://github.com/gwax>`_
 * `Grzegorz Śliwiński <https://github.com/fizyk>`_
 * `Guillermo O. Freschi <https://github.com/Tordek>`_
+* `h4ckninja <https://github.com/h4ckninja>`_
 * `Hardening <https://github.com/hardening>`_
 * `Hong Xu <https://www.topbug.net>`_
 * `Ivan Teoh <https://github.com/ivanteoh>`_

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,7 +13,10 @@ Math support changes
 Features
 --------
 
+
 * New emoji shortcode
+* Add ``SECTION_PATH`` support to move the section indexes to a
+  user-defined location (Issue #2738)
 * Add a list of template variables to documentation (Issues #2328,
   #2712, #2259) and update the theming reference (Issue #2259)
 * Add ``{post_title}`` tag for Read More links (Issue #2709)

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -243,6 +243,12 @@ POSTS_SECTIONS = True
 # are the default and will apply GENERATE_ATOM if set.
 # POSTS_SECTIONS_ARE_INDEXES = True
 
+# Final locations are:
+# output / TRANSLATION[lang] / SECTION_PATH / SECTION_NAME / index.html (list of posts for a section)
+# output / TRANSLATION[lang] / SECTION_PATH / SECTION_NAME / rss.xml (RSS feed for a section)
+# (translatable)
+# SECTION_PATH = ""
+
 # Each post and section page will have an associated color that can be used
 # to style them with a recognizable color detail across your site. A color
 # is assigned to  each section based on shifting the hue of your THEME_COLOR

diff --git a/nikola/data/themes/base/messages/messages_ar.py b/nikola/data/themes/base/messages/messages_ar.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_az.py b/nikola/data/themes/base/messages/messages_az.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_bg.py b/nikola/data/themes/base/messages/messages_bg.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_bs.py b/nikola/data/themes/base/messages/messages_bs.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_ca.py b/nikola/data/themes/base/messages/messages_ca.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_cs.py b/nikola/data/themes/base/messages/messages_cs.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_da.py b/nikola/data/themes/base/messages/messages_da.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_de.py b/nikola/data/themes/base/messages/messages_de.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_en.py b/nikola/data/themes/base/messages/messages_en.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_eo.py b/nikola/data/themes/base/messages/messages_eo.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_es.py b/nikola/data/themes/base/messages/messages_es.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_et.py b/nikola/data/themes/base/messages/messages_et.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_eu.py b/nikola/data/themes/base/messages/messages_eu.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_fa.py b/nikola/data/themes/base/messages/messages_fa.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_fi.py b/nikola/data/themes/base/messages/messages_fi.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_fil.py b/nikola/data/themes/base/messages/messages_fil.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_fr.py b/nikola/data/themes/base/messages/messages_fr.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_gl.py b/nikola/data/themes/base/messages/messages_gl.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_he.py b/nikola/data/themes/base/messages/messages_he.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_hi.py b/nikola/data/themes/base/messages/messages_hi.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_hr.py b/nikola/data/themes/base/messages/messages_hr.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_hu.py b/nikola/data/themes/base/messages/messages_hu.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_id.py b/nikola/data/themes/base/messages/messages_id.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_it.py b/nikola/data/themes/base/messages/messages_it.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_ja.py b/nikola/data/themes/base/messages/messages_ja.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_ko.py b/nikola/data/themes/base/messages/messages_ko.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_lt.py b/nikola/data/themes/base/messages/messages_lt.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_nb.py b/nikola/data/themes/base/messages/messages_nb.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_nl.py b/nikola/data/themes/base/messages/messages_nl.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_pa.py b/nikola/data/themes/base/messages/messages_pa.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_pl.py b/nikola/data/themes/base/messages/messages_pl.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_pt.py b/nikola/data/themes/base/messages/messages_pt.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_pt_br.py b/nikola/data/themes/base/messages/messages_pt_br.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_ru.py b/nikola/data/themes/base/messages/messages_ru.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_si_lk.py b/nikola/data/themes/base/messages/messages_si_lk.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sk.py b/nikola/data/themes/base/messages/messages_sk.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sl.py b/nikola/data/themes/base/messages/messages_sl.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sq.py b/nikola/data/themes/base/messages/messages_sq.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sr.py b/nikola/data/themes/base/messages/messages_sr.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sr_latin.py b/nikola/data/themes/base/messages/messages_sr_latin.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_sv.py b/nikola/data/themes/base/messages/messages_sv.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_te.py b/nikola/data/themes/base/messages/messages_te.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_tl.py b/nikola/data/themes/base/messages/messages_tl.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_tr.py b/nikola/data/themes/base/messages/messages_tr.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_uk.py b/nikola/data/themes/base/messages/messages_uk.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_ur.py b/nikola/data/themes/base/messages/messages_ur.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_zh_cn.py b/nikola/data/themes/base/messages/messages_zh_cn.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/data/themes/base/messages/messages_zh_tw.py b/nikola/data/themes/base/messages/messages_zh_tw.py
@@ -1,4 +1,6 @@
 # -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit."""
+
 from __future__ import unicode_literals
 
 MESSAGES = {

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -584,6 +584,7 @@ def __init__(self, **config):
             'SOCIAL_BUTTONS_CODE': '',
             'SITE_URL': 'https://example.com/',
             'PAGE_INDEX': False,
+            'SECTION_PATH': '',
             'STRIP_INDEXES': False,
             'SITEMAP_INCLUDE_FILELESS_DIRS': True,
             'TAG_PATH': 'categories',
@@ -673,6 +674,7 @@ def __init__(self, **config):
                                       'TAGS_INDEX_PATH',
                                       'CATEGORY_PATH',
                                       'CATEGORIES_INDEX_PATH',
+                                      'SECTION_PATH',
                                       'INDEX_PATH',
                                       'RSS_PATH',
                                       'AUTHOR_PATH',