Fix some more story.tmpl → page.tmpl leftovers

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Apr 21, 2018 · a84da2d · a84da2d
1 parent 1a29fd1
commit a84da2d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/docs/creating-a-site.rst b/docs/creating-a-site.rst
@@ -52,9 +52,9 @@ configuration file:
     POSTS = ()
     # remove destination directory to generate pages in the root directory
     PAGES = (
-        ("pages/*.rst", "", "story.tmpl"),
-        ("pages/*.txt", "", "story.tmpl"),
-        ("pages/*.html", "", "story.tmpl"),
+        ("pages/*.rst", "", "page.tmpl"),
+        ("pages/*.txt", "", "page.tmpl"),
+        ("pages/*.html", "", "page.tmpl"),
     )
 
     # And to avoid a conflict because blogs try to generate /index.html

diff --git a/docs/manual.rst b/docs/manual.rst
@@ -384,7 +384,7 @@ template
 
     .. code:: restructuredtext
 
-       .. template: story.tmpl
+       .. template: foobar.tmpl
 
 updated
     The last time this post was updated, defaults to the post’s ``date``
@@ -672,8 +672,8 @@ options. The exact mechanism is explained above the config options in the
     # 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 = (
@@ -682,9 +682,9 @@ options. The exact mechanism is explained above the config options in the
         ("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"),
     )
 
 .. admonition:: POSTS and PAGES are not flat!
@@ -1028,7 +1028,7 @@ Pages are the same as posts, except that:
 
 * They are not added to the front page
 * They don't appear on the RSS feed
-* They use the ``story.tmpl`` template instead of ``post.tmpl`` by default
+* They use the ``page.tmpl`` template instead of ``post.tmpl`` by default
 
 The default configuration expects the page's metadata and text files to be on the
 ``pages`` folder, but that can be changed (see ``PAGES`` option above).

diff --git a/docs/template-variables.rst b/docs/template-variables.rst
@@ -135,8 +135,8 @@ Name                Type        Description
 
 __ https://getnikola.com/theming.html#identifying-and-customizing-different-kinds-of-pages-with-a-shared-template
 
-Variables available in post pages (``post.tmpl``, ``story.tmpl`` etc.)
-----------------------------------------------------------------------
+Variables available in post pages (``post.tmpl``, ``page.tmpl`` etc.)
+---------------------------------------------------------------------
 
 .. class:: table table-bordered table-striped
 

diff --git a/docs/theming.rst b/docs/theming.rst
@@ -284,7 +284,7 @@ These are the templates that come with the included themes:
     Used to display section indexes, if ``POST_SECTIONS_ARE_INDEXES`` is True.
     By default, it just inherits ``index.tmpl``, with added feeds.
 
-``story.tmpl``
+``page.tmpl``
     Used for pages that are not part of a blog, usually a cleaner, less
     intrusive layout than ``post.tmpl``, but same parameters.
 

diff --git a/nikola/plugins/command/import_wordpress.py b/nikola/plugins/command/import_wordpress.py
@@ -479,7 +479,7 @@ def populate_context(self, channel):
         PAGES = '(\n'
         for extension in extensions:
             POSTS += '    ("posts/*.{0}", "posts", "post.tmpl"),\n'.format(extension)
-            PAGES += '    ("pages/*.{0}", "pages", "story.tmpl"),\n'.format(extension)
+            PAGES += '    ("pages/*.{0}", "pages", "page.tmpl"),\n'.format(extension)
         POSTS += ')\n'
         PAGES += ')\n'
         context['POSTS'] = POSTS

diff --git a/nikola/plugins/task/galleries.py b/nikola/plugins/task/galleries.py
@@ -480,7 +480,7 @@ def parse_index(self, gallery, input_folder, output_folder):
                 destination,
                 False,
                 self.site.MESSAGES,
-                'story.tmpl',
+                'page.tmpl',
                 self.site.get_compiler(index_path),
                 None,
                 self.site.metadata_extractors_by

diff --git a/tests/data/translated_titles/conf.py b/tests/data/translated_titles/conf.py
@@ -140,8 +140,8 @@
     ("posts/*.txt", "posts", "post.tmpl"),
 )
 PAGES = (
-    ("pages/*.rst", "pages", "story.tmpl"),
-    ("pages/*.txt", "pages", "story.tmpl"),
+    ("pages/*.rst", "pages", "page.tmpl"),
+    ("pages/*.txt", "pages", "page.tmpl"),
 )
 
 # One or more folders containing files to be copied as-is into the output.