1.1 --- a/agdj/core/templates/blog/single_post.html	Sun Feb 01 01:35:02 2009 -0500
     1.2 +++ b/agdj/core/templates/blog/single_post.html	Sun Feb 01 02:05:35 2009 -0500
     1.3 @@ -4,43 +4,49 @@
     1.4  
     1.5  {% block title %}{{ post.title }}{% endblock %}
     1.6  
     1.7 -{% block header %}
     1.8 -  <h1>
     1.9 -    <a href="{% url agdj.blog.views.post_list %}">blog:</a>
    1.10 -    <a href="{{ post.urls.view }}">{{ post.title }}</a></h1>
    1.11 -{% endblock %}
    1.12 -
    1.13 -{% block metadata %}
    1.14 -<p class="timestamp">
    1.15 -  <a href="{% url index %}">posted
    1.16 -    <span class="humanize iso8601">{{ post.pub_date|iso8601 }}</span></a></p>
    1.17 -<div class="tag-container">tagged: 
    1.18 -{% with post as object %}
    1.19 -{% include "blog/render_post_tags_list.html" %}
    1.20 -{% endwith %}
    1.21 +{% block body %}
    1.22 +<div class="container_12">
    1.23 +    <h1>
    1.24 +        <a href="{% url agdj.blog.views.post_list %}">blog:</a>
    1.25 +        <a href="{{ post.urls.view }}">{{ post.title }}</a>
    1.26 +    </h1>
    1.27 +    <div class="grid_12" id="metadata">
    1.28 +        <p class="timestamp">
    1.29 +            <a href="{% url index %}">posted
    1.30 +                <span class="humanize iso8601">{{ post.pub_date|iso8601 }}</span></a></p>
    1.31 +        <div class="tag-container">tagged:
    1.32 +            {% with post as object %}
    1.33 +            {% include "blog/render_post_tags_list.html" %}
    1.34 +            {% endwith %}
    1.35 +        </div>
    1.36 +    </div>
    1.37 +    <div class="grid_6 suffix_1" id="content">
    1.38 +        <div class="post-content">
    1.39 +            {{ post.source|markdown2 }}
    1.40 +        </div>
    1.41 +    </div>
    1.42 +    <div class="grid_5" id="comments">
    1.43 +        <div class="comments">
    1.44 +            <h3>Comments</h3>
    1.45 +            <p>{{ post.spam_count }} spam comment{{ post.spam_count|pluralize }} omitted.</p>
    1.46 +            <form class="add nospam-me" action="" method="post">
    1.47 +                <fieldset>
    1.48 +                    <legend>Add Comment</legend>
    1.49 +                    <p>You can
    1.50 +                        use <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
    1.51 +                        formatting. Raw HTML will be stripped.</p>
    1.52 +                    {% for field in comment_form %}
    1.53 +                    <div class="field field-{{ field.name }}">
    1.54 +                        {{ field.label_tag }}{{ field }}{{ field.errors }}
    1.55 +                    </div>
    1.56 +                    {% endfor %}
    1.57 +                    <div><input type="submit" class="submit" value="Add Comment" /></div>
    1.58 +                </fieldset>
    1.59 +            </form>
    1.60 +            {% for object in comments %}
    1.61 +            {% include "blog/render_comment.html" %}
    1.62 +            {% endfor %}
    1.63 +        </div>
    1.64 +    </div>
    1.65  </div>
    1.66 -{% endblock %}
    1.67 -
    1.68 -{% block content %}
    1.69 -
    1.70 -<div class="post-content">
    1.71 -{{ post.source|markdown2 }}
    1.72 -</div>
    1.73 -<div class="comments">
    1.74 -  <h3>Comments</h3>
    1.75 -  <p>{{ post.spam_count }} spam comments omitted.</p>
    1.76 -  <form class="add nospam-me" action="" method="post">
    1.77 -    <fieldset class="collapsed">
    1.78 -      <legend>Add Comment</legend>
    1.79 -      <p>Comments can
    1.80 -        use <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
    1.81 -        formatting. Raw HTML will be stripped.</p>
    1.82 -      {{ comment_form.as_p }}
    1.83 -      <input type="submit" class="submit" value="Add Comment" />
    1.84 -    </fieldset>
    1.85 -  </form>
    1.86 -{% for object in comments %}
    1.87 -{% include "blog/render_comment.html" %}
    1.88 -{% endfor %}
    1.89 -</div>
    1.90 -{% endblock %}
    1.91 +{% endblock body %}