getnikola · May 22, 2017 · May 22, 2017
Showing with 32 additions and 5 deletions.

+17 −2 .gitignore

+12 −1 docs/template-variables.rst

+1 −1 nikola/plugins/task/archive.py

+2 −1 nikola/plugins/task/sections.py
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,10 @@ output/
 # 
 .DS_Store
 
-# Created by https://www.gitignore.io/api/pydev,python,pycharm
+# All of .idea should be ignored
+.idea/
+
+# Created by https://www.gitignore.io/api/pydev,python,pycharm,vim
 
 ### PyCharm ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
@@ -179,4 +182,16 @@ ENV/
 # mkdocs documentation
 /site
 
-# End of https://www.gitignore.io/api/pydev,python,pycharm
+### Vim ###
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+
+# End of https://www.gitignore.io/api/pydev,python,pycharm,vim
diff --git a/docs/template-variables.rst b/docs/template-variables.rst
@@ -301,7 +301,7 @@ The archive navigation variables are available only if ``create_archive_navigati
 ==============================  ==============  ===============================================
 Name                            Type            Description
 ==============================  ==============  ===============================================
-``archive_name``                str?            Name of the archive (only if using indexes)
+``archive_name``                str?            Name of the archive
 ``create_archive_navigation``   bool            ``CREATE_ARCHIVE_NAVIGATION`` setting
 ``has_archive_navigation``      bool            Whether or not archive navigation is available
 ``up_archive``                  str?            Link to the archive one level up
@@ -377,6 +377,17 @@ Name                Type        Description
 ``source_link``     str         Link to the source file
 ==================  ==========  ========================================
 
+Variables available in sections
+-------------------------------
+
+.. class:: table table-bordered table-striped
+
+===========  =====  ========================
+Name         Type   Description
+===========  =====  ========================
+``section``  str    Section name (internal)
+===========  =====  ========================
+
 Variables available in tag pages
 --------------------------------
 

diff --git a/nikola/plugins/task/archive.py b/nikola/plugins/task/archive.py
@@ -180,6 +180,7 @@ def provide_context_and_uptodate(self, classification, lang, node=None):
             "title": title,
             "pagekind": [page_kind, "archive_page"],
             "create_archive_navigation": self.site.config["CREATE_ARCHIVE_NAVIGATION"],
+            "archive_name": classification if classification else None
         }
 
         # Generate links for hierarchies
@@ -210,7 +211,6 @@ def provide_context_and_uptodate(self, classification, lang, node=None):
         else:
             context["has_archive_navigation"] = False
         if page_kind == 'index':
-            context["archive_name"] = classification if classification else None
             context["is_feed_stale"] = kw["is_feed_stale"]
         kw.update(context)
         return context, kw

diff --git a/nikola/plugins/task/sections.py b/nikola/plugins/task/sections.py
@@ -122,7 +122,8 @@ def provide_context_and_uptodate(self, section, lang, node=None):
         context = {
             "title": section_title,
             "description": self.site.config['POSTS_SECTION_DESCRIPTIONS'](lang)[section] if section in self.site.config['POSTS_SECTION_DESCRIPTIONS'](lang) else "",
-            "pagekind": ["section_page", "index" if self.show_list_as_index else "list"]
+            "pagekind": ["section_page", "index" if self.show_list_as_index else "list"],
+            "section": section,
         }
         kw.update(context)
         return context, kw