From: laron <simon@surlaterre.org>
Date: Sun, 8 Sep 2013 19:37:32 +0000 (+0200)
Subject: fixing size & title/metas order in emission episode resume
X-Git-Tag: v2021~866
X-Git-Url: https://git.0d.be/?p=panikweb.git;a=commitdiff_plain;h=9abec7c73035e4ced8dd0d68c2b0e30ad29f56aa

fixing size & title/metas order in emission episode resume
---

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 1366f07..d406d6f 100644
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -588,7 +588,7 @@ body{
 	float: right;
 }
 .episode.inline .logo{
-	min-height: 75px;
+	min-height: 50px;
 	float: left;
 	margin-right:1em;
 }
@@ -775,7 +775,7 @@ ul.newsSpecial{
 }
 .program-week .inline,.program-week .resume{padding:0;}
 .program-week .description{color:#aaa;}
-
+.program-week .metas{display:inline-block;}
 
 /****************************************************/
 /**** SEARCH ****/
diff --git a/panikweb_templates/templates/emissions/resume.html b/panikweb_templates/templates/emissions/resume.html
index c54b91b..57a3fd4 100644
--- a/panikweb_templates/templates/emissions/resume.html
+++ b/panikweb_templates/templates/emissions/resume.html
@@ -10,16 +10,20 @@
 					<img  class="smooth" width="50" height="50" src="{% static "img/defaultLogo.png" %}"/>
 				{% endif %}
 			</div>
-			{% if emission.categories %}
-				<div class="categories smooth ellipsis">
-				{% for category in emission.categories.all %}
-					{% if forloop.counter > 1 %} - {% endif %}<em><span class="inBlock icon-{{category|slugify}}"></span>{{category}}</em>
-				{% endfor%}
+			<div class="title ellipsis">
+				<h5 class="inBlock">	
+					{{ emission.title }}
+				</h5>
+				<div class="smooth metas">
+				{% if emission.categories %}
+					<span class="categories ellipsis">
+					{% for category in emission.categories.all %}
+						{% if forloop.counter > 1 %} - {% endif %}<span class="category"><span class="inBlock icon-{{category|slugify}}">&nbsp;</span>{{category}}</span>
+					{% endfor%}
+					</span>
+				{% endif %}
 				</div>
-			{% endif %}
-			<h5 class="title ellipsis">	
-				{{ emission.title }}
-			</h5>
+			</div>
 			{% if emission.subtitle %}
 				<div class="description ellipsis">
 					{{ emission.subtitle }}
diff --git a/panikweb_templates/templates/episodes/resume.html b/panikweb_templates/templates/episodes/resume.html
index f4f27a3..4d89506 100644
--- a/panikweb_templates/templates/episodes/resume.html
+++ b/panikweb_templates/templates/episodes/resume.html
@@ -42,23 +42,26 @@
 		{% if episode.main_sound and model != "inline"%}
 			<div class="sound right">{% audio sound=episode.main_sound %}</div>
 		{% endif %}
-		{% if class = "standalone" %}
-			<div class="metas smooth ellipsis">
+		<div class="title ellipsis">
+			<h5 class=" inBlock title {% if model = "inline" %}ellipsis{% endif %}">
+				<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a>
+			</h5>
+			<div class="smooth metas">
+			{% if class = "standalone" %}
 				<h5 class="title inBlock">
 					<a href="{% url 'emission-view' slug=episode.emission.slug %}">{{ episode.emission.title }}</a>
 				</h5>
 				{% if episode.emission.categories %}
 					<span class="categories">
 					{% for category in episode.emission.categories.all %}
-						{% if forloop.counter > 1 %} - {% endif %}<em><span class="inBlock icon-{{category|slugify}}"></span>{{category}}</em>
+						{% if forloop.counter > 1 %} - {% endif %}<span class="category"><span class="inBlock icon-{{category|slugify}}">&nbsp;</span>{{category}}</span>
 					{% endfor%}
 					</span>
 				{% endif %}
+			{% endif %}
 			</div>
-		{% endif %}
-		<h5 class="title {% if model = "inline" %}ellipsis{% endif %}">
-			<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a>
-		</h5>
+		</div>
+
 		{% if model = "inline" %}
 			{% if episode.subtitle %}
 				<div class="description ellipsis">