From 88132e2b173b87a3a577ba44a5ba2e43009bf456 Mon Sep 17 00:00:00 2001
From: theshka <tyler@heshka.com>
Date: Mon, 30 Nov 2015 22:51:23 -0600
Subject: [PATCH] prefix blog includes

---
 themes/default/blog-post-full.twig              | 15 ++-------------
 themes/default/blog-post.twig                   | 17 +++--------------
 themes/default/blog.twig                        | 16 ++--------------
 .../{breadcrumb.twig => blog-breadcrumb.twig}   |  0
 themes/default/includes/blog-list.twig          | 13 +++++++++++++
 themes/default/includes/blog-meta.twig          | 12 ++++++++++++
 .../{sidebar.twig => blog-sidebar.twig}         |  0
 7 files changed, 32 insertions(+), 41 deletions(-)
 rename themes/default/includes/{breadcrumb.twig => blog-breadcrumb.twig} (100%)
 create mode 100644 themes/default/includes/blog-list.twig
 create mode 100644 themes/default/includes/blog-meta.twig
 rename themes/default/includes/{sidebar.twig => blog-sidebar.twig} (100%)

diff --git a/themes/default/blog-post-full.twig b/themes/default/blog-post-full.twig
index 7f73cc9..dd179cb 100644
--- a/themes/default/blog-post-full.twig
+++ b/themes/default/blog-post-full.twig
@@ -6,23 +6,12 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12">
-                {% include 'includes/breadcrumb.twig' %}
+                {% include 'includes/blog-breadcrumb.twig' %}
             </div>
         </div>
         <div class="row">
             <div class="col-sm-12">
-                <div class="blog-post">
-                    <h2 class="blog-post-title">{{ meta.title }}</h2>
-                    <p class="blog-post-meta">
-                        <i class="fa fa-calendar"></i> {{ meta.date }}
-                        by <a href="{{ meta.author|link}}">{{ meta.author }}</a>
-                    </p>
-                    <hr>
-                    {% if meta.image %}
-                        <img src="{{ meta.image }}" class="img-responsive" alt="{{ meta.image }}" /><br>
-                    {% endif %}
-                    {{content}}
-                </div>
+                {% include 'includes/blog-meta.twig' %}
             </div>
         </div>
     </div>
diff --git a/themes/default/blog-post.twig b/themes/default/blog-post.twig
index 21092cf..7eb35da 100644
--- a/themes/default/blog-post.twig
+++ b/themes/default/blog-post.twig
@@ -6,26 +6,15 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12">
-                {% include 'includes/breadcrumb.twig' %}
+                {% include 'includes/blog-breadcrumb.twig' %}
             </div>
         </div>
         <div class="row">
             <div class="col-sm-8">
-                <div class="blog-post">
-                    <h2 class="blog-post-title">{{ meta.title }}</h2>
-                    <p class="blog-post-meta">
-                        <i class="fa fa-calendar"></i> {{ meta.date }}
-                        by <a href="{{ meta.author|link}}">{{ meta.author }}</a>
-                    </p>
-                    <hr>
-                    {% if meta.image %}
-                        <img src="{{ meta.image }}" class="img-responsive" alt="{{ meta.image }}" /><br>
-                    {% endif %}
-                    {{content}}
-                </div>
+                {% include 'includes/blog-meta.twig' %}
             </div>
             <div class="col-sm-3 col-sm-offset-1">
-                {% include 'includes/sidebar.twig' %}
+                {% include 'includes/blog-sidebar.twig' %}
             </div>
         </div>
     </div>
diff --git a/themes/default/blog.twig b/themes/default/blog.twig
index fbf1494..3718712 100644
--- a/themes/default/blog.twig
+++ b/themes/default/blog.twig
@@ -6,22 +6,10 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-8">
-                {% for page in pages|sort_by("time")|reverse %}
-                    {% if page.id starts with "blog/" %}
-                        <div class="blog-post">
-                            <h2 class="blog-post-title"><a href="{{ page.url }}">{{ page.title }}</a></h2>
-                            <p class="blog-post-meta">
-                                <i class="fa fa-calendar"></i> {{ page.date }}
-                                by <a href="{{ page.author|link }}">{{ page.author }}</a>
-                            </p>
-                            {{ page.description|slice(0, 500) }}
-                        </div>
-                        <hr>
-                    {% endif %}
-                {% endfor %}
+                {% include 'includes/blog-list.twig' %}
             </div>
             <div class="col-sm-3 col-sm-offset-1">
-                {% include 'includes/sidebar.twig' %}
+                {% include 'includes/blog-sidebar.twig' %}
             </div>
         </div>
     </div>
diff --git a/themes/default/includes/breadcrumb.twig b/themes/default/includes/blog-breadcrumb.twig
similarity index 100%
rename from themes/default/includes/breadcrumb.twig
rename to themes/default/includes/blog-breadcrumb.twig
diff --git a/themes/default/includes/blog-list.twig b/themes/default/includes/blog-list.twig
new file mode 100644
index 0000000..698a022
--- /dev/null
+++ b/themes/default/includes/blog-list.twig
@@ -0,0 +1,13 @@
+{% for page in pages|sort_by("time")|reverse %}
+    {% if page.id starts with "blog/" %}
+        <div class="blog-post">
+            <h2 class="blog-post-title"><a href="{{ page.url }}">{{ page.title }}</a></h2>
+            <p class="blog-post-meta">
+                <i class="fa fa-calendar"></i> {{ page.date }}
+                by <strong>{{ page.author }}</strong>
+            </p>
+            {{ page.description|slice(0, 500) }}
+        </div>
+        <hr>
+    {% endif %}
+{% endfor %}
diff --git a/themes/default/includes/blog-meta.twig b/themes/default/includes/blog-meta.twig
new file mode 100644
index 0000000..46a21df
--- /dev/null
+++ b/themes/default/includes/blog-meta.twig
@@ -0,0 +1,12 @@
+<div class="blog-post">
+    <h2 class="blog-post-title">{{ meta.title }}</h2>
+    <p class="blog-post-meta">
+        <i class="fa fa-calendar"></i> {{ meta.date }}
+        by <strong>{{ meta.author }}</strong>
+    </p>
+    <hr>
+    {% if meta.image %}
+        <img src="{{ meta.image }}" class="img-responsive" alt="{{ meta.image }}" /><br>
+    {% endif %}
+    {{content}}
+</div>
diff --git a/themes/default/includes/sidebar.twig b/themes/default/includes/blog-sidebar.twig
similarity index 100%
rename from themes/default/includes/sidebar.twig
rename to themes/default/includes/blog-sidebar.twig