From: Jérémy Fabre <blackmagik88@gmail.com>
Date: Tue, 12 Jul 2016 14:27:04 +0000 (+0200)
Subject: Merge branch 'dev' into wip
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=92110820b76bd82ae56135acd71669a21437abbe;p=mezzo.git

Merge branch 'dev' into wip
---

92110820b76bd82ae56135acd71669a21437abbe
diff --cc app/templates/base.html
index 11e778d2,dc32db22..39d6deb8
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@@ -79,7 -74,38 +79,7 @@@
          <div class="navigation" role="navigation">
              {% page_menu "pages/menus/header.html" %}
          </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">
 -                        <a href="https://www.facebook.com/iIRCAM" class="btn-icon--facebook" target="_blank">
 -                            <i class="icon icon__facebook-f"></i>
 -                        </a>
 -                    </li>
 -                    <li class="nav__complementary__item--twitter">
 -                        <a href="https://twitter.com/ircam" class="btn-icon--twitter" target="_blank">
 -                            <i class="icon icon__twitter"></i>
 -                        </a>
 -                    </li>
 -                    {% if settings.USE_MODELTRANSLATION and languages|length > 1 %}
 -                        {% for language in languages %}
 -                            <li class="nav__complementary__item__lang {% if language.code == LANGUAGE_CODE %}is-active{% endif %}">
 -                                <a href="#" onclick="$('#language_selector_select').val('{{ language.code }}'); $('#language_selector_form').submit();">
 -                                  {{ language.code|title }}
 -                                </a>
 -                            </li>
 -                        {% endfor %}
 -                    {% endif %}
 -                </ul>
 -            </div>
 -        </div>
++        
      </div>
  
      {% if on_home %}