Skip to content

GitLab

Commit 407ab20f authored by Simon Daron's avatar Simon Daron
Browse files

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

parent e02146ec
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 39 deletions
panikweb_templates/static/css/specifics.css
View file @ 407ab20f
......@@ -588,7 +588,7 @@ body{
float: right;
}
.episode.inline .logo{
min-height: 100px;
min-height: 75px;
float: left;
margin-right:1em;
}
......@@ -774,6 +774,7 @@ ul.newsSpecial{
margin:0.1em;
}
.program-week .inline,.program-week .resume{padding:0;}
.program-week .description{color:#aaa;}
/****************************************************/
......
panikweb_templates/templates/emissions/inline.html deleted 100644 → 0
View file @ e02146ec
{% 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>
panikweb_templates/templates/emissions/resume.html
View file @ 407ab20f
......@@ -10,8 +10,14 @@
<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 %}
......
panikweb_templates/templates/episodes/resume.html
View file @ 407ab20f
......@@ -43,9 +43,18 @@
<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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment