summaryrefslogtreecommitdiff
path: root/templates/news/view.html
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-05-24 21:13:46 -0500
committerDan McGee <dan@archlinux.org>2010-05-24 21:13:46 -0500
commite817efad53bc075ca94e6effd6eb3b6c838e2e63 (patch)
tree6bd4dae53aca75fef1f7480769ca2c42fe473e85 /templates/news/view.html
parentb3e8354cdff4af8117feda0806a7c1104d5bb30e (diff)
parenta24e503a63599fb5495fd85cba5806a34c695bb6 (diff)
Merge branch 'redesign'
Conflicts: templates/public/download.html
Diffstat (limited to 'templates/news/view.html')
-rw-r--r--templates/news/view.html29
1 files changed, 19 insertions, 10 deletions
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 %}
- <div class="box">
- <div style="float: right; font-size: small">
- {{ news.author.get_full_name }}<br />
- {{ news.postdate }}
- </div>
- <h3>{{ news.title }}</h3>
- <hr /><br />
- {{ news.content|safe|linebreaks }}
- </div>
+<div id="news-article" class="box">
+
+ <h2>News: {{ news.title }}</h2>
+
+ {% if perms.main.change_news %}
+ <ul class="admin-actions">
+ <li><a href="/news/edit/{{ news.id }}/" title="Edit this article">Edit News Item</a></li>
+ {% if perms.main.delete_news %}
+ <li><a href="/news/delete/{{ news.id }}/" title="Delete this article">Delete News Item</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
+
+ <p class="article-info">{{ news.postdate }} - {{ news.author.get_full_name }}</p>
+
+ {{ news.content|safe|linebreaks }}
+
+</div>
{% endblock %}