# HG changeset patch # User Brian Neal # Date 1382296028 18000 # Node ID 4f44b56b43de3df6581cabde54ec00010cf6c558 # Parent 8a0076d7d0412460b60d70f9523addd6082276fb Don't show link to news story on detail view. diff -r 8a0076d7d041 -r 4f44b56b43de madeira/templates/news/news_detail.html --- a/madeira/templates/news/news_detail.html Sun Oct 20 11:20:24 2013 -0500 +++ b/madeira/templates/news/news_detail.html Sun Oct 20 14:07:08 2013 -0500 @@ -3,5 +3,6 @@ {% block title %}The Madeira | News{% endblock %} {% block navblock %}{% navbar 'news' %}{% endblock %} {% block content %} -{% include 'news/story.html' %} +

Madeira News

+{% include 'news/story.html' with list_view=False %} {% endblock %} diff -r 8a0076d7d041 -r 4f44b56b43de madeira/templates/news/news_list.html --- a/madeira/templates/news/news_list.html Sun Oct 20 11:20:24 2013 -0500 +++ b/madeira/templates/news/news_list.html Sun Oct 20 14:07:08 2013 -0500 @@ -3,10 +3,10 @@ {% block title %}The Madeira | News{% endblock %} {% block navblock %}{% navbar 'news' %}{% endblock %} {% block content %} -

News

+

Madeira News

{% if news_list %} {% for story in news_list %} - {% include 'news/story.html' %} + {% include 'news/story.html' with list_view=True %} {% endfor %} {% include 'pagination.html' %} {% else %} diff -r 8a0076d7d041 -r 4f44b56b43de madeira/templates/news/story.html --- a/madeira/templates/news/story.html Sun Oct 20 11:20:24 2013 -0500 +++ b/madeira/templates/news/story.html Sun Oct 20 14:07:08 2013 -0500 @@ -1,7 +1,16 @@ -{% if story.title %} -

{{ story.title }}

-

{{ story.date|date:"F d, Y" }}

+{% if list_view %} + {% if story.title %} +

{{ story.title }}

+

{{ story.date|date:"F d, Y" }}

+ {% else %} +

{{ story.date|date:"F d, Y" }}

+ {% endif %} {% else %} -

{{ story.date|date:"F d, Y" }}

+ {% if story.title %} +

{{ story.title }}

+

{{ story.date|date:"F d, Y" }}

+ {% else %} +

{{ story.date|date:"F d, Y" }}

+ {% endif %} {% endif %}
{{ story.content|safe }}