Add emissions in nav & fix style

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 829389220c629a5dc39fccc561ffe9f08f13a98e..f09c375c6ba95f43f4cb22264902ee6fff10d2f7 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -279,10 +279,6 @@ body{
 /**** Liste   ****/
 /**** EMISSIONS ****/
 #Emission .emission-detail .title{}
-#Emissions #Changing .wrapper{
-       max-width:600px;
-       margin:auto;
-}
 /*
 @media screen and (min-width: 1000px) {
        #Emissions #Changing .wrapper{

diff --git a/panikweb_templates/templates/emissions.html b/panikweb_templates/templates/emissions.html
index deca9ba297593ce1952a60614d5c55aac7f978d6..06204e1ce065d7080c861b1e05dc70d0984cd8fc 100644 (file)
--- a/panikweb_templates/templates/emissions.html
+++ b/panikweb_templates/templates/emissions.html
@@ -2,13 +2,11 @@
 {% block bodyID %}Emissions{% endblock %}
 {% block title %}Emissions{% endblock %}
 {% block main %}
-<div class="emissions">
-       <div class="wrapper">
+<div class="emissions padded">
                <ul class="custom list columns padded">
                {% for emission in emissions %}
                        <li>{% include "emissions/inline.html" %}</li>
                {% endfor %}
                </ul>
-       </div>
 </div>
 {% endblock %}

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index 25e430cf45cd2cdc353ae218025dc729578f7788..4c7bee0f89cd33e2bbb8f7e2708fdbd34c35e668 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -5,7 +5,7 @@
        {% emission_nav %}
 {% endblock %}
 {% block main %}
-<div class="wrapper {% if episodes %}sided{% else %}classic{% endif %}">
+<div class="wrapper half">
        <div id="Emission-container" class="emission padded">
                {% if episode %}
                <div data-tabbed="true" id="Emission-tabs-current" class="episodes">

diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index c8520bc72891dd736d7eae8a13cd4b49cee74e48..235e0f9c7a018cf669ef87e190ed97340a964ecb 100644 (file)
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -16,28 +16,30 @@
 </header>
 
 {% if episodes %}
-<nav class="wrapper tabs" data-tab-about="#Emission-container">
-       <ul class="distributed">
+<div class="wrapper half">
+       <nav class="tabs" data-tab-about="#Emission-container">
+               <ul class="distributed">
 
-               <li>
-                       <button data-tab="#Emission-tabs-last" >
-                               <span class="iconLabel">Dernier épisode</span>
-                       </button>
-               </li>
-               <li>
-                       <button data-tab="#Emission-tabs-episodes">
-                               <span class="iconLabel">Archives</span>
-                       </button >
-               </li>
-               <li>
-                       <button data-tab="#Emission-tabs-detail" >
-                               <span class="iconLabel">A propos</span>
-                       </button>
-               </li>
-       </ul>
-       {% if episode %}
-       <hr />
-               <strong class="active button padded " data-tab="#Emission-tabs-current">{{ episode.title }}</strong>
-       {% endif %}
-</nav>
+                       <li>
+                               <button data-tab="#Emission-tabs-last" >
+                                       <span class="iconLabel">Dernier épisode</span>
+                               </button>
+                       </li>
+                       <li>
+                               <button data-tab="#Emission-tabs-episodes">
+                                       <span class="iconLabel">Archives</span>
+                               </button >
+                       </li>
+                       <li>
+                               <button data-tab="#Emission-tabs-detail" >
+                                       <span class="iconLabel">A propos</span>
+                               </button>
+                       </li>
+               </ul>
+               {% if episode %}
+               <hr />
+                       <strong class="active button padded " data-tab="#Emission-tabs-current">{{ episode.title }}</strong>
+               {% endif %}
+       </nav>
+</div>
 {% endif %}

diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index de3ce6f810c5d79175f406375a205cfa0dcdb98a..349c4d7aa680cf360bed3df5eedae7c6826d7c43 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -10,9 +10,15 @@
                                <span class="icon-headphones" ></span>
                                <span class="iconLabel">Listen</span>
                        </a></li>
+                       <li><a href="{% url 'emissions' %}">
+                               <span class="icon-bullhorn" ></span>
+                               <span class="iconLabel">Emissions</span>
+                       </a></li>
+<!--
+-->
 <!--
                        <li><a href="{% url 'news' %}">
-                               <span class="icon-bullhorn" ></span>
+                               <span class="icon-group" ></span>
                                <span class="iconLabel">News</span>
                        </a></li>
                        <li><a href="{% url 'program' %}">
@@ -24,12 +30,6 @@
                                <span class="icon-th-large" ></span>
                                <span class="iconLabel">Grid</span>
                        </a></li>
-<!--
-                       <li><a href="{% url 'emissions' %}">
-                               <span class="icon-group" ></span>
-                               <span class="iconLabel">Emissions</span>
-                       </a></li>
--->
                        <li><a href="/la-radio/">
                                <span class="icon-info-sign" ></span>
                                <span class="iconLabel">About</span>