Give some nav to news & allow resizing for logos

diff --git a/panikweb/views.py b/panikweb/views.py
index a95891d483e7bb93b1af3eb00095e56be5be9ddb..10115c5f51a5ba4c0ad3ff9b0680ccec47cafe2a 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -432,6 +432,7 @@ class NewsItemView(DetailView):
         context['sectionName'] = "News"
         context['focus'] = list(NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:9])
         context['categories'] = NewsCategory.objects.all()
+        context['news'] = NewsItem.objects.all().exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:10]
         return context
 newsitemview = NewsItemView.as_view()
 

diff --git a/panikweb_templates/templates/emissions/newsitem_detail.html b/panikweb_templates/templates/emissions/newsitem_detail.html
index 718c3a98831c2823f6b02cc1e02bb1d8fbb89caf..582734815dce1bb8ee65c67ed286c84d1401835d 100644 (file)
--- a/panikweb_templates/templates/emissions/newsitem_detail.html
+++ b/panikweb_templates/templates/emissions/newsitem_detail.html
@@ -4,33 +4,39 @@
 {% block title %}{{ newsitem.title }}{% endblock %}
 {% block main %}
 <div class="detail padded news cf">
-       <div class="wrapper text">
+       <div class="wrapper navigation">
                <div class="leftPart">
                        <header>
                                {% if newsitem.date %}
                                        <div class="date cf center label">{{ newsitem.date|date:"D m M Y" }}</div>
                                {% endif %}
-                               <h3 class="squashed title">
+                               <h2 class="squashed title">
                                        {{ newsitem.title }}
-                               </h3>
+                               </h2>
                        </header>
                        {% if newsitem.image %}
-                               <img class="logo right" src="{{ newsitem.image.url }}"/>
+                               <img class="logo right button" onclick="$(this).toggleClass('right marged');" src="{{ newsitem.image.url }}"/>
                        {% endif %}
                        <div class="userContent description">   
                                {{ newsitem.text|safe}}
                        </div>
                </div>
-               {% if newsitem.emission %}
                <div class="rightPart">
                                <div class="sub">
-                                       <h5 class="sectionLabel">proposé par</h5>
-                                       {% with newsitem.emission as emission %}
-                                               <div class="">{% emission_resume %}</div>
-                                       {% endwith %}
+                       {% if newsitem.emission %}
+                                           <h5 class="sectionLabel">proposé par</h5>
+                                           {% with newsitem.emission as emission %}
+                                                   <div class="">{% emission_resume %}</div>
+                                           {% endwith %}
+                       {% endif %}
+                                       <h5 class="sectionLabel">Dernières news</h5>
+                                               <ul class="custom list">
+                                               {% for content in news %}
+                                                       <li>{% news_inline %}</li>
+                                               {% endfor %}
+                                               </ul>
                                </div>
                </div>
-               {% endif %}
        </div>
 </div>
 {% endblock %}