Add option to show no banner at all.

diff --git a/www/templates/modules/sidebar-banner.html b/www/templates/modules/sidebar-banner.html
index 7a10b3b7afd3ab2ed8df6b2fff2d8ce8d7bb2b1f..fb891fcae25e7d404be4ebfaed73d9690f037ec8 100644 (file)
--- a/www/templates/modules/sidebar-banner.html
+++ b/www/templates/modules/sidebar-banner.html
@@ -1,5 +1,7 @@
-<h4>{{ item.title }}</h4>
+{% if item %}
+       <h4>{{ item.title }}</h4>
 
-<a href="{{ item.link }}" {% if item.link.startswith("http://") %}target="_blank" {% end %}>
-       <img src="{{ static_url(item.uri) }}" border="0" alt="{{ _("Banner") }}" />
-</a>
+       <a href="{{ item.link }}" {% if item.link.startswith("http://") %}target="_blank" {% end %}>
+               <img src="{{ static_url(item.uri) }}" border="0" alt="{{ _("Banner") }}" />
+       </a>
+{% end %}

diff --git a/www/webapp/banners.py b/www/webapp/banners.py
index ba21ab99de59bbcb9587b78887fc6cfaa786ba27..65aeac8d361849d131528e15f35e233090ac55fb 100644 (file)
--- a/www/webapp/banners.py
+++ b/www/webapp/banners.py
@@ -20,7 +20,8 @@ class Banners(object):
                        self.items.append(Item(**_stringify(item)))
 
        def get(self):
-               return random.choice(self.items)
+               if self.items:
+                       return random.choice(self.items)
 
 
 banners = Banners("banners.json")