cleaned up templates: added base.html extension, as well as content b…

…lock

fusionbox/blog/templates/blog/blog_detail.html

@@ -1,38 +1,41 @@
+{% extends "base.html" %}
 {% load fusionbox_tags %}
-<div class="blogroll">
-  <article>
-  <p class="breadcrumb"><a href="/">Home</a> > <a href="/blog/">Blog</a> ></p>
-  <hgroup>
-    <h1>{{post.title}}</h1>
-  </hgroup>
-  <p class="author">by {{ post.author }} | {{ post.created_at|date:"F d, Y" }}</p>
+{% block content %}
+  <div class="blogroll">
+    <article>
+    <p class="breadcrumb"><a href="/">Home</a> > <a href="/blog/">Blog</a> ></p>
+    <hgroup>
+      <h1>{{post.title}}</h1>
+    </hgroup>
+    <p class="author">by {{ post.author }} | {{ post.created_at|date:"F d, Y" }}</p>
 
-  <ul class="messages">
+    <ul class="messages">
       {% for message in messages %}
-      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
       {% endfor %}
-  </ul>
+    </ul>
 
-  {{ post.body }}
-  {% block comment %}
-  {% endblock %}
-</div><!--/blogroll -->
-
-<aside class="column">  
-  <p class="title">Categories:</p>
-  {% include "blog/tags.html" %}
-  <section class="callout">
-    {% block callout %}
+    {{ post.body }}
+    {% block comment %}
     {% endblock %}
-  </section>
+  </div><!--/blogroll -->
+
+  <aside class="column">  
+    <p class="title">Categories:</p>
+    {% include "blog/tags.html" %}
+    <section class="callout">
+      {% block callout %}
+      {% endblock %}
+    </section>
 
-  <section class="callout plain">
-    {% block calloutplain %}
-    {% endblock %}
-  </section>
+    <section class="callout plain">
+      {% block calloutplain %}
+      {% endblock %}
+    </section>
 
-  <p class="title">Subscribe via RSS:</p>
-</aside>
+    <p class="title">Subscribe via RSS:</p>
+  </aside>
 
-{% block column %}
+  {% block column %}
+  {% endblock %}
 {% endblock %}

fusionbox/blog/templates/blog/blog_list.html

@@ -1,37 +1,41 @@
+{% extends "base.html" %}
 {% load fusionbox_tags %}
-<div class="blogroll rfq">
-  <article>
-  <p class="breadcrumb"><a href="/">Home</a> &gt;</p>
-  <hgroup>
-    {% block headergroup %}
-      <h1>Blog</h1>
-      <h2>We Would Love to Hear What You Have to Say.</h2>
+
+{% block content %}
+  <div class="blogroll rfq">
+    <article>
+    <p class="breadcrumb"><a href="/">Home</a> &gt;</p>
+    <hgroup>
+      {% block headergroup %}
+        <h1>Blog</h1>
+        <h2>We Would Love to Hear What You Have to Say.</h2>
+      {% endblock %}
+    </hgroup>
+    {% block subheadergroup %}
+      <p> This blog contains information &amp; updates for our readers. This portion of our website will include postings from our representatives
+      and will include a variety of topics.</p>
     {% endblock %}
-  </hgroup>
-  {% block subheadergroup %}
-    <p> This blog contains information &amp; updates for our readers. This portion of our website will include postings from our representatives
-    and will include a variety of topics.</p>
-  {% endblock %}
 
-  <ul class="blog html">
-  {% for post in posts %}
+    <ul class="blog html">
+    {% for post in posts %}
       <li>
         <p class="title"><a href="{{post.get_absolute_url}}">{{post.title}}</a></p>
         <p class="date">{{ post.created_at|date:"F d, Y" }}</p>
         {{ post.body|truncatewords_html:30 }} 
         <p><a href="{{post.get_absolute_url}}">read more &raquo;</a></p>
-  {% endfor %}
-  </ul>
+    {% endfor %}
+    </ul>
 
-  {% block articlefooter %}
-  {% endblock %}
-  </article>
-</div><!--/blogroll -->
+    {% block articlefooter %}
+    {% endblock %}
+    </article>
+  </div><!--/blogroll -->
 
-<aside class="column">
-  <p class="title">Tags:</p>  
-  {% include "blog/tags.html" %}
-</aside>
+  <aside class="column">
+    <p class="title">Tags:</p>  
+    {% include "blog/tags.html" %}
+  </aside>
 
-{% block column %}
+  {% block column %}
+  {% endblock %}
 {% endblock %}