relayout main news page

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 113ac72d976e4fcbb3096f780b8f6fc5944f2041..6f1acd911885215fccfe494024a298812f82be75 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -346,6 +346,14 @@ body{
        #Emissions div.mainSub ul li {
        }
 
+       #News .news.wrapper {
+               padding: 0;
+       }
+
+       #News .news.wrapper li a {
+               margin-left: 0;
+               padding-left: 0;
+       }
 
 }
 

diff --git a/panikweb_templates/templates/news.html b/panikweb_templates/templates/news.html
index 0cd955855fc17d6813cc55f62eb5c4f171fd2ff9..e670f0ee0b3c77ec0e10166d35bdf78f5b711a84 100644 (file)
--- a/panikweb_templates/templates/news.html
+++ b/panikweb_templates/templates/news.html
@@ -8,10 +8,11 @@
        {% news_nav %}
 {% endblock %}
 {% block main %}
-<div class="news">
+<div class="news wrapper navigation">
+   <div class="leftPart">
        {% with news|slice:"0:3" as news %}
        <div class="wrapper">
-               <ul class="custom columns news newsSpecial cf by3">
+               <ul class="custom columns news newsSpecial cf by2">
                {% for content in news %}
                        <li class="item">
                                {% news_inline klass="special"%}
@@ -31,6 +32,30 @@
                </ul>
        </div>
        {% endwith %}
+    </div>
+               <div class="rightPart">
+                               <div class="sub">
+                       {% if newsitem.emission %}
+                                           <h5 class="sectionLabel">proposé par</h5>
+                                           {% with newsitem.emission as emission %}
+                                                   <div class="">{% emission_resume %}</div>
+                                           {% endwith %}
+                       {% endif %}
+                                       <h5 class="sectionLabel right">
+                        <a href="{% url 'newsArchives' %}">
+                                           <span class="iconLabel">Toutes</span>
+                                   </a>
+                    </h5>
+                                       <h5 class="sectionLabel">
+                            <span class="iconLabel">Dernières actus</span>
+                    </h5>
+                                               <ul class="custom list">
+                                               {% for content in news %}
+                                                       {% if content != newsitem %}<li>{% news_inline %}</li>{% endif %}
+                                               {% endfor %}
+                                               </ul>
+                               </div>
+               </div>
 </div>
 {% endblock %}
 {% block links %}
@@ -46,5 +71,6 @@
                {% endfor %}
                </ul>
        </div>
+    </div>
 </div>
 {% endblock %}

diff --git a/panikweb_templates/templates/news/nav.html b/panikweb_templates/templates/news/nav.html
index d28154d6b15d7708fb850cb16263c623cbc43d1e..1f293e14a326fb1b59ac10ae6d377b8aa7a4946e 100644 (file)
--- a/panikweb_templates/templates/news/nav.html
+++ b/panikweb_templates/templates/news/nav.html
@@ -1,4 +1,4 @@
-<div class="mainSub">
+<div class="mainSub" style="display: none">
     <div class="wrapper">
         <nav>
         <form method="get" action="{% url 'newsArchives' %}" class="big marged" id="search-form">