From 1a628f381706475bfa5e28b442746f22cb12c7b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Fri, 17 Aug 2012 11:07:04 +0200
Subject: [PATCH] add Google AdSense support

---
 mygpo/settings.py                           |  8 +++++++-
 mygpo/web/{googleanalytics.py => google.py} | 16 ++++++++++++++-
 mygpo/web/templates/base.html               | 31 ++++++++++++++++++++++++-----
 mygpo/web/templates/episode.html            |  4 ++++
 mygpo/web/templates/podcast.html            |  4 ++++
 5 files changed, 56 insertions(+), 7 deletions(-)
 rename mygpo/web/{googleanalytics.py => google.py} (73%)

diff --git a/mygpo/settings.py b/mygpo/settings.py
index 786acae2..9b27cfc9 100644
--- a/mygpo/settings.py
+++ b/mygpo/settings.py
@@ -139,7 +139,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     "django.contrib.messages.context_processors.messages",
-    "mygpo.web.googleanalytics.processor",
+    "mygpo.web.google.analytics",
+    "mygpo.web.google.adsense",
 )
 
 MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
@@ -168,6 +169,11 @@ EMAIL_BACKEND = 'django_couchdb_utils.email.backends.CouchDBEmailBackend'
 # minimum number of subscribers a podcast must have to be assigned a slug
 PODCAST_SLUG_SUBSCRIBER_LIMIT = 10
 
+
+ADSENSE_CLIENT = ''
+ADSENSE_SLOT_BOTTOM = ''
+
+
 try:
     from settings_prod import *
 except ImportError, e:
diff --git a/mygpo/web/googleanalytics.py b/mygpo/web/google.py
similarity index 73%
rename from mygpo/web/googleanalytics.py
rename to mygpo/web/google.py
index 7b141227..b155b11d 100644
--- a/mygpo/web/googleanalytics.py
+++ b/mygpo/web/google.py
@@ -17,10 +17,24 @@
 
 from django.conf import settings
 
-def processor(request):
+def analytics(request):
     pid = settings.GOOGLE_ANALYTICS_PROPERTY_ID
     if pid:
         return {'google_analytics_property_id': pid}
     else:
         return {}
 
+
+def adsense(request):
+    adclient = settings.ADSENSE_CLIENT
+    if not adclient:
+        return {}
+
+    slot_bottom = settings.ADSENSE_SLOT_BOTTOM
+    if not slot_bottom:
+        return {}
+
+    return {
+        'adsense_client': adclient,
+        'adsense_slot_bottom': slot_bottom,
+    }
diff --git a/mygpo/web/templates/base.html b/mygpo/web/templates/base.html
index 033ee1f9..d125b4e6 100644
--- a/mygpo/web/templates/base.html
+++ b/mygpo/web/templates/base.html
@@ -57,7 +57,6 @@
       {% block mainmenu %}
         {{ "/"|main_menu }}
       {% endblock %}
-    </ul>
 
     {% block sectionmenu %}
       <ul class="menu secondary">
@@ -84,18 +83,40 @@
      <li><a href="{% url toplist %}">Toplist</a></li>
     </ul>
    {% endblock %}
-   </div>
 
-   </div>
-  </div>
+
+ {% block ads %}
+  {% if adsense_client %}
+   <hr />
+
+   <script type="text/javascript"><!--
+    google_ad_client = "{{ adsense_client }}";
+    /* "Bottom" slot */
+    google_ad_slot = "{{ adsense_slot_bottom }}";
+    google_ad_width = 728;
+    google_ad_height = 90;
+    //-->
+   </script>
+   <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+   </script>
+  {% endif %}
+ {% endblock %}
+
+ </div> <!-- content-area -->
+   </div> <!-- main -->
+
 
   <div id="footer">
    <address style="font-variant: small-caps;">
        Copyright &copy; 2009-2012 gpodder.net -
        <a href="{% url privacy-policy %}">{% trans "Privacy Policy" %}</a>
    </address>
-  </div>
 
+  </div> <!-- footer -->
+
+
+  </div> <!-- wrap -->
 
 <!-- getsatisfaction.com feedback tab -->
 <script type="text/javascript">
diff --git a/mygpo/web/templates/episode.html b/mygpo/web/templates/episode.html
index b8f34378..4d591b98 100644
--- a/mygpo/web/templates/episode.html
+++ b/mygpo/web/templates/episode.html
@@ -265,3 +265,7 @@
  </script>
 {% endblock javascript %}
 
+
+{% block ads %}
+ {% comment %}disable ads on episode pages{% endcomment %}
+{% endblock %}
diff --git a/mygpo/web/templates/podcast.html b/mygpo/web/templates/podcast.html
index 2af9520f..50a0c095 100755
--- a/mygpo/web/templates/podcast.html
+++ b/mygpo/web/templates/podcast.html
@@ -203,3 +203,7 @@
 
 {% endblock %}
 
+
+{% block ads %}
+ {% comment %}disable ads on podcast pages{% endcomment %}
+{% endblock %}
-- 
2.11.4.GIT