Fixing wrap & nav

diff --git a/panikweb_templates/static/css/general.css b/panikweb_templates/static/css/general.css
index 87a7172e5f5d8a801e05015d69fd0a7345bb6a5b..01cc108db289ad07ef908a9e4ad4831dd6a964ff 100644 (file)
--- a/panikweb_templates/static/css/general.css
+++ b/panikweb_templates/static/css/general.css
@@ -147,12 +147,16 @@ dl.metadata dd {
 
 button {display:inline-block;}
 
-ul.inline, ul.custom, ul.custom li{
+nav button {
+       font-family: "RegloBold";
+       text-transform: uppercase;
+}
+nav ul, ul.inline, ul.custom, ul.custom li{
        list-style: none;
        margin: none;
        padding: none;
 }
-ul.inline li{
+nav ul li, ul.inline li{
        display:inline;
 }
 
@@ -161,19 +165,19 @@ ul.inline li{
 /******************/
 
 
-.tabs nav ul{
+nav ul{
        display:table;
        width:100%;
        text-align:center;
        margin-bottom:2em;
 }
-.tabs nav ul li{
+nav ul li{
        display:table-cell;
        width:14%;
        text-align:center;
 }
 
-.tabs a.active{
+nav a.active, nav button.active{
        opacity:1;
        text-decoration:none;
        border-bottom:2px solid black;

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index f360d44602e921fcea62fc03cbbf22d8eeca43c1..d36aa7c861750a31a068e3117457c30bbe6c926e 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -104,6 +104,7 @@ body {
 #Panik {background:white;}
 #Panik img{display:block;margin:auto;}
 .wrapper {max-width: 1024px; margin:auto;}
+.emission .wrapper{max-width:600px;margin:auto;}
 
  
 .symbol{
@@ -251,7 +252,6 @@ button.tag {
 .inline .link{display:block;padding:1em;}
 /**** Liste   ****/
 /**** EMISSIONS ****/
-#Emission.wrapper{max-width:600px;margin:auto;}
 #Emission .emission-detail .title{}
 /**** Detail   ****/
 .emission-detail .metas {
@@ -488,6 +488,11 @@ button.tag {
 }
 /**** PROGRAMME ****/
 
+#Program .tabs nav ul li{
+       display:table-cell;
+       width:14%;
+       text-align:center;
+}
 
 /**** SCREEN SIZE ADAPTATIONS ****/
     html #main{ font-size: 70%; }

diff --git a/panikweb_templates/static/js/specifics.js b/panikweb_templates/static/js/specifics.js
index 22ab45e4cefbcc0c13321e649ab2a540e38597b8..3ccc11f7141633d9492ccac5a5ac6d104b7f3c30 100644 (file)
--- a/panikweb_templates/static/js/specifics.js
+++ b/panikweb_templates/static/js/specifics.js
@@ -2,8 +2,8 @@ $(function() {
        $(".tabs").each(function() {
                var self = $(this);
                $(this).find(".content:not(:first)").hide();
-               $(this).find("nav a:first").addClass("active");
-               $(this).find("nav a").each(function() {
+               $(this).find("nav a:first, nav button:first").addClass("active");
+               $(this).find("nav a, nav button").each(function() {
                    $(this).click(function (e) {  
                        e.preventDefault();
                        // switch all tabs off  
@@ -14,7 +14,7 @@ $(function() {
                        self.find(".content").hide();  
                        //alert($(this).attr("href"));
                        // Now figure out what the 'title' attribute value is and find the element with that id.  Then slide that down.  
-                       $($(this).attr("href")).fadeIn();  
+                       $($(this).attr("data-tab")).fadeIn();  
                
                    });  
                });  

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index aa041d8cc0cac1ca48a97575439032dd9b74fdcd..f1059dd27e11e52c7dc2d9c041a0024d2dcad60b 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -2,16 +2,8 @@
 {% block bodyID %}Emissions{% endblock %}
 {% block listen %}{% endblock %}
 {% block main %}
-       <div id="Emission" class="wrapper futurtabs">
-<!--
-       <ul class="custom">
-               <li><a href="#Emission-tabs-episodes">Episodes</a></li>
-               <li><a href="#Emission-tabs-detail">A propos de l'émission</a></li>
-       </ul>
-               <header class="mainHeader">
-                       <h1 class="title">{{ emission.title }}</h1>
-               </header>
--->
+<div class="emission">
+       <div class="wrapper">
                <div id="Emission-tabs-detail">
                        {% include "emissions/detail.html" %} 
                </div>
@@ -22,7 +14,7 @@
                                <div class="legend">{{ month.grouper }}</div>
                                        <ul class="custom list">
                                        {% for episode in month.list %}
-                                               
+                                       
                                                {% if episode.title == episodes.0.title %}
                                                        <li>{% include "episodes/resume.html" with date="daytime" %}</li>
                                                {% else %}
@@ -34,6 +26,7 @@
                        {% endif %}
                </div>
        </div>
+</div>
 {% endblock %}
 
 {% block pageend %}

diff --git a/panikweb_templates/templates/grid.html b/panikweb_templates/templates/grid.html
index 8b1bc3ef73cf425707ad680a2262f1064d96a103..4056f3cfe99f22ec9d548f74c38ca144d43fa864 100644 (file)
--- a/panikweb_templates/templates/grid.html
+++ b/panikweb_templates/templates/grid.html
@@ -5,6 +5,16 @@
 {% block listen %}{% endblock %}
 {% block main %}
 <div id="grille">
+       <nav>
+               <ul>
+                       <li><button>Créations</button></li>
+                       <li><button>Agendas</button></li>
+                       <li><button>Info</button></li>
+                       <li><button>Mixs</button></li>
+                       <li><button>Communautaires</button></li>
+                       <li><button>Continu</button></li>
+               </ul>
+       </nav>
        <table>
                <tbody>
                <tr>

diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index 66c637f3336b1c82c98a731868da54f2146f267d..4a9af97754177c80b9a077073c4e47ef6298d6f6 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -1,6 +1,6 @@
 <div id="metaNav">
        <!--<input id="search-form" type="text" />-->
-        <nav class="contextual-menu">
+        <nav class="contextual-menu wrapper">
                <ul>
                        <!--<li><a href="{% url 'get' %}">☰</a></li>-->
                        <li><a href="{% url 'home' %}">

diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html
index fedc5483aaa59f635b16906f53ad16b63a5bea7d..deb5e53ed382fc09569aef0c45ed9d5d67674f32 100644 (file)
--- a/panikweb_templates/templates/program.html
+++ b/panikweb_templates/templates/program.html
@@ -6,7 +6,7 @@
        <nav>
                <ul class="days custom">
                {% for day in days %}
-                       <li class=""><a href="#Program-tabs-{{ day.datetime|date:"w" }}">{{ day.datetime|date:"D d" }}</a></li>
+                       <li class=""><button data-tab="#Program-tabs-{{ day.datetime|date:"w" }}">{{ day.datetime|date:"D d" }}</button></li>
                {% endfor %}
                </ul>
        </nav>