From 312609b0362a292041b38a2c2a528ef2d5e55b68 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 22 Jun 2016 17:25:21 +0200
Subject: [PATCH] cleanup

---
 app/templates/base.html  | 42 +++++++---------------------------------
 app/templates/index.html |  9 ---------
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index f6952682..371a4d8d 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -59,6 +59,12 @@
         </div>
 
         <div class="nav__complementary">
+
+            {% nevercache %}
+            {% include "includes/language_selector.html" %}
+            {# {% include "includes/user_panel.html" %} #}
+            {% endnevercache %}
+
             <div class="container">
                 <ul class="nav__complementary__list">
                     <li class="nav__complementary__item--facebook">
@@ -112,6 +118,7 @@
 
     <div class="site__content">
         <div class="container">
+
             <main class="main" role="main">
                 {% featured_breaking_news_content as bk_content %}
                 {% if on_home and bk_content %}
@@ -125,7 +132,6 @@
                             <div class="media-content bk__news__content">
                                     {{ bk_content|safe }}
                             </div>
-
                         </div>
                     </div>
                 {% endif %}
@@ -136,40 +142,6 @@
                 {% endblock %}
                 {% block main %}{% endblock %}
             </main>
-
-            <aside class="aside {% if on_home %}aside-home{% endif %}">
-                <div class="search__form">
-                    {% search_form "all" %}
-                </div>
-
-                {% include "includes/calendar.html" %}
-                {% include "includes/twitter.html" %}
-                {% include "includes/instafeed.html" %}
-
-                <h2 class="sidebar__title">{% trans "Playlist" %}</h2>
-                {% for item in featured_list %}
-                 {% if item|get_class == 'Playlist' %}
-                  {% with item as playlist %}
-                    {% include 'festival/inc/audio_playlist.html' %}
-                  {% endwith %}
-                 {% endif %}
-                {% endfor %}
-
-                <div class="cta__panel">
-                    <div>
-                        <a href="/media/uploads/doc/MANIFESTE-2016-AGENDA.pdf" class="btn btn-full btn-inverse">{% trans "Download the brochure" %}</a>
-                    </div>
-                    <div>
-                        <a href="/newsletter/" class="btn btn-full btn-inverse">{% trans "Subscribe to newsletter" %}</a>
-                    </div>
-                </div>
-
-                {% nevercache %}
-                {% include "includes/language_selector.html" %}
-                {# {% include "includes/user_panel.html" %} #}
-                {% endnevercache %}
-
-            </aside>
         </div>
     </div>
 
diff --git a/app/templates/index.html b/app/templates/index.html
index 4b2fecb8..a315a7ce 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -11,14 +11,6 @@
 
 {% block main %}
 
-{# <h2 class="section__title">{% trans "Edito" %}</h2>#}
-
-{% featured_edito as edito %}
-{{ edito.content|safe|slice:":591" }}
-<br>
-<a href="{% url 'page' edito.slug %}" class="event__meta__btn">{% trans "Read the edito" %}</a>
-<br>
-
 <div class="last__media">
     <h2 class="section__title">{% trans "Featured" %}</h2>
     <div class="msry__container">
@@ -46,5 +38,4 @@
     </div>
 </div>
 
-
 {% endblock %}
-- 
2.39.5