From 3945c52682702a9b4b62a46e667f2c3307f06907 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:25:02 -0700 Subject: Redesigned News Pages Signed-off-by: Dan McGee --- templates/news/add.html | 39 ++++++++++++++------------ templates/news/delete.html | 29 +++++++++++-------- templates/news/list.html | 69 ++++++++++++++++++++++++++++++---------------- templates/news/view.html | 29 ++++++++++++------- 4 files changed, 103 insertions(+), 63 deletions(-) (limited to 'templates/news') diff --git a/templates/news/add.html b/templates/news/add.html index ef3f211c..38b5b21d 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -1,22 +1,25 @@ {% extends "base.html" %} -{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %} +{% block title %}Arch Linux - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %} {% block content %} -
- {% if form.instance.id %} -

Edit News

- {% else %} -

Add News

- {% endif %} -
- - {{form}} - - - -
- -
-
-
+
+ + {% if form.instance.id %} +

News: Edit Article

+ {% else %} +

News: Add Article

+ {% endif %} + +
+
+ {{ form.as_p }} +
+ {% if form.instance.id %} +

+ {% else %} +

+ {% endif %} +
+ +
{% endblock %} diff --git a/templates/news/delete.html b/templates/news/delete.html index c3824a26..6a2fa1e8 100644 --- a/templates/news/delete.html +++ b/templates/news/delete.html @@ -2,15 +2,22 @@ {% block title %}Arch Linux - Delete News{% endblock %} {% block content %} -
-

Confirm Delete

-
- You are about to delete the news item '{{news}}'. -

- Are you sure? -

-
-     -
-
+
+ +

News: Delete Entry Confirmation

+ +

You are about to delete the following news item:

+ +
+ {{news}} +
+ +

Are you sure?

+ +
+

+
+ +
{% endblock %} diff --git a/templates/news/list.html b/templates/news/list.html index a35c41e0..cadc24a2 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,28 +1,49 @@ {% extends "base.html" %} {% block title %}Arch Linux - News{% endblock %} + {% block content %} -
- {% if perms.main.add_news %} -
- Add News Item -
- {% endif %} -

News Updates

- - {% for item in news_list %} - - - - - - {% endfor %} -
{{ item.postdate }}{{ item.title }} - {% if perms.main.change_news %} - edit - {% endif %} - {% if perms.main.delete_news %} - delete - {% endif %} -
-
+
+ +

News Archives

+ + {% if perms.main.add_news %} + + {% endif %} + + + + + + + + {% if perms.main.change_news %} + + {% endif %} + + + + {% for item in news_list %} + + + + + {% if perms.main.change_news %} + + {% endif %} + + {% endfor %} + +
PublishedTitleAuthor
{{ item.postdate }}{{ item.title }}{{ item.author.get_full_name }} + Edit + {% endif %} + {% if perms.main.delete_news %} +   Delete +
+ +
{% endblock %} diff --git a/templates/news/view.html b/templates/news/view.html index 2f7c3d87..1b82bc08 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,14 +1,23 @@ {% extends "base.html" %} -{% block title %}Arch Linux - {{ news.title }}{% endblock %} +{% block title %}Arch Linux - News: {{ news.title }}{% endblock %} {% block content %} -
-
- {{ news.author.get_full_name }}
- {{ news.postdate }} -
-

{{ news.title }}

-

- {{ news.content|safe|linebreaks }} -
+
+ +

News: {{ news.title }}

+ + {% if perms.main.change_news %} + + {% endif %} + + + + {{ news.content|safe|linebreaks }} + +
{% endblock %} -- cgit v1.2.3-54-g00ecf