give nonstop zones their own lines in week view

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 40237d8331b2a98a1d86755f6c46a7dd469d9a44..3a7be8f48bf9161606bd0a7878f1ecf0ec01c9e9 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -808,7 +808,7 @@ ul.newsSpecial{
        margin-left:5em;
 }
 .program .nonstop {
-       text-align:right;
+       text-align:left;
 }
 .program-week .programDate{
        float:left;
@@ -827,8 +827,8 @@ ul.newsSpecial{
 }
 .program-week a.nonstop{
        font-size:0.9em;
-       float:right;
        margin:0.1em;
+       color: #888;
 }
 .program-week .inline,.program-week .resume{padding:0;}
 .program-week .description{color:#aaa;}

diff --git a/panikweb_templates/templates/includes/week.html b/panikweb_templates/templates/includes/week.html
index 273ad22d39cb8496c9b931456403374cbb7707c6..c9e564e6279545b93e635c8bc5d0999f2f8e362a 100644 (file)
--- a/panikweb_templates/templates/includes/week.html
+++ b/panikweb_templates/templates/includes/week.html
@@ -20,31 +20,22 @@
        {% for day in days %}
        <div data-tabbed="true" class="content" id="Program-week-{{ day.datetime|slugify }}">
                <ul class="custom program-week list">
-               {% with day.cells as cells %}
-                       {% regroup cells by datetime|date:"H:i" as time_list %}
-                       {% if time_list %}
-                               {% for cell in time_list %}
-                                       <li class="cf {% if cell.list|dictsort:"label" %}nonStop{% endif %}">
-                                               <div class="programDate"><strong>{{ cell.grouper }}</strong></div>
-
-                                               <div class="programCell">
-                                               {% for cell in cell.list %}
-                                                       {% if cell.episode %}
-                                                               {% with  cell.episode as episode %}{% episode_resume model="inline" klass="standalone" date=False %}{% endwith %}
-                                                       {% elif cell.emission %}
-                                                               {% with cell.emission as emission %}{% emission_resume %}{% endwith %}
-                                                       {% else %}
-                                                               <a href="{% url 'emission-view' slug=cell.slug %}" class="inBlock nonstop box smooth">Musique en continu : <em>{{ cell.label }}</em></a>
-                                                       {% endif %}
-                                               {% endfor %}
-                                               </div>
-                                       </li>
-                               {% endfor %}
-                       {% else %}
-                               <li><div class="info big">Non stop only!</div></li>
-                       {% endif %}
-               
-               {% endwith %}
+               {% for cell in day.cells %}
+                       <li class="cf">
+                               <div class="programDate"><strong>{{ cell.datetime|date:"H:i" }}</strong></div>
+                               <div class="programCell">
+                               {% if cell.episode %}
+                                       {% with  cell.episode as episode %}{% episode_resume model="inline" klass="standalone" date=False %}{% endwith %}
+                               {% elif cell.emission %}
+                                       {% with cell.emission as emission %}{% emission_resume %}{% endwith %}
+                               {% else %}
+                                       <a href="{% url 'emission-view' slug=cell.slug %}" class="nonstop">Musique en continu : <em>{{ cell.label }}</em></a>
+                               {% endif %}
+                               </div>
+                       </li>
+               {% empty %}
+                       <li><div class="info big">Non stop only!</div></li>
+               {% endfor %}
                </ul>
        </div>
        {% endfor %}