Commit b64fae68 authored by fred's avatar fred

wip: update rendering of elements in week view

parent 32a7244b
......@@ -871,10 +871,10 @@ h1.top#frequence {
.episode.resume .logo{
float: right;
}
.episode.inline .logo{
.episode.inline .logo {
min-height: 50px;
float: left;
margin-right:0.5em;
margin-right: 1em;
}
.episode.resume .sound{
float:right;
......@@ -1063,6 +1063,46 @@ ul.newsSpecial{
.program-week .description{}
.program-week .metas{display:inline-block;}
.program-week .title {
color: black;
display: inline;
}
.program-week .smooth {
color: #666;
opacity: 1.0;
font-size: 80%;
padding-bottom: 8px;
}
.program-week .emission h5,
.program-week .smooth .title {
color: #333;
text-transform: uppercase;
}
.program-week .description {
color: black;
font-size: 90%;
}
.program-week .programCell:hover {
opacity: 0.5;
}
#Changing .program-week .programCell a {
opacity: 1.0;
}
#Changing .program-week .programCell .smooth a {
opacity: 0.5;
}
#Changing .program-week .programCell .smooth h5 a {
opacity: 1.0;
}
/****************************************************/
/**** SEARCH ****/
/****************************************************/
......@@ -1231,3 +1271,7 @@ nav#program li {
transform-origin: bottom right;
transform: rotate(270deg);
}
img.logo.right {
margin-bottom: 1em;
}
......@@ -10,7 +10,7 @@
<img class="smooth" style="width:60px;" src="{% static "img/emission.png" %}"/>
{% endif %}
</div>
<div class="title ellipsis">
<div class="title">
<h5 class="inBlock">
{{ emission.title }}
</h5>
......@@ -25,11 +25,11 @@
</div>
</div>
{% if emission.subtitle %}
<div class="description ellipsis">
<div class="description">
{{ emission.subtitle }}
</div>
{% elif emission.text %}
<div class="description ellipsis">
<div class="description">
{{ emission.text|safe|striptags|truncatewords:20}}
</div>
{% endif %}
......
......@@ -12,7 +12,6 @@
{% endif %}
</div>
<div class="content">
{% if episode.main_sound %}
<div class="sound right">{% audio sound=episode.main_sound %}</div>
{% endif %}
......
......@@ -23,6 +23,7 @@
</div>
{% endif %}
<div class="logo">
<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">
{% if model = "inline" and episode.image %}
<img src="{{ episode.image|thumbnail:'60x60' }}"/>
{% elif model = "inline" and episode.emission.image %}
......@@ -36,14 +37,15 @@
{% else %}
<img class="smooth" style="width:150px;" src="{% static "img/episode.png" %}"/>
{% endif %}
</a>
</div>
<div class="content">
{% if episode.main_sound %}
<div class="sound right">{% audio sound=episode.main_sound %}</div>
{% endif %}
<div class="title ellipsis">
<h5 class=" inBlock title {% if model = "inline" %}ellipsis{% endif %}">
<div class="title">
<h5 class=" inBlock title">
<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a>
</h5>
<div class="smooth metas">
......@@ -63,15 +65,15 @@
</div>
{% if model = "inline" %}
<div class="description">
<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">
{% if episode.subtitle %}
<div class="description ellipsis">
{{ episode.subtitle|truncatewords:20}}
</div>
{{ episode.subtitle|truncatewords:20}}
{% elif episode.text %}
<div class="description ellipsis">
{{ episode.text|safe|striptags|truncatewords:20}}
</div>
{{ episode.text|safe|striptags|truncatewords:20}}
{% endif %}
</a>
</div>
{% else %}
{% if episode.subtitle %}
<article class="text userContent">
......
......@@ -13,7 +13,7 @@
{% elif cell.emission %}
{% with cell.emission as emission %}{% emission_resume %}{% endwith %}
{% else %}
<a href="{% url 'emission-view' slug=cell.slug %}" class="nonstop">Musique en continu : <em>{{ cell.label }}</em></a>
<a href="{% url 'emission-view' slug=cell.slug %}" class="nonstop"><em>{{ cell.label }}</em></a> - <span class="smooth categories category">Musique en continu</span>
{% endif %}
</div>
</li>
......
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