From a00f85e1332ca973cec807693e383accd9cdc864 Mon Sep 17 00:00:00 2001
From: Dusty Phillips <buchuki@gmail.com>
Date: Sun, 5 Oct 2008 21:06:00 -0400
Subject: port news to django 1.0 using generic views

---
 templates/news/add.html    |  9 ++-------
 templates/news/delete.html | 11 +++++------
 templates/news/list.html   |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'templates/news')

diff --git a/templates/news/add.html b/templates/news/add.html
index 702d7ab7..80fccc3d 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -2,20 +2,15 @@
 
 {% block content %}
 	<div class="greybox">
-	{% if news %}
+	{% if form.instance.id %}
 		<h2 class="title">Edit News</h2>
 	{% else %}
 		<h2 class="title">Add News</h2>
 	{% endif %}
 		<form method="post" action=".">
 		<table>
+            {{form}}
 			<tr>
-				<td>Title:</td>
-				<td>{{ form.title }}</td>
-			</tr><tr>
-				<td style="vertical-align:top">Content:</td>
-				<td>{{ form.content }}</td>
-			</tr><tr>
 				<td colspan="2" align="right">
 					<input type="submit" value=" Save " />
 				</td>
diff --git a/templates/news/delete.html b/templates/news/delete.html
index 7ac5e250..0f48f8bb 100644
--- a/templates/news/delete.html
+++ b/templates/news/delete.html
@@ -4,13 +4,12 @@
 	<div class="greybox">
 		<h2>Confirm Delete</h2>
 		<hr />
+        You are about to delete the news item '{{news}}'.
+        <br /><br />
+        Are you sure?
+        <br /><br />
 		<form method="post" action=".">
-		<table>
-			<tr>
-				<td>Are You Sure?</td>
-				<td>&nbsp; &nbsp; <input name="delete" type="submit" value=" Yes " /></td>
-			</tr>
-		</table>
+				<td>&nbsp; &nbsp; <input name="delete" type="submit" value=" Yes " />
 		</form>
 	</div>
 {% endblock %}
diff --git a/templates/news/list.html b/templates/news/list.html
index 86277666..0edaae1d 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -9,7 +9,7 @@
 	{% endif %}
 		<h2 class="title">News Updates</h2>
 		<table class="results" width="100%">
-		{% for item in news %}
+		{% for item in news_list %}
             <tr class="{% cycle pkgr2,pkgr1 %}">
 				<td>{{ item.postdate }}</td>
 				<td><a href="{{ item.get_absolute_url }}">{{ item.title }}</a></td>
-- 
cgit v1.2.2