add logo variable in settings

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index e8ccb6d02f1be10b94c93a79334a080c6f1c73fd..8abc00c8fdfcc2aec60b1b3e8b1f6dbc89032770 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -52,7 +52,7 @@
 <div id="header">
 <div id="logo">
 {% block logo %}
-<a href="{% url "telemeta-home" %}"><img src="{{ STATIC_URL }}telemeta/images/logo_telemeta_2.png" alt="Telemeta" /></a>
+<a href="{% url "telemeta-home" %}"><img src="{% logo_url %}" alt="Telemeta" /></a>
 {% endblock %}
 </div>
 

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 0e4deeff4ee982b70002cbe369cc66b56d5816a8..564793f7a78d4996d8bedabc88da34b5a5c191e0 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -454,7 +454,12 @@ class IfLoadedNode(template.Node):
 def has_access(user, item):
     return get_item_access(item, user)
 
-
 @register.filter
 def get_attr(obj, val):
-    return getattr(obj, val)
\ No newline at end of file
+    return getattr(obj, val)
+
+@register.simple_tag
+def logo_url():
+    static_url = getattr(settings, 'STATIC_URL', '/static/')
+    return getattr(settings, 'TELEMETA_LOGO', static_url + '/telemeta/images/logo_telemeta_2.png')
+