]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into wip
authorJérémy Fabre <blackmagik88@gmail.com>
Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)
committerJérémy Fabre <blackmagik88@gmail.com>
Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)
1  2 
app/templates/base.html

index 11e778d2b0c0380bbd2e8008258bbaee6948b6db,dc32db22c4959c0c762de85830d39702efed16a6..39d6deb8b3b92cc34ad6f959dee99288f83b7615
          <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 %}