use subtitle instead of description

panikweb_templates/templates/emissions/detail.html

@@ -31,9 +31,9 @@
 	</div>
 
 
-	{% if emission.description %}
+	{% if emission.subtitle %}
 	<div class="description">
-		{{ emission.description|safe|striptags }}
+		{{ emission.subtitle }}
 	</div>
 	{% endif %}
 

panikweb_templates/templates/emissions/inline.html

@@ -18,9 +18,9 @@
 				</div>
 			{% endif %}
 			<h5 class="title ellipsis">{{ emission.title }}</h5>
-			{% if emission.description %}
+			{% if emission.subtitle %}
 				<div class="description ellipsis">
-					{{ emission.description|safe|striptags }}
+					{{ emission.subtitle }}
 				</div>
 			{% elif emission.text %}
 				<div class="description ellipsis">

panikweb_templates/templates/emissions/resume.html

@@ -11,9 +11,9 @@
 				{% endif %}
 			</div>
 			<h5 class="title ellipsis">{{ emission.title }}</h5>
-			{% if emission.description %}
+			{% if emission.subtitle %}
 				<div class="description ellipsis">
-					{{ emission.description|safe|striptags }}
+					{{ emission.subtitle }}
 				</div>
 			{% elif emission.text %}
 				<div class="description ellipsis">

panikweb_templates/templates/episodes/detail.html

@@ -23,9 +23,9 @@
 	</div>
 	{% endif %}
 	<div class="content userContent">
-		{% if episode.description %}
+		{% if episode.subtitle %}
 		<div class="description">
-			{{ episode.description|safe }}
+			{{ episode.subtitle }}
 		</div>
 		{% endif %}
 		{% if episode.text %}

panikweb_templates/templates/episodes/resume.html

@@ -42,9 +42,9 @@
 			<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a>
 		</h5>
 		{% if model = "inline" %}
-			{% if episode.description %}
+			{% if episode.subtitle %}
 				<div class="description ellipsis">
-					{{ episode.description|safe|striptags|truncatewords:20}}
+					{{ episode.subtitle|truncatewords:20}}
 				</div>
 			{% elif episode.text %}
 				<div class="description ellipsis">
@@ -52,9 +52,9 @@
 				</div>
 			{% endif %}
 		{% else %}
-			{% if episode.description %}
+			{% if episode.subtitle %}
 			<article class="text userContent">
-				{{ episode.description|safe|truncatewords:50 }}
+				{{ episode.subtitle|truncatewords:50 }}
 			</article>
 			{% elif episode.text %}
 			<article class="text userContent">

panikweb_templates/templates/includes/week.html

@@ -21,18 +21,18 @@
 				<strong>{{ cell.datetime|date:"H:i" }}</strong>&nbsp;-&nbsp;
 					<a href="{% url 'episode-view' emission_slug=cell.episode.emission.slug slug=cell.episode.slug %}">
 						<span><em>{{ cell.episode.emission.title }}</em>&nbsp;-&nbsp;{{ cell.episode.title }}</span>
-						{% if cell.episode.description %}
-							<span class="smooth">&nbsp;|&nbsp;{{ cell.episode.description|safe|striptags|truncatewords:50 }}</span>
-						{% elif cell.episode.emission.description %}
-							<span class="smooth">&nbsp;|&nbsp;{{ cell.episode.emission.description|safe|striptags|truncatewords:50 }}</span>
+						{% if cell.episode.subtitle %}
+							<span class="smooth">&nbsp;|&nbsp;{{ cell.episode.subtitle|safe|truncatewords:50 }}</span>
+						{% elif cell.episode.emission.subtitle %}
+							<span class="smooth">&nbsp;|&nbsp;{{ cell.episode.emission.subtitle|safe|truncatewords:50 }}</span>
 						{% endif %}
 					</a>
 				{% elif cell.emission %}
 				<strong>{{ cell.datetime|date:"H:i" }}</strong>&nbsp;-&nbsp;
 					<a href="{% url 'emission-view' slug=cell.emission.slug %}">
 						<span><em>{{ cell.emission.title }}</em></span>
-						{% if  cell.emission.description %}
-							<span class="smooth">&nbsp;|&nbsp;{{ cell.emission.description|safe|striptags|truncatewords:50 }}</span>
+						{% if  cell.emission.subtitle %}
+							<span class="smooth">&nbsp;|&nbsp;{{ cell.emission.subtitle|safe|truncatewords:50 }}</span>
 						{% elif cell.emission.text %}
 							<span class="smooth">&nbsp;|&nbsp;{{ cell.emission.text|safe|striptags|truncatewords:50 }}</span>
 						{% endif %}