From 604c748f8f8dee5e51e2ea5937d1be0b60fb0e7b Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 7 Dec 2011 14:15:15 -0600
Subject: Admin index template updates

We can't do everything in the upcoming 1.4 release, but we can take care
of a few small bugfixes and changes from the SVN trunk template.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/admin/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates/admin/index.html')

diff --git a/templates/admin/index.html b/templates/admin/index.html
index 93cf258d..1755d86f 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -32,8 +32,8 @@
 {% if app_list %}
     {% for app in app_list %}
         <div class="module">
-        <table summary="{% blocktrans with app.name as name %}Models available in the {{ name }} application.{% endblocktrans %}">
-        <caption><a href="{{ app.app_url }}" class="section">{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</a></caption>
+        <table summary="{% blocktrans with name=app.name %}Models available in the {{ name }} application.{% endblocktrans %}">
+        <caption><a href="{{ app.app_url }}" class="section">{% blocktrans with name=app.name %}{{ name }}{% endblocktrans %}</a></caption>
         {% for model in app.models %}
             <tr>
             {% if model.perms.change %}
@@ -43,7 +43,7 @@
             {% endif %}
 
             {% if model.perms.add %}
-                <td><a href="{{ model.admin_url }}add/" class="addlink">{% trans 'Add' %}</a></td>
+                <td><a href="{{ model.add_url }}" class="addlink">{% trans 'Add' %}</a></td>
             {% else %}
                 <td>&nbsp;</td>
             {% endif %}
@@ -77,7 +77,7 @@ <h3>{% trans 'My Actions' %}</h3>
             <ul class="actionlist">
             {% for entry in admin_log %}
             <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
-                {% if entry.is_deletion %}
+                {% if entry.is_deletion or not entry.get_admin_url %}
                     {{ entry.object_repr }}
                 {% else %}
                     <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
-- 
cgit v1.2.3-54-g00ecf