WeekView add categories & emission links & light restyling to emphasis title

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 8715d8251b4decece869b379f4e1f7c5f84e6368..1366f0795e354b9e9567fa196f63ddd8a935db94 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{
        float: right;
 }
 .episode.inline .logo{

-       min-height: 100px;
+       min-height: 75px;

        float: left;
        margin-right:1em;
 }
        float: left;
        margin-right:1em;
 }


@@ -774,6 +774,7 @@ ul.newsSpecial{
        margin:0.1em;
 }
 .program-week .inline,.program-week .resume{padding:0;}
        margin:0.1em;
 }
 .program-week .inline,.program-week .resume{padding:0;}

+.program-week .description{color:#aaa;}

 
 
 /****************************************************/
 
 
 /****************************************************/

diff --git a/panikweb_templates/templates/emissions/inline.html b/panikweb_templates/templates/emissions/inline.html
deleted file mode 100644 (file)
index 3a1d513..0000000
--- a/panikweb_templates/templates/emissions/inline.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load thumbnails %}
-{% load staticfiles %}
-<div class="emission emission-inline inline">
-       <div class="{% if emission.archived %}archived{% endif %}">
-               <a class="block" href="{% url 'emission-view' slug=emission.slug %}">
-                       <div class="logo left">
-                               {% if emission.image %}
-                                       <img width="50" height="50" src="{{ emission.image|thumbnail:'50x50' }}"/>
-                               {% else %}
-                                       <img 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>
-                       {% endif %}
-                       <h5 class="title ellipsis">{{ emission.title }}</h5>
-                       {% if emission.subtitle %}
-                               <div class="description ellipsis">
-                                       {{ emission.subtitle }}
-                               </div>
-                       {% elif emission.text %}
-                               <div class="description ellipsis">
-                                       {{ emission.text|safe|striptags|truncatewords:20}}
-                               </div>
-                       {% endif %}
-
-               </a>
-       </div>
-</div>

diff --git a/panikweb_templates/templates/emissions/resume.html b/panikweb_templates/templates/emissions/resume.html
index 2a8e293e8cb044cae74b4c83fe9eeb159fd0cffb..c54b91be7906b0a6c016b8e0ed40403e83fed9b4 100644 (file)
--- a/panikweb_templates/templates/emissions/resume.html
+++ b/panikweb_templates/templates/emissions/resume.html
@@ -10,8 +10,14 @@
                                        <img  class="smooth" width="50" height="50" src="{% static "img/defaultLogo.png" %}"/>
                                {% endif %}
                        </div>
                                        <img  class="smooth" width="50" height="50" src="{% static "img/defaultLogo.png" %}"/>
                                {% endif %}
                        </div>

-                       <h5 class="title ellipsis">
-                               {% for category in emission.categories.all %}<span class="inBlock icon-{{category|slugify}}"></span>{% endfor%}         
+                       {% 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>
+                       {% endif %}
+                       <h5 class="title ellipsis">     

                                {{ emission.title }}
                        </h5>
                        {% if emission.subtitle %}
                                {{ emission.title }}
                        </h5>
                        {% if emission.subtitle %}

diff --git a/panikweb_templates/templates/episodes/resume.html b/panikweb_templates/templates/episodes/resume.html
index 252feaf76296f757cb7f97ef43c68606a27ddcf1..f4f27a366c62be11bc8a719556b90607a7ec37b5 100644 (file)
--- a/panikweb_templates/templates/episodes/resume.html
+++ b/panikweb_templates/templates/episodes/resume.html
@@ -43,9 +43,18 @@
                        <div class="sound right">{% audio sound=episode.main_sound %}</div>
                {% endif %}
                {% if class = "standalone" %}
                        <div class="sound right">{% audio sound=episode.main_sound %}</div>
                {% endif %}
                {% if class = "standalone" %}

-                       <h5 class="title ellipsis smooth">
-                               <a href="{% url 'emission-view' slug=episode.emission.slug %}">{{ episode.emission.title }}</a>
-                       </h5>
+                       <div class="metas smooth ellipsis">
+                               <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>
+                                       {% endfor%}
+                                       </span>
+                               {% 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>
                {% 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>