Commit 6fc8608c authored by Simon Daron's avatar Simon Daron
Browse files

Emissions /episodes

parent 8757eabe
......@@ -15,7 +15,7 @@ urlpatterns = patterns('',
url(r'^grid$', 'panikweb.views.grid', name='grid'),
url(r'^emissions/$', 'panikweb.views.emissions', name='emissions'),
url(r'^emissions/(?P<emission_slug>[\w,-]+)/(?P<slug>[\w,-]+)/$', 'panikweb.views.episode', name='episode-view'),
url(r'^emissions/(?P<slug>[\w,-]+)/\+', 'panikweb.views.emissionEpisodes', name='emissionEpisodes'),
url(r'^emissions/(?P<slug>[\w,-]+)/$', 'panikweb.views.emissionEpisodes', name='emissionEpisodes'),
url(r'^emissions/(?P<slug>[\w,-]+)', 'panikweb.views.emission', name='emission-view'),
url(r'^ckeditor/', include('ckeditor.urls')),
url(r'^archives$', 'panikweb.views.archives', name='archives'),
......
......@@ -27,9 +27,6 @@ a {
color:inherit;
text-decoration: none;
}
#Changing a:hover {
opacity:0.6;
}
.userContent a:hover {
text-decoration: underline;
}
......
......@@ -140,6 +140,9 @@ body{
#Home #Main{
min-height:0;
}
#Changing a:hover {
opacity:0.6;
}
/* GLOBAL SITE NAV */
#userLog{
z-index:2000;
......@@ -244,6 +247,10 @@ body{
box-shadow: 0px 0px 100px rgb(0, 0, 0) inset;
*/
}
#Nav form{
background-color:#333;
color: white;
}
#Nav nav{padding:0.1em;}
#Nav *{ color:#ccc;border-color:#ddd;}
#Nav .active,#Nav .active *{color:white !important;}
......@@ -268,7 +275,7 @@ body{
#Nav li a{
display: inline-block;
padding: 0.5em;
padding: 0 0.5em 0 0.5em;
}
#Nav nav ul.distributed li {padding: 0;border-width:0 2px 0 2px;border-style:solid;}
......
......@@ -12,6 +12,7 @@
<div id="Emission-container" class="emission padded">
<div data-tabbed="true" id="Emission-tabs-default">
<div id="Emission-tabs-detail">
<h5 class="sectionLabel">À propos</h5>
{% emission_detail %}
</div>
......@@ -37,20 +38,4 @@
</div>
{% endblock %}
{% block links %}
{% if episodes %}
<div class="wrapper padded">
<h2>Archives</h2>
<ul class="custom list columns padded episodes">
{% for episode in episodes %}
<li class="ellipsis">
<a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">
{% if episode.main_sound %}<span class="icon-headphones" ></span>{% endif %}
<strong>{{episode.first_diffusion|date:"d M y"}}</strong>|
{{ episode.title }}
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endblock %}
{% extends "emissions/emission_detail.html" %}
{% load paniktags %}
{% block nav %}
{% emission_nav %}
{% emission_nav klass "archives" %}
{% endblock %}
{% block main %}
<form method="get" action="." class="padded center" id="search-form">
<div class="big ">
<label for="id_q">Rechercher:</label>
<input id="id_q" name="q" type="text">
<button class="icon-search"></button>
</div>
</form>
<div class="wrapper {% if episodes %}sided{% endif %}">
<div id="Emission-container" class="emission padded">
{% if episodes %}
{% with episodes as episodes %}
......
<div class="wrapper">
<nav>
<ul class="inline">
<ul class="inline padded">
<li><a href="{% url 'emissions' %}" class="{% if class != "program" and class != "grid" and class != "archives" %}active{% endif %}">
<span class="icon-microphone" ></span>
<span class="iconLabel">Émissions</span>
......@@ -20,6 +20,8 @@
</a></li>
</ul>
</nav>
</div>
<div class="wrapper">
{% if categories %}
<nav id="gridNav" class="checkable">
<ul class="by{{ categories.count }}">
......@@ -38,9 +40,9 @@
</ul>
</nav>
{% endif %}
{% if class = "week" %}
{% endif %}
{% if emission %}
</div>
{% if emission %}
<div class="wrapper">
<header class="mainHeader">
<h2 class="squashed title">
<a href="{% url 'emission-view' slug=emission.slug %}">{{ emission.title }}</a>
......@@ -53,22 +55,29 @@
</div>
{% endif %}
</header>
{% if episodes %}
<div class="wrapper half">
<nav>
<ul class="distributed">
<li>
<a href="{% url 'emission-view' slug=emission.slug %}">En bref</a>
</li>
<li>
<a href="{% url 'emissionEpisodes' slug=emission.slug %}">Épisodes ({{ episodes.count }})</a>
</div>
<div class="wrapper">
{% if episodes %}
<div class="wrapper half">
<nav>
<ul class="distributed">
<li>
<a href="{% url 'emission-view' slug=emission.slug %}">En bref</a>
</li>
<li>
<a href="{% url 'emissionEpisodes' slug=emission.slug %}">Archives ({{ episodes.count }})</a>
</li>
</ul>
</nav>
</div>
{% endif %}
<!--
-->
</li>
</ul>
</nav>
</div>
{% endif %}
<!--
{% if episode %}
<h4 class="active title">{{ episode.title }}</h4>
{% endif %}
-->
</div>
{% if class = "archives" %}
{% endif %}
{% endif %}
......@@ -2,8 +2,6 @@
{% load paniktags %}
{% load highlight %}
{% block bodyID %}Search{% endblock %}
{% block player-class %}{% endblock %}
{% block title %}Recherche{% endblock %}
{% block nav %}
<div class="padded">
......
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