A lot of changes that are very destructive to the theme. But I needed and wanted them. Might clean up the template tree to be a bit less...hacky. But this works for now

9 files changed, 354 insertions, 171 deletions

diff --git a/static/css/nest.css b/static/css/nest.css
index 7c83391..619f508 100755
--- a/static/css/nest.css
+++ b/static/css/nest.css
@@ -7,17 +7,17 @@
 /* Responsive */
 @media (min-width: 768px) {
   .container {
-    width: 750px;
+    width: 760px;
   }
 }
 @media (min-width: 992px) {
   .container {
-    width: 850px;
+    width: 985px;
   }
 }
 @media (min-width: 1200px) {
   .container {
-    width: 850px;
+    width: 1195px;
   }
 }
 
@@ -26,14 +26,20 @@ body {
     font-family: "Open Sans", sans-serif;
     font-size: 16px;
     color: #4b505a;
-    background-color: #f5f5f5;
+    /*background-color: #f5f5f5;*/
+    background-image: url("../img/grey_2x.png");
     line-height: 24px;
     -webkit-font-smoothing:antialiased;
     text-rendering: optimizeLegibility;
 }
 
+div.hacky_bg {
+    background-image: url("../img/banner_bg2x.png");
+}
+
 div.home {
-	background-color: #252525;
+	/*background-color: #252525;*/
+    background-image: url("../img/banner_bg2x.png");
 }
 
 div.imgbar {
@@ -489,3 +495,7 @@ blockquote{
 .footer a{
     color: #fff;
 }
+
+
+
+/********** DIRTY DIRTY HACKS ***********/
diff --git a/static/img/banner_bg2x.png b/static/img/banner_bg2x.png
new file mode 100644
index 0000000..5cd4242
--- /dev/null
+++ b/static/img/banner_bg2x.png
diff --git a/static/img/cat.gif b/static/img/cat.gif
new file mode 100644
index 0000000..0bd2150
--- /dev/null
+++ b/static/img/cat.gif
diff --git a/static/img/grey_2x.png b/static/img/grey_2x.png
new file mode 100644
index 0000000..eba36c7
--- /dev/null
+++ b/static/img/grey_2x.png
diff --git a/templates/base.html b/templates/base.html
index cca740c..356eda0 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -56,17 +56,17 @@
         <![endif]-->
 
         {% if GOOGLE_ANALYTICS %}
-        <!-- Google Analytics -->
-        <script>
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-          ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
-          ga('send', 'pageview');
-        </script>
-        <!-- /Google Analytics -->
+            <!-- Google Analytics -->
+            <script>
+              (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+              (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+              m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+              })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+              ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
+              ga('send', 'pageview');
+            </script>
+            <!-- /Google Analytics -->
         {% endif %}
 
     {% endblock head %}
@@ -82,7 +82,7 @@
             <div class="container">
                 <div class="header-nav">
                     <div class="header-logo">
-                        <a class="pull-left" href="{{ SITEURL }}/"><img class="mr20" width=192px height=64px src="{{ SITEURL }}{{NEST_HEADER_LOGO or "/images/logo2.png" }}" alt="logo">{{ SITENAME }}</a>
+                        <a class="pull-left" href="{{ SITEURL }}/"><img class="mr20" width=192px height=64px src="{{ SITEURL }}{{NEST_HEADER_LOGO or "/images/logo2.png" }}" alt="logo"></a>
                     </div>
                     <div class="nav pull-right">
                         {% for title, link in MENUITEMS %}
@@ -112,8 +112,36 @@
 
 
         <!-- Content -->
-        {% block content %}
-        {% endblock %}
+
+        <div class="container">
+          <div class="row">
+
+            <!-- This is our content container in all it's glory -->
+            {% block content %}
+            {% endblock %}
+
+            <!-- Append the navigation box -->
+            <div class="col-lg-3 content archive">
+
+                <h3>Categories</h3>
+                <ul>
+                    {% for cat in categories %}
+                    <li><a href="{{ SITEURL }}/{{ cat[0].url }}">{{ cat[0] }}</a> ({{cat[1]|length}})</li>
+                    {% endfor %}
+                </ul>
+
+                <h3>Tags</h3>
+                <ul>
+                    {% for tag in tags %}
+                    <li><a href="{{ SITEURL }}/{{ tag[0].url }}">{{ tag[0] }}</a> ({{tag[1]|length}})</li>
+                    {% endfor %}
+                </ul>
+
+                <h3>A picture of a cat</h3>
+                <img src="{{ SITEURL }}/theme/img/cat.gif">
+
+            </div>
+        </div>
         <!-- /Content --> 
 
         <!-- Footer -->
diff --git a/templates/categories.html b/templates/categories.html
index 0c24668..a5a97a8 100755
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -26,18 +26,22 @@
 {% endblock header %}
 
 {% block content %}
-    <div class="archive-container">
-        <div class="container content archive">
-        	{% for category, articles in categories %}
-            <h2><a href="{{ SITEURL }}/{{ category.url }}">{{ category|capitalize }}</a></h2>
-            <dl class="dl-horizontal">
-            	{% for article in articles %}
-            	<dt>{{ article.locale_date}}</dt>
-            	<dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-            	{% endfor %}
-            </dl>
-            {% endfor %}
-        </div>
-    </div>
+
+<div class="col-lg-9 content archive">
+  
+  <h1>{{ category|capitalize }}</h1>
+  <dl class="dl-horizontal">
+
+    {% for category, articles in categories %}
+    <h2><a href="{{ SITEURL }}/{{ category.url }}">{{ category|capitalize }}</a></h2>
+    <dl class="dl-horizontal">
+      {% for article in articles %}
+      <dt>{{ article.locale_date}}</dt>
+      <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+      {% endfor %}
+    </dl>
+    {% endfor %}
+  </dl>
+</div>
 {% endblock content %}
 
diff --git a/templates/category.html b/templates/category.html
index f336b7c..3391cde 100755
--- a/templates/category.html
+++ b/templates/category.html
@@ -25,8 +25,9 @@
 {% endblock header %}
 
 {% block content %}
-<div class="container content archive">
 
+<div class="col-lg-9 content archive">
+  
   <h1>{{ category|capitalize }}</h1>
   <dl class="dl-horizontal">
 
@@ -40,4 +41,5 @@
     {% endfor %}
   </dl>
 </div>
+
 {% endblock content %}
diff --git a/templates/home.html b/templates/home.html
index 5b27875..46c6fbd 100755
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,20 +1,116 @@
-{% extends "base.html" %}
-
-{% block title %}{{ page.title }} - {{ super() }}{% endblock title %}
-{% block description %}{{ page.content|striptags|truncate(200)|escape }}{% endblock description %}
-
-{% block headerstyle %}
-    {% if page.illustration %}
-    <div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ page.illustration }}'); background-position: center; ">
-    {% elif NEST_HEADER_IMAGES %}
-    <div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ NEST_HEADER_IMAGES }}'); background-position: center; ">
-    {% else %}
-    <div class="header-container gradient">
-    {% endif %}
-{% endblock headerstyle %}
-
-{% block header %}
-    <div class="container header-wrapper">
+<!DOCTYPE html>
+<html lang="{{ DEFAULT_LANG }}">
+    <head>
+    {% block head %}
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" content="{% block description %}{% endblock description %}">
+        <meta name="keywords" content="{% block keywords %}{% endblock keywords %}">
+        <link rel="icon" href="{{ SITEURL }}/favicon.ico">
+
+        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
+
+        <!-- Stylesheets -->
+        {% if NEST_CSS_MINIFY %}
+        <link href="{{ SITEURL }}/theme/css/all.min.css" rel="stylesheet">
+        {% else %}
+        <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/fonts.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/nest.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
+        {% endif %}
+        <!-- /Stylesheets -->
+
+        <!-- RSS Feeds -->
+        {% if FEED_ALL_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
+        {% endif %}
+        {% if FEED_ALL_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+        {% endif %}
+        {% if FEED_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        {% endif %}
+        {% if FEED_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        {% endif %}
+        {% if CATEGORY_FEED_ATOM and category %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        {% endif %}
+        {% if CATEGORY_FEED_RSS and category %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        {% endif %}
+        {% if TAG_FEED_ATOM and tag %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        {% endif %}
+        {% if TAG_FEED_RSS and tag %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        {% endif %}
+        <!-- /RSS Feeds -->
+
+        <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+        <!--[if lt IE 9]>
+          <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+          <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+        <![endif]-->
+
+        {% if GOOGLE_ANALYTICS %}
+            <!-- Google Analytics -->
+            <script>
+              (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+              (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+              m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+              })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+              ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
+              ga('send', 'pageview');
+            </script>
+            <!-- /Google Analytics -->
+        {% endif %}
+
+    {% endblock head %}
+    </head>
+
+    <body>
+      <div class="hacky_bg">
+
+        <!-- Header -->
+        {% if page.illustration %}
+        <div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ page.illustration }}'); background-position: center; ">
+        {% elif NEST_HEADER_IMAGES %}
+        <div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ NEST_HEADER_IMAGES }}'); background-position: center; ">
+        {% else %}
+        <div class="header-container gradient">
+        {% endif %}
+
+            <!-- Static navbar -->
+            <div class="container">
+                <div class="header-nav">
+                    <div class="header-logo">
+                        <a class="pull-left" href="{{ SITEURL }}/"><img class="mr20" width=192px height=64px src="{{ SITEURL }}{{NEST_HEADER_LOGO or "/images/logo2.png" }}" alt="logo"></a>
+                    </div>
+                    <div class="nav pull-right">
+                        {% for title, link in MENUITEMS %}
+                            {% if 'http://' in link or 'https://' in link %}
+                                <a href="{{ link }}">{{ title }}</a>
+                            {% else %}
+                                <a href="{{ SITEURL }}{{ link }}">{{ title }}</a>
+                            {% endif %}
+                        {% endfor %}
+                        {% if DISPLAY_PAGES_ON_MENU %}
+                        {% for pg in PAGES %}
+                            <a {% if pg == page %} class="active"{% endif %} href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a>
+                        {% endfor %}
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+            <!-- /Static navbar -->
+
+            <!-- Header -->
+            {% block header %}
+            <div class="container header-wrapper">
         <div class="row">
               <div class="col-lg-12">
                   <div class="header-content">
@@ -24,88 +120,128 @@
               </div>
         </div>
     </div>
-{% endblock header %}
-
-
-{% block content %}
-<div class="home">
-    <div class="container content color_shit">
-      <!-- Displays the default content from the home page -->
-      {{ page.content }}
-      
-      <!-- Bootstrap rid container thingies with mobile views -->
-      <div class="row color_shit">
-        <div class="col-md-4 col-xs-12">
-          <h2><a href="pgp/spacekookie-on-the-tubes.txt">KEYS</a></h2>
-     <pre class="col">
- _____
-/ PGP \__
-\_____/o \
-      \_ /
-       <|
-       <|
-       <|
-       `
-     </pre>
-        </div>
-        <div class="col-md-4 col-xs-12">
-          <h2><a href="https://github.com/spacekookie">CODE</a></h2>
-          <pre class="col">
-    ___________________  
-   /   ______________  \
-  |   / unsigned int |  |
-  |   | number_fans()|  |
-  |   | {            |  |
-  |   \______________/  |
-  |  /|\ q  oo ===== o  | 
-   \___________________/ 
-     !_______________!   
-          </pre>
+            {% endblock header %}
+            <!-- /Header -->
+
         </div>
-        <div class="col-md-4 col-xs-12">
-          <h2><a href="">LONELY ROBOT</a></h2>
-					<pre class="col">
-
-
-                   `
-                   `
-                   `
-          :        `
-         `         .
-         @         .
-         .         .
-                   .
-        '          ,
-          .,``     ,
-       :           ,
-       :  ';#;     ,
-      .  +`.    '  :
-      @'  #'       :
-     ;#:`,   ,     ;
-     @#@@@@@       ;
-     ';+,@'+,      ;
-    . `@+@;;.   `  ;
-    @  :@#@;@  .   :
-    ,   :+@@@ '@   ;
-   +      '@@ #:'  +
-   @     @+@# ',:  +
-  .`     @@@@+@@@  #
-  @      `@++ :''` #
- `:       @.@+ @#  #
- :  .     @@@@ .   #
- ,        @@@#@ `# '
- `      , @.@..   ',
- +     +@@@@@@@    ,
-   #@@@@@@@@@@:  .  
-  @ ,@@@@@@@@@#`    
-,@@@@@` #@@@+`      
-   @@@@@@@@         
-   '.  ,#.          
-
-Isn't that cryptic...
-          </pre>
+        <!-- /Header -->
+
+
+        <!-- Content -->
+
+        <div class="container">
+
+        <!-- Special "home" container -->
+          <div class="home">
+
+            <!-- Displays the default content from the home page -->
+            <div class="container content color_shit">
+              {{ page.content }}
+
+              <div class="row color_shit">
+                <div class="col-md-4 col-xs-12">
+                  <h2><a href="pgp/spacekookie-on-the-tubes.txt">KEYS</a></h2>
+                  <pre class="col">
+ 
+           _____
+          / PGP \__
+          \_____/o \
+                \_ /
+                 <|
+                 <|
+                 <|
+                 `
+                  </pre>
+                </div>
+
+                <!-- Next special little nugget -->
+                <div class="col-md-4 col-xs-12">
+                  <h2><a href="https://github.com/spacekookie">CODE</a></h2>
+                  <pre class="col">
+        ___________________  
+       /   ______________  \
+      |   / unsigned int |  |
+      |   | number_fans()|  |
+      |   | {            |  |
+      |   \______________/  |
+      |  /|\ q  oo ===== o  | 
+       \___________________/ 
+         !_______________!   
+                  </pre>
+                </div>
+
+                <!-- Replace this ? -->
+                <div class="col-md-4 col-xs-12">
+                  <h2><a href="">LONELY ROBOT</a></h2>
+                  <pre class="col">
+
+
+
+
+                ...
+
+
+
+
+                  </pre>
+                </div>
+              </div> <!-- end row color_shit -->
+            </div> <!-- end container content color_shit -->
+          </div> <!-- end home -->
+        </div> <!-- end container -->
+
+        <!-- /Content --> 
+
+        <!-- Footer -->
+        <div class="footer gradient-2">
+            <div class="container footer-container ">
+                <div class="row">
+                    <div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
+                        <div class="footer-title">{{ NEST_SITEMAP_COLUMN_TITLE }}</div>
+                        <ul class="list-unstyled">
+                            {% for title, link in NEST_SITEMAP_MENU %}
+                            <li><a href="{{ SITEURL }}{{ link }}">{{ title }}</a></li>
+                            {% endfor %}
+                            {% if FEED_ALL_ATOM %}
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">{{ NEST_SITEMAP_ATOM_LINK }}</a></li>
+                            {% endif %}
+                            {% if FEED_ALL_RSS %}
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">{{ NEST_SITEMAP_RSS_LINK }}</a></li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                    <div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
+                        {% if SOCIAL %}
+                        <div class="footer-title">{{ NEST_SOCIAL_COLUMN_TITLE }}</div>
+                        <ul class="list-unstyled">
+                            {% for name, link in SOCIAL %}
+                            <li><a href="{{ link }}" target="_blank">{{name}}</a></li>
+                            {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </div>
+                    <div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
+                        {% if LINKS %}
+                        <div class="footer-title">{{ NEST_LINKS_COLUMN_TITLE }}</div>
+                        <ul class="list-unstyled">
+                            {% for name, link in LINKS %}
+                            <li><a href="{{ link }}" target="_blank">{{name}}</a></li>
+                            {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </div> 
+                    <div class="col-xs-12 col-sm-3 col-md-3 col-lg-3">
+                        <p class="pull-right text-right">
+                            {# <small><em>Proudly powered by <a href="http://docs.getpelican.com/" target="_blank">pelican</a></em></small><br/>
+                            <small><em>Theme and code by <a href="https://github.com/molivier" target="_blank">molivier</a></em></small><br/> #}
+                            <small>{{ NEST_COPYRIGHT }}</small>
+                            {% if NEST_FOOTER_HTML %}<small><em>{{ NEST_FOOTER_HTML }}</em></small>{% endif %}
+                        </p>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-{% endblock %}
-</div>
\ No newline at end of file
+        <!-- /Footer -->
+      </div> <!-- end hacky_bg -->
+    </body>
+</html>
diff --git a/templates/tag.html b/templates/tag.html
index 40c33af..b757117 100755
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -4,49 +4,52 @@
 {% block description %}{{ NEST_TAG_HEAD_DESCRIPTION }} {{ tag }}{% endblock description %}
 
 {% block headerstyle %}
-		{% if NEST_HEADER_IMAGES %}
-		<div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ NEST_HEADER_IMAGES }}'); background-position: center; ">
-		{% else %}
-		<div class="header-container gradient">
-		{% endif %}
+    {% if NEST_HEADER_IMAGES %}
+    <div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('{{ SITEURL }}/images/{{ NEST_HEADER_IMAGES }}'); background-position: center; ">
+    {% else %}
+    <div class="header-container gradient">
+    {% endif %}
 {% endblock headerstyle %}
 
 {% block header %}
-		<div class="container header-wrapper">
-				<div class="row">
-							<div class="col-lg-12">
-									<div class="header-content">
-											<h1 class="header-title text-uppercase">{{ NEST_CATEGORY_HEADER_TITLE }} {{ tag|capitalize }}</h1>
-											<div class="header-underline"></div>
-									</div>
-							</div>
-				</div>
-		</div>
+    <div class="container header-wrapper">
+        <div class="row">
+              <div class="col-lg-12">
+                  <div class="header-content">
+                      <h1 class="header-title text-uppercase">{{ NEST_CATEGORY_HEADER_TITLE }} {{ tag|capitalize }}</h1>
+                      <div class="header-underline"></div>
+                  </div>
+              </div>
+        </div>
+    </div>
 {% endblock header %}
 
 {% block content %}
-<div class="container content archive">
-
-	<h1>{{ tag|capitalize }}</h1>
-	<dl class="dl-horizontal">
-
-		<!-- This section displays "pinned" articles for the blog tag page-->
-		{% if tag == 'blog' %}
-		<hr>
-			<dd> 
-				<!--<p>This archive shows a steady stream of posts I make on this website across every category. While this is convenient to get an overview of all content or just historically follow along you can only also -->Browse the archive by <a href="{{ SITEURL }}/categories.html">category</a></p>
-			</dd>
-			<hr>
-		{% endif %}
-
-		<!-- This loops through all the articles -->
-		{% for article in articles %}
-			<dt><p>{{ article.locale_date}}</p></dt>
-			<dd>
-				<a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a>
-				<p>{{ article.summary }}</p>
-			</dd>
-		{% endfor %}
-	</dl>
+
+<div class="col-lg-9 content archive">
+  
+  <h1>{{ tag|capitalize }}</h1>
+  <dl class="dl-horizontal">
+
+  <!-- This section displays "pinned" articles for the blog tag page-->
+  {% if tag == 'blog' %}
+    <hr>
+      <dd> 
+        Browse the archive by <a href="{{ SITEURL }}/categories.html">category</a></p>
+      </dd>
+    <hr>
+  {% endif %}
+
+  <!-- This loops through all the articles -->
+  {% for article in articles %}
+    <dt><p>{{ article.locale_date}}</p></dt>
+    <dd>
+      <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a>
+      <p>{{ article.summary }}</p>
+    </dd>
+  {% endfor %}
+  </dl>
 </div>
+
+
 {% endblock content %}