Merge branch 'develop' of http://git.general-servers.com/expomap/expomap into develop

expobanner/managers.py

@@ -24,7 +24,12 @@ class BiasedManager(models.Manager):
         return result
 
     def create_for_paid(self, expo, url, role):
-        alt = u'%s_%s'%(expo.name, role)
+        try:
+            name = str(expo.name)
+        except UnicodeEncodeError, UnicodeDecodeError:
+            name = expo.url
+
+        alt = u'%s_%s'%(name, role)
         return self.create(alt=alt, url=url, paid=True)
 
 class BannerGroupCached(models.Manager):

templates/client/includes/banners/expo_detail.html

@@ -1,12 +1,6 @@
 {% load static %}
 {% load template_filters %}
 
-<div class="abn">
+<div class="abn" id="expo_b_detail_inner_2">
-{% if object.theme.all.0.id in banner_themes  %}
+
-    <a target="_blank" href="/redirect/redirect/24/"><img src="{% static 'client/img/partners/unnamed_2.gif' %}" alt="" /></a>
-    {% else %}
-        {% if object.theme.all.1.id in banner_themes  %}
-            <a target="_blank" href="/redirect/redirect/24/"><img src="{% static 'client/img/partners/unnamed_2.gif' %}" alt="" /></a>
-        {% endif %}
-{% endif %}
 </div>