Merge branch 'new-homepage' into stable

8 files changed, 16 insertions, 16 deletions

diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html
index a4e1bde..e91c020 100644
--- a/program/templates/v2/day_schedule.html
+++ b/program/templates/v2/day_schedule.html
@@ -58,7 +58,7 @@
                 </div>
                 <div class="show-detail">
                     <h3 class="show-title"><a
-                            href="{% url "timeslot-detail-v2" timeslot.id %}">{{ timeslot.show.name }}</a></h3>
+                            href="/program/{{ timeslot.id }}">{{ timeslot.show.name }}</a></h3>
                     {% if timeslot.note %}
                         <p class="note-title"><strong>Heute:</strong> {{ timeslot.note.title }}</p>
                     {% else %}
diff --git a/program/templates/v2/host_detail.html b/program/templates/v2/host_detail.html
index 1f2782c..a224635 100644
--- a/program/templates/v2/host_detail.html
+++ b/program/templates/v2/host_detail.html
@@ -10,7 +10,7 @@
     <div id="shows">
         <div id="shows-title">Sendungen</div>
         {% for show in host.active_shows %}
-            <div class="show {{ show.broadcastformat.slug }}"><a href="{% url "show-detail-v2" show.slug %}"> {{ show.name }}</a></div>
+            <div class="show {{ show.broadcastformat.slug }}"><a href="/program/shows/{{ show.slug }}"> {{ show.name }}</a></div>
         {% endfor %}
     </div>
 
diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html
index 8353b71..27b2895 100644
--- a/program/templates/v2/host_list.html
+++ b/program/templates/v2/host_list.html
@@ -9,7 +9,7 @@
     <div class="host-list">
         {% for host in host_list %}
             <div class="host">
-                <a href="{% url "host-detail-v2" host.id %}">{{ host.name }}</a>
+                <a href="/program/hosts/{{ host.id }}">{{ host.name }}</a>
             </div>
         {% endfor %}
     </div>
diff --git a/program/templates/v2/recommendation_list.html b/program/templates/v2/recommendation_list.html
index 3b6f66d..5b47a6e 100644
--- a/program/templates/v2/recommendation_list.html
+++ b/program/templates/v2/recommendation_list.html
@@ -25,16 +25,16 @@
                 </div>
                 <div class="show-detail">
                     <h4>
-                        <a href="{% url "show-detail-v2" recommendation.show.slug %}">{{ recommendation.show.name }}</a><br/>
+                        <a href="/program/shows/{{ recommendation.show.slug }}">{{ recommendation.show.name }}</a><br/>
                         vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }}</h4>
                     {% if recommendation.note %}
                         <h3 class="show-title">
-                          <a href="{% url "timeslot-detail-v2" recommendation.id %}">{{ recommendation.note.title }}</a>
+                          <a href="/program/{{ recommendation.id }}">{{ recommendation.note.title }}</a>
                         </h3>
                         <div class="note-content">{{ recommendation.note.content|safe }}</div>
                     {% else %}
                         <h3 class="show-title"><a
-                                href="{% url "timeslot-detail-v2" recommendation.id %}">{{ recommendation.show.broadcastformat.format }}</a>
+                                href="/program/{{ recommendation.id }}">{{ recommendation.show.broadcastformat.format }}</a>
                         </h3>
                     {% endif %}
                 </div>
diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index 88e439f..5e687f1 100644
--- a/program/templates/v2/show_detail.html
+++ b/program/templates/v2/show_detail.html
@@ -47,7 +47,7 @@
 
     <p>
         {% for host in show.hosts.all %}
-            <a href="{% url "host-detail-v2" host.id %}">{{ host }}</a><br/>
+            <a href="/program/hosts/{{ host.id }}">{{ host }}</a><br/>
         {% endfor %}
         {% if show.email %}
             <strong>Email:</strong> <a href="mailto:{{ show.email }}">{{ show.email }}</a><br/>
@@ -63,18 +63,18 @@
         <ul class="recommendations-list">
             {% for note in show.notes.all reversed %}
                 <li>
