Added blocks to and updated base.twig

hassankhan · Nov 11, 2013 · 30a1ce1 · 30a1ce1
1 parent 471a8a1
commit 30a1ce1
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/templates/base.twig b/templates/base.twig
@@ -10,20 +10,23 @@
 	<meta name="robots" content="{{ meta.robots }}">
 {% endif %}
 
+{% block css %}
 	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
 	<link rel="stylesheet" href="{{ base_dir }}/assets/css/style.css" type="text/css" />
+{% endblock %}
 
-	<script src="{{ base_dir }}/assets/js/modernizr-2.6.1.min.js"></script>
 </head>
 <body>
 
 	<header id="header">
 		<div class="inner clearfix">
 			<h1><a href="{{ base_url }}">{{ site_title }}</a></h1>
 			<ul class="nav">
-				{# {% for page in pages %}
-				<li><a href="{{ page.url }}">{{ page.title }}</a></li>
-				{% endfor %} #}
+			{% block nav %}
+				{% for item in nav %}
+				<li><a href="{{ item.url }}">{{ item.title }}</a></li>
+				{% endfor %}
+			{% endblock %}
 			</ul>
 		</div>
 	</header>
@@ -35,10 +38,19 @@
 	</section>
 
 	<footer id="footer">
+{% block footer %}
 		<div class="inner">
-			<a href="http://pico.dev7studios.com">Zepto</a> was made by <a href="http://hassankhan.me">Hassan Khan</a>.
+			<a href="https://github.com/hassankhan/Zepto">Zepto</a> was made by <a href="http://hassankhan.me">Hassan Khan</a>.
 		</div>
+{% endblock %}
 	</footer>
 
+{% block js %}
+	<!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="{{ base_dir }}/assets/js/modernizr-2.6.1.min.js"></script>
+{% endblock %}
+
 </body>
 </html>