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 1366f0795e354b9e9567fa196f63ddd8a935db94..d406d6f963f0fcc50ea81ae5a7dae74b887ea987 100644 (file)
--- 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 c54b91be7906b0a6c016b8e0ed40403e83fed9b4..57a3fd40a81b341c26a5a480ebfe22d79f5b350f 100644 (file)
--- 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 f4f27a366c62be11bc8a719556b90607a7ec37b5..4d8950635e1b412dedd5d7077caf84cbdecf14d3 100644 (file)
--- 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">