# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1240177885 0
# Node ID c284c0e5c5dbd5c832a56a3d75b4219bdeef3223
# Parent  a5f27f25fa52e8461026aea9f96bca2d19ed27e9
News tweaks to story and story summary templates.

diff -r a5f27f25fa52 -r c284c0e5c5db gpp/templates/news/story.html
--- a/gpp/templates/news/story.html	Sun Apr 19 21:16:59 2009 +0000
+++ b/gpp/templates/news/story.html	Sun Apr 19 21:51:25 2009 +0000
@@ -28,8 +28,17 @@
    {% tags_for_object story as story_tags %}
    {% if story_tags %}
    <hr />
+   <p>
+   Category: <a href="{% url news.views.category category=story.category.id,page=1 %}">{{ story.category.title }}</a>
+   <a href="{{ story.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png"
+      alt="Story Permalink" title="Story Permalink" /></a>
+{% if user.is_authenticated %}
+   <a href="{% url news.views.email_story story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
+      alt="Send this story to a friend" title="Send this story to a friend" /></a>
+{% endif %}
+   </p>
    <div class="news-tags">
-      <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" />
+      <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" /> Tags:
       <ul>
          {% for tag in story_tags %}
             <li><a href="{% url news-tag_page tag_name=tag.name,page=1 %}">{{ tag.name }}</a></li>
@@ -37,14 +46,6 @@
       </ul>
    </div>
    {% endif %}
-   <p>
-   <a href="{{ story.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png"
-      alt="Story Permalink" title="Story Permalink" /></a>
-{% if user.is_authenticated %}
-   <a href="{% url news.views.email_story story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
-      alt="Send this story to a friend" title="Send this story to a friend" /></a>
-{% endif %}
-   </p>
 </div>
 {% get_comment_count for story as comment_count %}
 <p>This story has <span id="comment-count">{{ comment_count }}</span> comment{{ comment_count|pluralize }}.</p>
diff -r a5f27f25fa52 -r c284c0e5c5db gpp/templates/news/story_summary.html
--- a/gpp/templates/news/story_summary.html	Sun Apr 19 21:16:59 2009 +0000
+++ b/gpp/templates/news/story_summary.html	Sun Apr 19 21:51:25 2009 +0000
@@ -19,7 +19,8 @@
 {% endif %}
 <hr />
 <p>
-<img src="{{ MEDIA_URL }}icons/comments.png" alt="Comments" />
+Category: <a href="{% url news.views.category category=story.category.id,page=1 %}">{{ story.category.title }}</a>
+<img src="{{ MEDIA_URL }}icons/comments.png" alt="Comments" title="Comments" />
 <a href="{{ story.get_absolute_url }}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>
 <a href="{{ story.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png" alt="Permalink" title="Permalink" /></a>
 {% if user.is_authenticated %}
@@ -29,7 +30,7 @@
 </p>
 {% if story_tags %}
 <div class="news-tags">
-   <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" />
+   <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" /> Tags:
    <ul>
       {% for tag in story_tags %}
          <li><a href="{% url news-tag_page tag_name=tag.name,page=1 %}">{{ tag.name }}</a></li>