Merge branch 'adsense'

templates/adsense-banner.html

@@ -0,0 +1,12 @@
+
+{% if ADSENSE_AD_CLIENT and ADSENSE_AD_SLOT %}
+  <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+  <ins class="adsbygoogle"
+       style="display:block"
+       data-ad-client="{{ ADSENSE_AD_CLIENT }}"
+       data-ad-slot="{{ ADSENSE_AD_SLOT }}"
+       data-ad-format="auto"></ins>
+  <script>
+  (adsbygoogle = window.adsbygoogle || []).push({});
+  </script>
+{% endif %}

templates/article.html

@@ -12,6 +12,10 @@
 {% block content %}
 <article class="single">
   <header>
+
+    {% if SHOW_ADSENSE_ARTICLE_TOP %}
+      {% include "adsense-banner.html" %}
+    {% endif %}
     <h1 id="{{ article.slug }}">{{ article.title }}</h1>
     <p>
       {{ _('Posted on %(when)s in %(category)s',
@@ -26,6 +30,11 @@
   <div>
     {{ article.content }}
   </div>
+
+  {% if SHOW_ADSENSE_ARTICLE_BOTTOM %}
+    {% include "adsense-banner.html" %}
+  {% endif %}
+
   <div class="tag-cloud">
     <p>
       {% if article.tags %}