From b634829548b7159412b3ef03c9f73265d9c655ed Mon Sep 17 00:00:00 2001
From: gustavofoa <gustavo.foa@gmail.com>
Date: Sat, 17 Sep 2016 10:10:20 -0300
Subject: [PATCH] Adsense Banners

---
 templates/adsense-banner.html | 12 ------------
 templates/article.html        | 15 ++++++++++-----
 templates/base.html           | 26 ++++++++++++++++++++++++++
 templates/index.html          | 12 ++++++++++++
 4 files changed, 48 insertions(+), 17 deletions(-)
 delete mode 100644 templates/adsense-banner.html

diff --git a/templates/adsense-banner.html b/templates/adsense-banner.html
deleted file mode 100644
index 8e47f64..0000000
--- a/templates/adsense-banner.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-{% 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 %}
diff --git a/templates/article.html b/templates/article.html
index 6c7d474..d9c172a 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -13,9 +13,6 @@
 <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',
@@ -31,8 +28,16 @@
     {{ article.content }}
   </div>
 
-  {% if SHOW_ADSENSE_ARTICLE_BOTTOM %}
-    {% include "adsense-banner.html" %}
+  {% if ADSENSE.adClientId and ADSENSE.adSlot.articleBottom %}
+    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <ins class="adsbygoogle"
+         style="display:block"
+         data-ad-client="{{ ADSENSE.adClientId }}"
+         data-ad-slot="{{ ADSENSE.adSlot.articleBottom }}"
+         data-ad-format="auto"></ins>
+    <script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
   {% endif %}
 
   <div class="tag-cloud">
diff --git a/templates/base.html b/templates/base.html
index 214ba04..83bed54 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -97,8 +97,34 @@
         {% endfor %}
       </ul>
     </div>
+
+    {% if ADSENSE.adClientId and ADSENSE.adSlot.aside %}
+      <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+      <ins class="adsbygoogle"
+           style="display:block"
+           data-ad-client="{{ ADSENSE.adClientId }}"
+           data-ad-slot="{{ ADSENSE.adSlot.aside }}"
+           data-ad-format="auto"></ins>
+      <script>
+      (adsbygoogle = window.adsbygoogle || []).push({});
+      </script>
+    {% endif %}
+
   </aside>
   <main>
+
+    {% if ADSENSE.adClientId and ADSENSE.adSlot.top %}
+      <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+      <ins class="adsbygoogle"
+           style="display:block"
+           data-ad-client="{{ ADSENSE.adClientId }}"
+           data-ad-slot="{{ ADSENSE.adSlot.top }}"
+           data-ad-format="auto"></ins>
+      <script>
+      (adsbygoogle = window.adsbygoogle || []).push({});
+      </script>
+    {% endif %}
+
     {% if MAIN_MENU %}
     <nav>
       <a href="{{ SITEURL }}">{{ _('Home') }}</a>
diff --git a/templates/index.html b/templates/index.html
index 79b1ce0..deb8ac7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -37,5 +37,17 @@
 </article>
 {% endfor %}
 
+{% if ADSENSE.adClientId and ADSENSE.adSlot.homeBottom %}
+  <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+  <ins class="adsbygoogle"
+       style="display:block"
+       data-ad-client="{{ ADSENSE.adClientId }}"
+       data-ad-slot="{{ ADSENSE.adSlot.homeBottom }}"
+       data-ad-format="auto"></ins>
+  <script>
+  (adsbygoogle = window.adsbygoogle || []).push({});
+  </script>
+{% endif %}
+
 {% include "partial/pagination.html" %}
 {% endblock %}