Replacing bloc 'content' by bloc 'main' for whole page displays

diff --git a/panikweb/views.py b/panikweb/views.py
index 0f491469f90c4873120e5c6decd549cc712788d6..772490e90e9bc9f6bbac69d4482e92c0694137cc 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -162,7 +162,7 @@ class Player(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super(Player, self).get_context_data(**kwargs)
-        #context['emissions'] = Emission.objects.all().order_by('title')
+        context['emissions'] = Emission.objects.all().order_by('title')
         return context
 
 player = Player.as_view()

diff --git a/panikweb_templates/static/css/style.less b/panikweb_templates/static/css/style.less
index 3598d9f0a05b91237350dba013992ffec45f512a..f59f3ea4928ac49015525c7fac7f3f9269d7d27c 100644 (file)
--- a/panikweb_templates/static/css/style.less
+++ b/panikweb_templates/static/css/style.less
@@ -216,13 +216,13 @@ body {
 #player .symbol{
     color: @orange;    
     font-size: @xxl;
-    line-height: 80%;
 }
 #player .direct .control {
        font-size: @xxxl;
        position:absolute;
-       left:80px;
+       left:50%;
        top:30px;
+       margin-left:-@xxl/2;
 }
 
 #Home #player{
@@ -291,9 +291,12 @@ body {
        min-height:60px;
        margin:20px 0;
 }
-    
-.playlist img {
+   
+#player img {
        border: 2px solid @orange;
+} 
+.direct img {
+       width:100%;
 }
 .playlist .item img{
        float:left;

diff --git a/panikweb_templates/templates/grid.html b/panikweb_templates/templates/grid.html
index 5eb4b52f3f26812049391f598f5114d7610d6c96..4dc2f273dfc7dbc51d833286eaf15eaf16495272 100644 (file)
--- a/panikweb_templates/templates/grid.html
+++ b/panikweb_templates/templates/grid.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load paniktags %}
 
-{% block content %}
+{% block main %}
 
 <style>
     #grille table, #grille tr, #grille td {

diff --git a/panikweb_templates/templates/player/detail.html b/panikweb_templates/templates/player/detail.html
index b5bda1dbdeaf16fc8631b596b439f3f4b37ace13..80e844e11e4c8c06e8bfa3ed5e0c4bc36dc99c4d 100644 (file)
--- a/panikweb_templates/templates/player/detail.html
+++ b/panikweb_templates/templates/player/detail.html
@@ -29,7 +29,6 @@
                        <h5>The croissant fertile</h5>
                        <p>The sound of the RCA electronic music synthesizer</p>
                </div>
-
                <div class="item">
                        <img src="http://placehold.it/50X50" />
                        <h5>The croissant fertile</h5>

diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html
index 5490271bf4a57e6161061c9aadda5a19a619ad58..7546d117395a873bdbd93e2e1a91685652d7b261 100644 (file)
--- a/panikweb_templates/templates/program.html
+++ b/panikweb_templates/templates/program.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block content %}
+{% block main %}
 
 <h2>Programme</h2>