Revert "Style Fixing SIZES problem introduced by tabs-ui"

This reverts commit 0d85e5ef7c90ed3e74fb432937d4a4bd5b030239.

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index fc0a8d7047156b194bc9b300e83804ee8022ca2b..d2cc9fc6409aaefe6c7f61267f7689c3859d0419 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -24,6 +24,7 @@
 .dateBloc .time {font-size: 1.2em;}
 
 .tabs .ui-tabs-nav {
+    font-size: 0.8em;
     font-family: "Reglo";
     text-transform: uppercase;
 }
@@ -79,15 +80,15 @@ body {
 
  
 .symbol{
-       font-size: 3em !important;
+       font-size: 3em;
        font-family: "RegloSymbol" !important;
        line-height: 70% !important;
 }    
 .symbol.big{
-       font-size: 4em !important;
+       font-size: 4em;
 }   
 .symbol.huge{
-       font-size: 6em !important;
+       font-size: 6em;
 }
 
 .label {
@@ -339,6 +340,52 @@ nav.menu li{
     overflow: hidden;
     margin-bottom:1.5em;
 }
+/*
+.emission .mainHeader nav {
+    height: 65px;
+    margin-top: 20px;
+}
+
+.emission .mainHeader nav ul {
+    font-size: @l;
+    font-family: "Reglo";
+    text-transform: uppercase;
+    margin-bottom: 45px;
+    transform : scale(1,2);
+    -webkit-transform:scale(1,2);
+    -moz-transform:scale(1,2);
+    -ms-transform:scale(1,2);
+    -o-transform:scale(1,2);
+    line-height:1%;
+    width: 100%;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    letter-spacing:1px;
+}
+
+.emission .mainHeader nav ul li {
+    float: left;
+    display: inline;
+    width:50%;
+}
+
+.emission .mainHeader nav a:link,
+ .emission  .mainHeader nav a:visited {
+    color: black;
+    display: inline-block;
+    width: 249px;
+    padding: 20px 0px;
+    text-align: center;
+}
+
+.emission .mainHeader nav a:hover,
+ .emission .mainHeader nav a:active, .mainHeader nav .active a:link,
+  .emission  .mainHeader nav .active a:visited {
+    color: white;
+    background-color: black;
+}
+*/
 /**** Inline   ****/
 .emission-inline {
     padding:0.5em;
@@ -354,6 +401,16 @@ nav.menu li{
        float:left;
        margin-right:1em;
 }
+/*
+.emission-inline .date span {
+       display:inline-block;
+       font-family: RegloBold;
+       text-transform: uppercase;
+       font-size: @s;
+       line-height: 100%;
+}
+*/
+
 .emission-inline .controls {
     margin-top:0px;
     text-align: center;
@@ -474,7 +531,7 @@ ul.tagsArchives li {
 
 /**** PROGRAM ****/
 
-.program .dateBloc {
+#Program .dateBloc {
        float:left;
        padding-top:1em;
        margin-right:2em;

diff --git a/panikweb_templates/templates/emissions/detail.html b/panikweb_templates/templates/emissions/detail.html
index eca86113be4e88c491c4945007cee1337e2367fe..3086008af40aa9c234bfda4182a39a8031dffa3d 100644 (file)
--- a/panikweb_templates/templates/emissions/detail.html
+++ b/panikweb_templates/templates/emissions/detail.html
@@ -20,7 +20,7 @@
                                <div class="time">9:00-9:30</div>
                        </div>
                        <button class="control todo">
-                               <span class="symbol huge">G</span>
+                               <span class="symbol">G</span>
                                <span class="listen">Écouter <!--la dernière--></span>
                        </button>
                        <div class="cf"></div>

diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html
index 2e93516438e998c2477889461b2deffb2accac68..4706785ce52a683260ae69cbabb1611bb51f69f4 100644 (file)
--- a/panikweb_templates/templates/program.html
+++ b/panikweb_templates/templates/program.html
@@ -3,7 +3,37 @@
 {% block main %}
 <div id="Program">
        <h1>Programme</h1>
-       {% include "includes/program.html" %}
 
+       <div class="tabs">
+         <ul class="custom">
+       {% for day in days %}
+           <li><a href="#Program-tabs-{{ day.datetime|date:"w" }}">{{ day.datetime|date:"D" }}</a></li>
+       {% endfor %}
+         </ul>
+
+       {% for day in days %}
+         <div id="Program-tabs-{{ day.datetime|date:"w" }}">
+
+         <ul class="custom emission-list">
+       
+      {% if day.schedules %}
+           {% for schedule in day.schedules %}
+               <li >
+                       <div class="date dateBloc">
+                               <div class="time">{{ schedule.datetime|date:"H:i" }}</div>
+                       </div>
+                       {% include "emissions/inline.html" with emission=schedule.emission %}           
+               </li>
+           {% endfor %}
+      {% else %}
+               <li>Rien!</li>
+      {% endif %}
+          </ul>
+
+          </div>
+
+       {% endfor %}
+
+       </div>
 </div>
 {% endblock %}