add a contextual button to top links

diff --git a/panikdb/customtags/templatetags/panikdbtags.py b/panikdb/customtags/templatetags/panikdbtags.py
index 3f478512263014d38ad79f24a777b45e1bdc8358..92b325f6f4b50a19de81360ee5cdc8c167ebc7bd 100644 (file)
--- a/panikdb/customtags/templatetags/panikdbtags.py
+++ b/panikdb/customtags/templatetags/panikdbtags.py
@@ -1,5 +1,6 @@
 from django.template import Library
 from django.conf import settings
+from django.core.urlresolvers import reverse
 
 from emissions.models import Emission, Episode, NewsItem
 
@@ -14,3 +15,21 @@ def online_url(object):
     if isinstance(object, Episode):
         return settings.WEBSITE_BASE_URL + 'emissions/' + object.emission.slug + '/' + object.slug
     return 'XXX'
+
+
+@register.filter
+def context_url(object):
+    if isinstance(object, NewsItem) and object.emission:
+        return reverse('emission-view', kwargs={'slug': object.emission.slug})
+    if isinstance(object, Episode):
+        return reverse('emission-view', kwargs={'slug': object.emission.slug})
+    return None
+
+
+@register.filter
+def context_title(object):
+    if isinstance(object, NewsItem) and object.emission:
+        return object.emission.title
+    if isinstance(object, Episode):
+        return object.emission.title
+    return None

diff --git a/panikdb/static/css/style.css b/panikdb/static/css/style.css
index 772b1af35e0809396eadf5a9c9a3473a9f636b51..3a260399c9d7dfedebd53c0859661133605f4d72 100644 (file)
--- a/panikdb/static/css/style.css
+++ b/panikdb/static/css/style.css
@@ -471,9 +471,13 @@ span.add-on {
         background: #aaa;
 }
 
+#user-links span.middle {
+        padding-left: 15px;
+}
+
 #user-links span.right {
         position: absolute;
-        right: 15px;
+        right: 20px;
 }
 
 

diff --git a/panikdb/templates/base.html b/panikdb/templates/base.html
index 7bb56822aa8060166a65373f34a860015afcdc19..3a775787a07ea72cdf7e6507f831dff8fc4b11b7 100644 (file)
--- a/panikdb/templates/base.html
+++ b/panikdb/templates/base.html
@@ -49,6 +49,16 @@
             {% endif %}
             {% endblock %}
 
+            {% if object %}
+            {% with object|context_url as context_url %}
+            {% if context_url %}
+            <span class="middle">
+                    <a href="{{ object|context_url }} ">{{ object|context_title }}</a>
+            </span>
+            {% endif %}
+            {% endwith %}
+            {% endif %}
+
             <span class="right">
             <a href="{% url 'auth_password_change' %}">Changement de mot de passe</a>
             <a href="{% url 'logout' %}">Déconnexion</a>