From: Guillaume Pellerin Date: Wed, 22 Feb 2017 10:04:50 +0000 (+0100) Subject: Merge branch 'dev' into feature/themes X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fd7bc58fcc8dd21d1133055f902bbb7856142b0d;p=mezzo.git Merge branch 'dev' into feature/themes --- fd7bc58fcc8dd21d1133055f902bbb7856142b0d diff --cc app/themes/base/templates/base.html index 854ca913,00000000..701b6a98 mode 100644,000000..100644 --- a/app/themes/base/templates/base.html +++ b/app/themes/base/templates/base.html @@@ -1,120 -1,0 +1,112 @@@ + + +{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %} +{% get_language_info_list for LANGUAGES as languages %} + + + + + + + {% spaceless %}{% block meta_title %}{% endblock %}{% endspaceless %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %} + + + + + + + + + + + + + + + + {% compress css %} + + + + + + + {% endcompress %} + + {% block extra_head %}{% endblock %} + + + + {% spaceless %} + -
- {% include "includes/sidebar.html" %} -
- -
-
- -
- -
-
-
- -
-
++ {% block sidebar %} ++
++ {% include "includes/sidebar.html" %} +
++ {% endblock %} + -
- -
-
- {% block content_header %}{% endblock %} - {% block main %}{% endblock %} - {% block content_footer %}{% endblock %} -
- -
-
- -
-
- {% trans "Instagram feed" %} #ircam -
- -
- {% include "includes/instagram.html" %} -
-
- -
-
- {% trans "Twitter feed" %} -
-
- {% include "twitter/tweets.html" %} ++ {% block site_overlay %} ++
++
++ {% endblock %} ++ ++ {% block header %} ++
++
++
++
++ +
+
- +
+
++ {% endblock %} ++ ++ {% block container %} ++
++
++ {% block content_header %}{% endblock %} ++ {% block main %}{% endblock %} ++ {% block content_footer %}{% endblock %} ++
++ ++ {% block social %} ++ {% include "includes/social.html" %} ++ {% endblock %} ++ ++ {% block footer %} ++
++ {% include "includes/footer.html" %} ++
++ {% endblock %} ++
++ {% endblock %} + -
- {% include "includes/footer.html" %} -
-
- ++ {% block overlay_container %} +
+ + +
+
+
- +
+
+ +
+
+
+
++ {% endblock %} + + {% search_form %} - {% include "includes/footer_scripts.html" %} ++ ++ {% block footer_scripts %} ++ {% include "includes/footer_scripts.html" %} ++ {% endblock %} ++ + {% endspaceless %} + + +