Some stupid padding problems

panikweb_templates/static/css/specifics.css

@@ -499,18 +499,21 @@ body{
 #Emission .emission-detail .title{}
 /*
 */
+#Emission-tabs-menu .sub{
+	margin-bottom:1em;
+}
 @media screen and (min-width: 600px) {
 	#Emissions #Changing .wrapper.sided{
 		max-width:1000px;
 	}
 	#Emissions #Changing .wrapper.sided #Emission-tabs-detail,
-	 #Emissions #Changing .wrapper.sided #Emission-tabs-last{
+	 #Emissions #Changing .wrapper.sided #Emission-tabs-menu{
 		width:45%;
 	}
 	#Emissions #Changing .wrapper.sided #Emission-tabs-detail{
 		float:left;
 	}
-	#Emissions #Changing .wrapper.sided #Emission-tabs-last{
+	#Emissions #Changing .wrapper.sided #Emission-tabs-menu{
 		float:right;
 	}
 	/*

panikweb_templates/templates/emissions/emission_detail.html

@@ -12,44 +12,54 @@
 	<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 %}
+				{% if episode %}
+					{% episode_detail %} 
+				{% else %}
+					<h5 class="sectionLabel">À propos</h5>
+					{% emission_detail %}
+				{% endif %}
 			</div>
 
-			<div id="Emission-tabs-last" class="episodes">
+			<div id="Emission-tabs-menu" class="episodes">
+				{% if episode %}
+					<div class="sub">
+						<h5 class="sectionLabel">À propos</h5>
+						{% emission_resume %}
+					</div>
+				{% endif %}
 				{% if news %}
-				<div>
-					<h5 class="sectionLabel">Actu</h5>
-					<ul class="custom list">
-					{% for content in news %}
-						<li>{% news_inline %}</li>
-					{% endfor %}
-					</ul>
-				</div>
+					<div class="sub">
+						<h5 class="sectionLabel">Actu</h5>
+						<ul class="custom list">
+						{% for content in news %}
+							<li>{% news_inline %}</li>
+						{% endfor %}
+						</ul>
+					</div>
 				{% endif %}
 				{% if futurEpisodes %}
-				<div>
-					<h5 class="sectionLabel marged">Bientôt</h5>
-					{% for episode in futurEpisodes %}
-						<div class="legend">{{ episode.first_diffusion|date:"F Y" }}</div>
-						{% episode_resume date="daytime" %}
-					{% endfor %}
-				</div>
-				{% endif %}
-				{% if episodes %}
-				<div>
-					<h5 class="sectionLabel marged">Dernier épisode</h5>
-					{% with episodes|slice:"0:1" as episodes %}
-						{% for episode in episodes %}
+					<div class="sub">
+						<h5 class="sectionLabel">Bientôt</h5>
+						{% for episode in futurEpisodes %}
 							<div class="legend">{{ episode.first_diffusion|date:"F Y" }}</div>
-							{% if futurEpisodes %}
-								{% episode_resume model="inline" date="daytime" %}
-							{% else %}
-								{% episode_resume date="daytime" %}
-							{% endif %}
+							{% episode_resume date="daytime" %}
 						{% endfor %}
-					{% endwith %}
-				</div>
+					</div>
+				{% endif %}
+				{% if episodes %}
+					<div class="sub">
+						<h5 class="sectionLabel">Dernier épisode</h5>
+						{% with episodes|slice:"0:1" as episodes %}
+							{% for episode in episodes %}
+								<div class="legend">{{ episode.first_diffusion|date:"F Y" }}</div>
+								{% if futurEpisodes %}
+									{% episode_resume model="inline" date="daytime" %}
+								{% else %}
+									{% episode_resume date="daytime" %}
+								{% endif %}
+							{% endfor %}
+						{% endwith %}
+					</div>
 				{% endif %}
 			</div>
 		</div>

panikweb_templates/templates/emissions/episode_detail.html

@@ -3,25 +3,4 @@
 {% load thumbnails %}
 {% load staticfiles %}
 {% block title %}{{ episode.title }} - {{ episode.emission.title }} {% endblock %}
-{% block main %}
-<div class="wrapper {% if episodes %}sided{% endif %}">
-	<div id="Emission-container" class="emission padded">
-		<div data-tabbed="true" id="Emission-tabs-default">
-			<div id="Emission-tabs-detail">
-				{% episode_detail %} 
-			</div>
-			<div id="Emission-tabs-last" class="episodes">
-				<h5 class="sectionLabel">À propos</h5>
-				{% emission_resume %}
 
-				<h5 class="sectionLabel">Derniers épisodes</h5>
-				{% with episodes|slice:"0:3" as episodes %}
-					{% for episode in episodes %}
-						{% episode_resume model="inline" %}
-					{% endfor %}
-				{% endwith %}
-			</div>
-		</div>
-	</div>
-</div>
-{% endblock %}

panikweb_templates/templates/emissions/episodes.html

@@ -22,7 +22,7 @@
 		<ul class="custom columns list">
 		{% for episode in episodes %}
 			<li class="item {% if episode.emission.categories.all.count = 0 %}nocat{% endif %} {% for category in episode.emission.categories.all %} {{ category|slugify }}{% endfor %}">
-				{% episode_resume model="inline" klass="standalone"%}			
+				{% episode_resume model="inline"%}			
 			</li>
 		{% endfor %}
 		</ul>

panikweb_templates/templates/includes/player.html

@@ -9,7 +9,7 @@
 					<!--<li><button class="icon-eye-open " title="Show/Hidden HTML5 audio player" onclick="$('#DirectStreamPanik').toggleClass('hidden');$(this).toggleClass('icon-eye-open icon-eye-close');return false;"></button></li>-->
 					<li><button title="{% trans 'Need some help?' %}" onclick="$('#PlayerHelp').toggle();" class="icon-question-sign"></button></li>
 				</ul>
-				<span class="" id="DirectStreamPanikControler">
+				<span class="button" id="DirectStreamPanikControler">
 					<div id="streamSymbol" class="icon-volume-up resymbol"></div>
 					<div class="label">{% trans 'live' %}</div>
 				</span>