]> git.parisson.com Git - mezzo.git/commitdiff
Add various blocks
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 10:04:37 +0000 (11:04 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 10:04:37 +0000 (11:04 +0100)
app/templates/base.html
app/templates/includes/social.html [new file with mode: 0644]

index 854ca913ae7e88b237b2e077ad577b9dbfeebe2d..701b6a987c6d51ee0477de1b8df0af91f690f3a5 100644 (file)
 <body id="{% block body_id %}body{% endblock %}" class="{% block body_class %}{% endblock %}">
     {% spaceless %}
 
-    <div class="pushy pushy-left">
-        {% include "includes/sidebar.html" %}
-    </div>
-
-    <div class="site-overlay">
-    </div>
-
-    <div class="header push">
-
-        <div class="container">
-            <div class="row header__nav">
-                <div class="col-md-16 tal">
-                    <div id="navHeader">
-                        {% page_menu "pages/menus/header.html" %}
-                    </div>
-                </div>
-            </div>
+    {% block sidebar %}
+        <div class="pushy pushy-left">
+            {% include "includes/sidebar.html" %}
         </div>
+    {% endblock %}
 
-    </div>
-
-    <div id="container">
-        <main class="main" role="main">
-            {% block content_header %}{% endblock %}
-            {% block main %}{% endblock %}
-            {% block content_footer %}{% endblock %}
-        </main>
-
-        <div class="section container">
-            <div class="row">
-
-                <div class="col-sm-8 tac">
-                    <div class="section-title section-title--uppercase section-title--underline section-title--accent">
-                        {% trans "Instagram feed" %} <a class="fcw" href="https://www.instagram.com/explore/tags/ircam/" target="_blank">#ircam</a>
-                    </div>
-
-                    <div>
-                        {% include "includes/instagram.html" %}
-                    </div>
-                </div>
-
-                <div class="col-sm-6 col-sm-push-1 tac">
-                    <div class="section-title section-title--uppercase section-title--underline section-title--main">
-                        {% trans "Twitter feed" %}
-                    </div>
-                    <div>
-                        {% include "twitter/tweets.html" %}
+    {% block site_overlay %}
+        <div class="site-overlay">
+        </div>
+    {% endblock %}
+
+    {% block header %}
+        <div class="header push">
+            <div class="container">
+                <div class="row header__nav">
+                    <div class="col-md-16 tal">
+                        <div id="navHeader">
+                            {% page_menu "pages/menus/header.html" %}
+                        </div>
                     </div>
                 </div>
-
             </div>
         </div>
+    {% endblock %}
+
+    {% block container %}
+        <div id="container">
+            <main class="main" role="main">
+                {% block content_header %}{% endblock %}
+                {% block main %}{% endblock %}
+                {% block content_footer %}{% endblock %}
+            </main>
+
+            {% block social %}
+                {% include "includes/social.html" %}
+            {% endblock %}
+
+            {% block footer %}
+                <footer class="footer" role="footer">
+                    {% include "includes/footer.html" %}
+                </footer>
+            {% endblock %}
+        </div>
+    {% endblock %}
 
-        <footer class="footer" role="footer">
-            {% include "includes/footer.html" %}
-        </footer>
-    </div>
-
+    {% block overlay_container %}
     <div class="overlay" id="overlay">
         <a href="#" id="overlayClose" class="overlay__close">
         </a>
         <div class="overlay__container">
             <div class="overlay__content">
                 <div id="overlayContent">
-
                 </div>
                 <div class="overlay__loader" id="overlayLoader">
                     <i class="loading"></i>
             </div>
         </div>
     </div>
+    {% endblock %}
 
     {% search_form %}
-    {% include "includes/footer_scripts.html" %}
+
+    {% block footer_scripts %}
+        {% include "includes/footer_scripts.html" %}
+    {% endblock %}
+
     {% endspaceless %}
 
 </body>
diff --git a/app/templates/includes/social.html b/app/templates/includes/social.html
new file mode 100644 (file)
index 0000000..863a26f
--- /dev/null
@@ -0,0 +1,22 @@
+{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %}
+
+<div class="section container">
+       <div class="row">
+               <div class="col-sm-8 tac">
+                       <div class="section-title section-title--uppercase section-title--underline section-title--accent">
+                               {% trans "Instagram feed" %} <a class="fcw" href="https://www.instagram.com/explore/tags/ircam/" target="_blank">#ircam</a>
+                       </div>
+                       <div>
+                               {% include "includes/instagram.html" %}
+                       </div>
+               </div>
+               <div class="col-sm-6 col-sm-push-1 tac">
+                       <div class="section-title section-title--uppercase section-title--underline section-title--main">
+                               {% trans "Twitter feed" %}
+                       </div>
+                       <div>
+                               {% include "twitter/tweets.html" %}
+                       </div>
+               </div>
+       </div>
+</div>