-                    <a href="{% url "timeslot-detail-v2" note.timeslot.id %}"
+                    <a href="/program/{{ note.timeslot.id }}"
                        title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
                     <div class="title">{{ note.title }}</div>
                 </li>
             {% endfor %}
             {% if show.predecessor and show.predecessor.notes.all %}
                 {% if show.name != show.predecessor.name %}
-                    <h3>Davor als <a href="{% url "show-detail-v2" show.predecessor.slug %}">{{ show.predecessor.name }}</a></h3>
+                    <h3>Davor als <a href="/program/shows/{{ show.predecessor.slug }}">{{ show.predecessor.name }}</a></h3>
                 {%  endif %}
                 {% for note in show.predecessor.notes.all reversed %}
                     <li>
-                        <a href="{%  url "timeslot-detail-v2" note.timeslot.id %}"
+                        <a href="/program/{{ note.timeslot.id }}"
                            title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
                         <div class="title">{{ note.title }}</div>
                     </li>
diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html
index c4d123b..b88695f 100644
--- a/program/templates/v2/show_list.html
+++ b/program/templates/v2/show_list.html
@@ -34,7 +34,7 @@
                     {% endfor %}
                 </div>
                 <div class="show-detail">
-                    <h3 class="show-title"><a href="{% url "show-detail-v2" show.slug %}">{{ show.name }}</a></h3>
+                    <h3 class="show-title"><a href="/program/shows/{{ show.slug }}">{{ show.name }}</a></h3>
                     <ul class="show-programslots">
                         {% for programslot in show.active_program_slots %}
                             <li class="show-programslot">{{ programslot }}</li>
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html
index b4702da..b959b50 100644
--- a/program/templates/v2/timeslot_detail.html
+++ b/program/templates/v2/timeslot_detail.html
@@ -8,7 +8,7 @@
 
     <div class="show-detail-header bf-{{ timeslot.show.broadcastformat.slug }}">
         <h1 id="name">
-            <a href="{% url "show-detail-v2" timeslot.show.slug %}">{{ timeslot.show.name }}</a>
+            <a href="/program/shows/{{ timeslot.show.slug }}">{{ timeslot.show.name }}</a>
         </h1>
         {% if timeslot.note %}
             <h2>{{ timeslot.note.title }}</h2>
@@ -42,7 +42,7 @@
 
     <p>
         {% for host in timeslot.show.hosts.all %}
-            <a href="{% url "host-detail-v2" host.id %}">{{ host }}</a><br/>
+            <a href="/program/hosts/{{ host.id }}">{{ host }}</a><br/>
         {% endfor %}
         {% if timeslot.show.email %}
             <strong>Email:</strong> <a href="mailto:{{ timeslot.show.email }}">{{ timeslot.show.email }}</a><br/>
diff --git a/program/urls.py b/program/urls.py
index 0abce53..a4909e4 100644
--- a/program/urls.py
+++ b/program/urls.py
@@ -26,11 +26,11 @@ urlpatterns = patterns('',
                        url(r'^v2/today/?$', views.DayScheduleViewV2.as_view()),
                        url(r'^v2/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', views.DayScheduleViewV2.as_view()),
                        url(r'^v2/hosts/?$', views.HostListViewV2.as_view()),
-                       url(r'^v2/hosts/(?P<pk>\d+)/?$', views.HostDetailViewV2.as_view(), name='host-detail-v2'),
+                       url(r'^v2/hosts/(?P<pk>\d+)/?$', views.HostDetailViewV2.as_view()),
                        url(r'^v2/tips/?$', views.RecommendationsListViewV2.as_view()),
                        url(r'^v2/shows/?$', views.ShowListViewV2.as_view()),
-                       url(r'^v2/shows/(?P<slug>[\w-]+)/?$', views.ShowDetailViewV2.as_view(), name='show-detail-v2'),
-                       url(r'^v2/(?P<pk>\d+)/?$', views.TimeSlotDetailViewV2.as_view(), name='timeslot-detail-v2'),
+                       url(r'^v2/shows/(?P<slug>[\w-]+)/?$', views.ShowDetailViewV2.as_view()),
+                       url(r'^v2/(?P<pk>\d+)/?$', views.TimeSlotDetailViewV2.as_view()),
                        )
 if settings.DEBUG:
     urlpatterns += \