Update upstream source from tag 'upstream/8.1.2'

Update to upstream version '8.1.2'
with Debian dir e5e966a9e6010ef70618dc9a61558fa4db35aceb

1 files changed, 14 insertions, 14 deletions

diff --git a/nikola/data/themes/base/templates/comments_helper.tmpl b/nikola/data/themes/base/templates/comments_helper.tmpl
index 1459888..002499e 100644
--- a/nikola/data/themes/base/templates/comments_helper.tmpl
+++ b/nikola/data/themes/base/templates/comments_helper.tmpl
@@ -1,63 +1,63 @@
 ## -*- coding: utf-8 -*-
 
 <%namespace name="disqus" file="comments_helper_disqus.tmpl"/>
-<%namespace name="livefyre" file="comments_helper_livefyre.tmpl"/>
 <%namespace name="intensedebate" file="comments_helper_intensedebate.tmpl"/>
 <%namespace name="muut" file="comments_helper_muut.tmpl"/>
-<%namespace name="googleplus" file="comments_helper_googleplus.tmpl"/>
 <%namespace name="facebook" file="comments_helper_facebook.tmpl"/>
 <%namespace name="isso" file="comments_helper_isso.tmpl"/>
+<%namespace name="commento" file="comments_helper_commento.tmpl"/>
+<%namespace name="utterances" file="comments_helper_utterances.tmpl"/>
 
 <%def name="comment_form(url, title, identifier)">
     %if comment_system == 'disqus':
         ${disqus.comment_form(url, title, identifier)}
-    % elif comment_system == 'livefyre':
-        ${livefyre.comment_form(url, title, identifier)}
     % elif comment_system == 'intensedebate':
         ${intensedebate.comment_form(url, title, identifier)}
     % elif comment_system == 'muut':
         ${muut.comment_form(url, title, identifier)}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_form(url, title, identifier)}
     % elif comment_system == 'facebook':
         ${facebook.comment_form(url, title, identifier)}
     % elif comment_system == 'isso':
         ${isso.comment_form(url, title, identifier)}
+    % elif comment_system == 'commento':
+        ${commento.comment_form(url, title, identifier)}
+    % elif comment_system == 'utterances':
+        ${utterances.comment_form(url, title, identifier)}
     %endif
 </%def>
 
 <%def name="comment_link(link, identifier)">
     %if comment_system == 'disqus':
         ${disqus.comment_link(link, identifier)}
-    % elif comment_system == 'livefyre':
-        ${livefyre.comment_link(link, identifier)}
     % elif comment_system == 'intensedebate':
         ${intensedebate.comment_link(link, identifier)}
     % elif comment_system == 'muut':
         ${muut.comment_link(link, identifier)}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_link(link, identifier)}
     % elif comment_system == 'facebook':
         ${facebook.comment_link(link, identifier)}
     % elif comment_system == 'isso':
         ${isso.comment_link(link, identifier)}
+    % elif comment_system == 'commento':
+        ${commento.comment_link(link, identifier)}
+    % elif comment_system == 'utterances':
+        ${utterances.comment_link(link, identifier)}
     %endif
 </%def>
 
 <%def name="comment_link_script()">
     %if comment_system == 'disqus':
         ${disqus.comment_link_script()}
-    % elif comment_system == 'livefyre':
-        ${livefyre.comment_link_script()}
     % elif comment_system == 'intensedebate':
         ${intensedebate.comment_link_script()}
     % elif comment_system == 'muut':
         ${muut.comment_link_script()}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_link_script()}
     % elif comment_system == 'facebook':
         ${facebook.comment_link_script()}
     % elif comment_system == 'isso':
         ${isso.comment_link_script()}
+    % elif comment_system == 'commento':
+        ${commento.comment_link_script()}
+    % elif comment_system == 'utterances':
+        ${utterances.comment_link_script()}
     %endif
 </%def>