Hide comments and links to them if site has no comments

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
getnikola · Mar 23, 2014 · bbd2818 · bbd2818
1 parent dcb7845
commit bbd2818
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl
@@ -30,7 +30,7 @@
         %endfor
     </ul>
     %endif
-%if enable_comments:
+%if site_has_comments and enable_comments:
     ${comments.comment_form(None, permalink, title)}
 %endif
 </%block>
diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
@@ -12,7 +12,7 @@
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
             <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p>
-            % if not post.meta('nocomments'):
+            % if not post.meta('nocomments') and site_has_comments:
                 <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
             % endif
         </div>

diff --git a/nikola/data/themes/base/templates/post.tmpl b/nikola/data/themes/base/templates/post.tmpl
@@ -27,7 +27,7 @@
     ${helper.html_pager(post)}
     </nav>
     </aside>
-    % if not post.meta('nocomments'):
+    % if not post.meta('nocomments') and site_has_comments:
         <section class="comments">
         <h2>${messages("Comments")}</h2>
         ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)}

diff --git a/nikola/data/themes/base/templates/post_header.tmpl b/nikola/data/themes/base/templates/post_header.tmpl
@@ -31,7 +31,7 @@
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
             <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p>
-            % if not post.meta('nocomments'):
+            % if not post.meta('nocomments') and site_has_comments:
                 <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
             % endif
             ${html_sourcelink()}

diff --git a/nikola/data/themes/base/templates/story.tmpl b/nikola/data/themes/base/templates/story.tmpl
@@ -21,7 +21,7 @@
     <div itemprop="articleBody text">
     ${post.text()}
     </div>
-%if enable_comments and not post.meta('nocomments'):
+%if site_has_comments and enable_comments and not post.meta('nocomments'):
     <section class="comments">
     <h2>${messages("Comments")}</h2>
     ${comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path)}

diff --git a/nikola/data/themes/bootstrap3/templates/gallery.tmpl b/nikola/data/themes/bootstrap3/templates/gallery.tmpl
@@ -34,7 +34,7 @@
 </ul>
 </noscript>
 %endif
-%if enable_comments:
+%if site_has_comments and enable_comments:
 ${comments.comment_form(None, permalink, title)}
 %endif
 </%block>

diff --git a/nikola/data/themes/bootstrap3/templates/post.tmpl b/nikola/data/themes/bootstrap3/templates/post.tmpl
@@ -27,7 +27,7 @@
     ${helper.html_pager(post)}
     </nav>
     </aside>
-    % if not post.meta('nocomments'):
+    % if not post.meta('nocomments') and site_has_comments:
         <section class="comments">
         <h2>${messages("Comments")}</h2>
         ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)}

diff --git a/nikola/data/themes/bootstrap3/templates/post_header.tmpl b/nikola/data/themes/bootstrap3/templates/post_header.tmpl
@@ -25,7 +25,7 @@
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
             <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p>
-            % if not post.meta('nocomments'):
+            % if not post.meta('nocomments') and site_has_comments:
                 <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
             % endif
             % if post.meta('link'):

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -520,6 +520,7 @@ def __init__(self, **config):
         self._GLOBAL_CONTEXT['search_form'] = self.config.get('SEARCH_FORM')
         self._GLOBAL_CONTEXT['comment_system'] = self.config.get('COMMENT_SYSTEM')
         self._GLOBAL_CONTEXT['comment_system_id'] = self.config.get('COMMENT_SYSTEM_ID')
+        self._GLOBAL_CONTEXT['site_has_comments'] = bool(self.config.get('COMMENT_SYSTEM'))
         self._GLOBAL_CONTEXT['mathjax_config'] = self.config.get(
             'MATHJAX_CONFIG')
         self._GLOBAL_CONTEXT['subtheme'] = self.config.get('THEME_REVEAL_CONFIG_SUBTHEME')