Commit 4e5a25be authored by fred's avatar fred
Browse files

Merge branch 'master' into wip/side-player

parents 92af1409 a8e5da09
......@@ -81,7 +81,8 @@ class EmissionDetailView(DetailView, EmissionMixin):
def get_context_data(self, **kwargs):
context = super(EmissionDetailView, self).get_context_data(**kwargs)
context['sectionName'] = "Emissions"
context['schedules'] = Schedule.objects.select_related().filter(emission=self.object).order_by('datetime')
context['schedules'] = Schedule.objects.select_related().filter(
emission=self.object).order_by('rerun', 'datetime')
context['news'] = NewsItem.objects.all().filter(emission=self.object.id).order_by('-date')[:3]
context.update(self.get_emission_context(self.object))
return context
......@@ -108,7 +109,8 @@ class EmissionEpisodesDetailView(DetailView, EmissionMixin):
def get_context_data(self, **kwargs):
context = super(EmissionEpisodesDetailView, self).get_context_data(**kwargs)
context['sectionName'] = "Emissions"
context['schedules'] = Schedule.objects.select_related().filter(emission=self.object).order_by('datetime')
context['schedules'] = Schedule.objects.select_related().filter(
emission=self.object).order_by('rerun', 'datetime')
context['search_query'] = self.request.GET.get('q')
if context['search_query']:
......
......@@ -391,6 +391,7 @@ h1.top#frequence {
border-color: transparent;
}
#Nav .current,
#Nav .active,#Nav .icon-check,#Nav .active *{
font-weight:bold;
background: white;
......@@ -870,6 +871,11 @@ h1.top#frequence {
border:2px solid #0000ff;
}
.news .special a {
position: relative;
}
.special .labels .item,
.newsRoll .labels .item{
display:block;
background:#0000FF;
......
......@@ -55,7 +55,6 @@ $(function() {
}
new_content = $($.parseHTML(html)).find('#Changing>*');
$main.hide().empty().append(new_content).show();
window.onpopstate();
new_menu = $($.parseHTML(html)).find('#metaNav>*');
$metaNav.empty().append(new_menu);
......
......@@ -27,12 +27,6 @@
</div>
<div class="rightPart">
<div class="sub">
{% if newsitem.emission %}
<h5 class="sectionLabel">proposé par</h5>
{% with newsitem.emission as emission %}
<div class="">{% emission_resume %}</div>
{% endwith %}
{% endif %}
<h5 class="sectionLabel right">
<a href="{% url 'newsArchives' %}">
<span class="iconLabel">Toutes</span>
......
......@@ -2,6 +2,12 @@
{% load staticfiles %}
<div class="content content-inline {% if class != "special" %}inline{% endif %} cf {{ class }}">
<a class="block cf" href="{% url 'newsitem-view' slug=content.slug %}">
{% if class == "special" and content.category %}
<div class="label labels absolute">
<span class="item inBlock">{{ content.category.title }}</span>
</div>
{% endif %}
<div class="logo">
{% if class == "special" and content.image %}
<img class="normal" src="{{ content.image|thumbnail:'640x480' }}"/>
......
......@@ -26,7 +26,7 @@
{% for content in news|slice:'0:3' %}
<li style="width:30%;" class="num-{{ forloop.counter }} padded">
<button class="inBlock" data-about="#newsRollId-{{ content.slug }}">
<img style="width:98%;" src="{{ content.image|thumbnail:'160x120' }}" />
<img style="width:95%;" src="{{ content.image|thumbnail:'160x120' }}" />
</button>
</li>
{% endfor %}
......
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