Merge branch 'master' into wip/three-columns

[panikweb.git] / panikweb_templates / templates / news.html

diff --git a/panikweb_templates/templates/news.html b/panikweb_templates/templates/news.html
index e670f0ee0b3c77ec0e10166d35bdf78f5b711a84..08c72cfaffa8f310790044c8ee405f3c8129f830 100644 (file)
--- a/panikweb_templates/templates/news.html
+++ b/panikweb_templates/templates/news.html
@@ -1,5 +1,6 @@
 {% extends "base.html"%}
 {% load paniktags %}
+{% load i18n %}
 {% block title %}News{% endblock %}
 {% block toptitle %}
 <h1 class="top">Actus</h1>
@@ -8,38 +9,29 @@
        {% news_nav %}
 {% endblock %}
 {% block main %}
-<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 by2">
-               {% for content in news %}
-                       <li class="item">
-                               {% news_inline klass="special"%}
-                       </li>
-               {% endfor %}
-               </ul>
-       </div>
-       {% endwith %}
-       {% with news|slice:"3:" as news %}
-       <div class="wrapper">
-               <ul class="custom columns list news cf">
-               {% for content in news %}
-                       <li class="item">
-                               {% news_inline%}
-                       </li>
-               {% endfor %}
-               </ul>
-       </div>
-       {% endwith %}
-    </div>
+<div class="detail marged news cf">
+       <div class="wrapper navigation">
+               <div class="leftPart">
+            <div class="news">
+                                   <h5 class="sectionLabel">Focus</h5>
+                   {% with focus as news %}
+                           <ul class="custom columns cf padded">
+                           {% for content in news %}
+                                   <li class="">
+                                           {% news_inline klass="special"%}
+                                   </li>
+                           {% endfor %}
+                           </ul>
+                   {% endwith %}
+            </div>
+               </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 %}
+                                   <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' %}">
@@ -48,14 +40,16 @@
                     </h5>
                                        <h5 class="sectionLabel">
                             <span class="iconLabel">Dernières actus</span>
+                            <a class="button icon-rss inBlock" title="{% trans 'Rss news' %}" href="{% url 'rss-feed' %}"></a>
                     </h5>
-                                               <ul class="custom list">
+                                               <ul class="custom list newsList">
                                                {% for content in news %}
-                                                       {% if content != newsitem %}<li>{% news_inline %}</li>{% endif %}
+                                                       <li class="{% if content == newsitem %}current{% endif %}">{% news_inline %}</li>
                                                {% endfor %}
                                                </ul>
                                </div>
                </div>
+       </div>
 </div>
 {% endblock %}
 {% block links %}