Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 15 insertions, 0 deletions

diff --git a/zurb-F5-basic/templates/disqus_script.html b/zurb-F5-basic/templates/disqus_script.html
new file mode 100644
index 0000000..f19d527
--- /dev/null
+++ b/zurb-F5-basic/templates/disqus_script.html
@@ -0,0 +1,15 @@
+{% if DISQUS_SITENAME %}
+    <div id="disqus_thread"></div>
+    <script type="text/javascript">
+        var disqus_shortname = '{{ DISQUS_SITENAME }}'
+        var disqus_identifier = "{{ article.url }}";
+        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
+
+        (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+{% endif %}