From 9153ac6352fa3ce40944a0f335c20ea347751a73 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Tue, 5 Jun 2012 20:14:30 -0400
Subject: [PATCH] Themes

---
 blogs/templates/blogs/themes/default/base.html |  5 +++++
 blogs/views.py                                 |  6 ++++++
 media/css/blog-themes/default/style.css        | 11 +++++++++++
 media/css/blog-themes/default/style.scss       | 14 ++++++++++++++
 4 files changed, 36 insertions(+)

diff --git a/blogs/templates/blogs/themes/default/base.html b/blogs/templates/blogs/themes/default/base.html
index 4ca0542..7a8753f 100644
--- a/blogs/templates/blogs/themes/default/base.html
+++ b/blogs/templates/blogs/themes/default/base.html
@@ -33,6 +33,11 @@
 {% block aside %}
     {% if not detail %}
         <aside class="main">
+            {% if sidebar %}
+                <section class="sidebar">
+                    {{ sidebar.stylized|safe }}
+                </section>
+            {% endif %}
             <nav class="footer">
                 <ul class="powered">
                     <li class="snipt"><a href="https://snipt.net/">Blog powered by Snipt</a></li>
diff --git a/blogs/views.py b/blogs/views.py
index 06bb30f..1837cce 100644
--- a/blogs/views.py
+++ b/blogs/views.py
@@ -1,6 +1,7 @@
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from annoying.decorators import render_to
+from annoying.functions import get_object_or_None
 
 from snipts.models import Snipt
 
@@ -13,10 +14,15 @@ def blog_list(request, username_or_custom_slug=None):
 
     snipts = Snipt.objects.filter(user=request.blog_user, blog_post=True, public=True).order_by('-created').exclude(title__iexact='Homepage')
 
+    sidebar = get_object_or_None(Snipt,
+                                 user=request.blog_user,
+                                 title='Blog Sidebar')
+
     context = {
         'blog_user': request.blog_user,
         'has_snipts': True,
         'public': True,
+        'sidebar': sidebar,
         'snipts': snipts,
     }
 
diff --git a/media/css/blog-themes/default/style.css b/media/css/blog-themes/default/style.css
index d40b02f..ee58d36 100644
--- a/media/css/blog-themes/default/style.css
+++ b/media/css/blog-themes/default/style.css
@@ -12,6 +12,7 @@ body.blog-site section.main div.ruler {
 }
 body.blog-site section.main aside.main nav.footer ul.powered {
   border-top: 1px solid #DDDDDD;
+  margin-top: 20px;
   padding-top: 20px;
 }
 body.blog-site section.main aside.main nav.footer ul.powered li {
@@ -26,6 +27,16 @@ body.blog-site section.main aside.main nav.footer ul.powered li a:hover {
   border-bottom: 1px solid #333;
   color: #333;
 }
+body.blog-site section.main aside.main section.sidebar {
+  margin-left: 15px;
+}
+body.blog-site section.main aside.main section.sidebar p {
+  line-height: 16px;
+  margin-bottom: 15px;
+}
+body.blog-site section.main aside.main section.sidebar a:hover {
+  text-decoration: none;
+}
 body.blog-site header.main {
   background: transparent url("/static/images/blog-header-bg.png") top left repeat;
   height: auto;
diff --git a/media/css/blog-themes/default/style.scss b/media/css/blog-themes/default/style.scss
index 33eb4af..1845b65 100644
--- a/media/css/blog-themes/default/style.scss
+++ b/media/css/blog-themes/default/style.scss
@@ -24,6 +24,7 @@ body.blog-site {
             nav.footer {
                 ul.powered {
                     border-top: 1px solid #DDDDDD;
+                    margin-top: 20px;
                     padding-top: 20px;
 
                     li {
@@ -42,6 +43,19 @@ body.blog-site {
                     }
                 }
             }
+            section.sidebar {
+                margin-left: 15px;
+
+                p {
+                    line-height: 16px;
+                    margin-bottom: 15px;
+                }
+                a {
+                    &:hover {
+                        text-decoration: none;
+                    }
+                }
+            }
         }
     }
     header.main {