put sidebar back in on cartoons

fu/templates/article.html

@@ -15,44 +15,37 @@
 {% block content %}
 
 
+<div id="faux">
+<div id="main">
 
 {% if article.cartoon %}
-
 <h2 class="cartoon">{{ article.headline }}</h2>
+{% else %}
+<h2>{{ article.headline }}</h2>
+{% endif %}
 
 <div id="byline">
 <div class="article-thumb">
 <a href="/team/{{ article.author.first_name }}_{{ article.author.last_name }}/"><img src="{% thumbnail article.author.headshot 65x65 crop,upscale %}"
      width="65" height="65" /></a>
 </div>
 <p><a href="/team/{{ article.author.first_name }}_{{ article.author.last_name }}/">{{ article.author.fullname}}</a></p>
-
 </div>
 <div class="clear"></div>
 
-{% thumbnail article.image 850x30000 as cartoonimg %}
-<img src="{{ cartoonimg.absolute_url }}" width="{{ cartoonimg.width }}" alt="{{ cartoonimg.height }}" />
 
+{% if article.cartoon %}
+
+{% thumbnail article.image 650x30000 as cartoonimg %}
+<img src="{{ cartoonimg.absolute_url }}" width="{{ cartoonimg.width }}" alt="{{ cartoonimg.height }}" />
 <div class="blurb">
 {% if article.content %}
 {{ article.content|markdown }}
 {% endif %}
 </div>
 
-{% else %}
-<div id="faux">
-<div id="main">
 
-<h2>{{ article.headline }}</h2>
-
-<div id="byline">
-<div class="article-thumb">
-<a href="/team/{{ article.author.first_name }}_{{ article.author.last_name }}/"><img src="{% thumbnail article.author.headshot 65x65 crop,upscale %}"
-     width="65" height="65" /></a>
-</div>
-<p><a href="/team/{{ article.author.first_name }}_{{ article.author.last_name }}/">{{ article.author.fullname}}</a></p>
-</div>
-<div class="clear"></div>
+{% else %}
 
 {% if article.image %}
 <div class="article-thumb">
@@ -73,6 +66,7 @@ <h2>{{ article.headline }}</h2>
 
 {% endif %}
 
+
 {% if article.tags.all %}
 <hr />
 
@@ -152,7 +146,7 @@ <h3>comments</h3>
 </div>
 <div class="clear"></div>
 
-{% if not article.cartoon %}
+
 </div>
 
 
@@ -195,5 +189,5 @@ <h3>Tag cloud</h3>
 
 </div>
 </div>
-{% endif %}
+
 {% endblock %}