From 66148bb245a35ef5d8adc47b85753510bdbfb9db Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.co.uk>
Date: Thu, 28 May 2015 17:58:07 +0100
Subject: [PATCH] Move content to partials

---
 source/_layouts/default.html.twig  | 38 ++----------------------------
 source/_partials/navbar.html.twig  | 22 +++++++++++++++++
 source/_partials/sidebar.html.twig | 14 +++++++++++
 3 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 source/_partials/navbar.html.twig
 create mode 100644 source/_partials/sidebar.html.twig

diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 4cd8dac6..403da0ec 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -23,28 +23,7 @@
     {% block styles %}{% endblock %}
   </head>
   <body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
-        </div>
-
-        <div id="navbar" class="collapse navbar-collapse">
-          <ul class="nav navbar-nav" role="navigation">
-            <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
-            {% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
-              <li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
-            {% endfor %}
-          </ul>
-        </div>{# .nav-collapse #}
-      </div>
-    </nav>
+    {% include 'navbar' %}
 
     <div class="container">
       <div class="row">
@@ -54,20 +33,7 @@
           {% endblock %}
         </div>
 
-        <div class="col-md-2">
-          <section class="block block--da_member">
-            <h2>Drupal Association</h2>
-            <a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
-              <img src="/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
-            </a>
-          </section>
-
-          <section class="block block--drupalcon_la">
-            <h2>DrupalCon LA</h2>
-            <img src="/assets/images/drupalcon-la-attending.png" alt="">
-            <img src="/assets/images/drupalcon-la-sprinter.png" alt="">
-          </section>
-        </div>
+        {% include 'sidebar' %}
       </div>{# .row #}
     </div>{# .container #}
 
diff --git a/source/_partials/navbar.html.twig b/source/_partials/navbar.html.twig
new file mode 100644
index 00000000..7f62aa81
--- /dev/null
+++ b/source/_partials/navbar.html.twig
@@ -0,0 +1,22 @@
+<nav class="navbar navbar-inverse navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
+    </div>
+
+    <div id="navbar" class="collapse navbar-collapse">
+      <ul class="nav navbar-nav" role="navigation">
+        <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
+        {% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
+          <li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
+        {% endfor %}
+      </ul>
+    </div>{# .nav-collapse #}
+  </div>
+</nav>
\ No newline at end of file
diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig
new file mode 100644
index 00000000..2dde6d28
--- /dev/null
+++ b/source/_partials/sidebar.html.twig
@@ -0,0 +1,14 @@
+<div class="col-md-2">
+  <section class="block block--da_member">
+    <h2>Drupal Association</h2>
+    <a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
+      <img src="/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
+    </a>
+  </section>
+
+  <section class="block block--drupalcon_la">
+    <h2>DrupalCon LA</h2>
+    <img src="/assets/images/drupalcon-la-attending.png" alt="">
+    <img src="/assets/images/drupalcon-la-sprinter.png" alt="">
+  </section>
+</div>
\ No newline at end of file