From f330539b64e7b4b3cda974421908659b647a64ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Thu, 26 Sep 2013 02:59:41 +0200
Subject: [PATCH] relayout navigation of program sublevel pages

---
 panikweb_templates/static/css/specifics.css   | 29 +++++++++++++++++--
 .../templates/emissions/emission_detail.html  |  3 ++
 .../templates/emissions/nav.html              |  4 ---
 panikweb_templates/templates/tpl-default.html |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 9b196d9..113ac72 100644
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -296,6 +296,7 @@ body{
 		width: calc(0% + 280px);
 	}
 	#Changing {
+		position: relative;
 		float: right;
 		width: 78%;
 		width: calc(100% - 300px);
@@ -327,6 +328,25 @@ body{
 		margin-bottom: 10px;
 	}
 
+	#About div.mainSub,
+	#Emissions div.mainSub {
+		position: absolute;
+		top: 20px;
+		left: 290px;
+	}
+
+	#About div.mainSub ul,
+	#Emissions div.mainSub ul {
+		padding: 0;
+		font-family: Reglo;
+		font-weight: normal;
+	}
+
+	#About div.mainSub ul li,
+	#Emissions div.mainSub ul li {
+	}
+
+
 }
 
 div.focus {
@@ -336,8 +356,8 @@ div.focus {
 /****************************************************/
 /****  SCREEN NAV ****/
 #Nav{
-	background:#0000ff;
-	color:white;
+	background: white;
+	color: black;
 }
 #Nav nav{padding:0.1em;}
 
@@ -1147,6 +1167,11 @@ div.episode.resume div.title {
 	margin: 1em 0;
 }
 
+nav#program li {
+	display: block;
+	margin: 0;
+}
+
 /*******************************/
 /**** VARIANTES ****************/
 /*******************************/
diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index 36ef598..5c49882 100644
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -4,6 +4,9 @@
 {% load staticfiles %}
 {% block bodyID %}Emissions{% endblock %}
 {% block title %}{{ emission.title }}{% endblock %}
+{% block toptitle %}
+<h1 class="top">Émissions</h1>
+{% endblock %}
 {% block nav %}
 	{% emission_nav %}
 {% endblock %}
diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index 600247a..4af8100 100644
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -4,19 +4,15 @@
 	    <nav>
 		    <ul class="inline padded">
 			    <li><a href="{% url 'grid' %}" class="{% if class = "grid" %}active{% endif %}">
-				    <span class="icon-th-large" ></span>
 				    <span class="iconLabel">La grille</span>
 			    </a></li>
 			    <li><a href="{% url 'program' %}" class="{% if class = "program" %}active{% endif %}">
-				    <span class="icon-calendar" ></span>
 				    <span class="iconLabel">Par semaine</span>
 			    </a></li>
 			    <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>
 			    </a></li>
 			    <li><a href="{% url 'emissionsArchives' %}" class="{% if class = "archives" %}active{% endif %}">
-				    <span class="icon-archive" ></span>
 				    <span class="iconLabel">Archives</span>
 			    </a></li>
 		    </ul>
diff --git a/panikweb_templates/templates/tpl-default.html b/panikweb_templates/templates/tpl-default.html
index 1f73f76..d879748 100644
--- a/panikweb_templates/templates/tpl-default.html
+++ b/panikweb_templates/templates/tpl-default.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block nav %}
-<div class="wrapper">
+<div class="mainSub">
 	    <nav class="distributed">
 		    {% show_menu "main-menu" 1 1 "all" %}
 	    </nav>
-- 
2.39.2