Skip to content
Permalink
Browse files
Fix #1891
  • Loading branch information
ralsina committed May 17, 2017
1 parent 4685933 commit 1a5980c59beaeddfe081684f234e0287e6a55857
Showing with 8 additions and 5 deletions.
  1. +2 −0 CHANGES.txt
  2. +2 −2 nikola/conf.py.in
  3. +1 −0 nikola/data/themes/base/templates/page.tmpl
  4. +3 −3 nikola/plugins/command/init.py
@@ -12,6 +12,8 @@ Bugfixes
--------

* Ignore files ending wih "bak" (Issue #2740)
* Use page.tmpl by default, which is inherited from story.tmpl (Issue
#1891)

New in v7.8.5
=============
@@ -123,8 +123,8 @@ THEME_COLOR = '#5670d4'
# Finally, note that destination can be translated, i.e. you can
# specify a different translation folder per language. Example:
# PAGES = (
# ("pages/*.rst", {"en": "pages", "de": "seiten"}, "story.tmpl"),
# ("pages/*.md", {"en": "pages", "de": "seiten"}, "story.tmpl"),
# ("pages/*.rst", {"en": "pages", "de": "seiten"}, "page.tmpl"),
# ("pages/*.md", {"en": "pages", "de": "seiten"}, "page.tmpl"),
# )

POSTS = ${POSTS}
@@ -0,0 +1 @@
<%inherit file="story.tmpl"/>
@@ -78,9 +78,9 @@
("posts/*.html", "posts", "post.tmpl"),
)""",
'PAGES': """(
("pages/*.rst", "pages", "story.tmpl"),
("pages/*.txt", "pages", "story.tmpl"),
("pages/*.html", "pages", "story.tmpl"),
("pages/*.rst", "pages", "page.tmpl"),
("pages/*.txt", "pages", "page.tmpl"),
("pages/*.html", "pages", "page.tmpl"),
)""",
'COMPILERS': """{
"rest": ('.rst', '.txt'),

0 comments on commit 1a5980c

Please sign in to comment.