Small fixes

diff --git a/panikweb/views.py b/panikweb/views.py
index c2b6811513c62cdaa6a607631954344cabadfd81..d77fc519eef60547f2139d98e936185bf8987940 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -160,7 +160,7 @@ class Home(TemplateView):
     def get_context_data(self, **kwargs):
         context = super(Home, self).get_context_data(**kwargs)
         context['news'] = NewsItem.objects.all().exclude(image__isnull=True).exclude(image__exact='').order_by('-datetime')[:5]
-        context['emissions'] = Emission.objects.filter(archived=False).order_by('?')
+        context['emissions'] = Emission.objects.filter(archived=False).order_by('title')
        context['player'] = audioPlayer()
         return context
 

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index e035b1095dc2560f2e0899a76e71ac558e3dc0a7..aa041d8cc0cac1ca48a97575439032dd9b74fdcd 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
-
+{% block bodyID %}Emissions{% endblock %}
+{% block listen %}{% endblock %}
 {% block main %}
        <div id="Emission" class="wrapper futurtabs">
 <!--

diff --git a/panikweb_templates/templates/emissions/inline.html b/panikweb_templates/templates/emissions/inline.html
index 1a977f1f5e08e15b316b4198026e60bcf712e151..d9da6ea09b5543dc6424c121fd4e320c2af5fc0d 100644 (file)
--- a/panikweb_templates/templates/emissions/inline.html
+++ b/panikweb_templates/templates/emissions/inline.html
@@ -13,7 +13,7 @@
                        <button class="control symbol add">B</button>
                </div>
                {% endif %}
-               <a class="link" href="#">
+               <a class="link" href="{% url 'emission-view' slug=emission.slug %}">
                
                        <h5 class="title ellipsis">{{ emission.title }}</h5>
                        {% if emission.description %}

diff --git a/panikweb_templates/templates/home.html b/panikweb_templates/templates/home.html
index fd6c8f3b9ff8d19ca28799e440c0677ec67fdf0f..0550902a979fb0be3970529f753d627af484711c 100644 (file)
--- a/panikweb_templates/templates/home.html
+++ b/panikweb_templates/templates/home.html
@@ -31,7 +31,9 @@
 <div class="wrapper">
        <ul class="custom list columns">
        {% for emission in emissions %}
-               <li class="item">{% include "emissions/inline.html" %} </li>
+               <li class="item">
+                       <a href="{% url 'emission-view' slug=emission.slug %}">{{ emission.title }}</a>
+               </li>
        {% endfor %}
        </ul>
 </div>