From: Guillaume Pellerin Date: Wed, 22 Feb 2017 10:04:37 +0000 (+0100) Subject: Add various blocks X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e67d761a504e37e2de045aa5037f87c9fcbc6ac0;p=mezzo.git Add various blocks --- diff --git a/app/templates/base.html b/app/templates/base.html index 854ca913..701b6a98 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -39,71 +39,58 @@ {% 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 %} + + {% endblock %} +

+ {% endblock %} - -

- + {% block overlay_container %}

@@ -111,9 +98,14 @@

+ {% endblock %} {% search_form %} - {% include "includes/footer_scripts.html" %} + + {% block footer_scripts %} + {% include "includes/footer_scripts.html" %} + {% endblock %} + {% endspaceless %} diff --git a/app/templates/includes/social.html b/app/templates/includes/social.html new file mode 100644 index 00000000..863a26f0 --- /dev/null +++ b/app/templates/includes/social.html @@ -0,0 +1,22 @@ +{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %} + +

+ {% trans "Instagram feed" %} #ircam +

+ {% include "includes/instagram.html" %} +

+ {% trans "Twitter feed" %} +

+ {% include "twitter/tweets.html" %} +