diff options
author | Dan McGee <dan@archlinux.org> | 2014-06-28 12:41:18 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2014-09-01 18:26:05 -0500 |
commit | df672693d9530acadcac0cbc75553749fb58f9cd (patch) | |
tree | a667637423a572bfa9f6b0a7b863e8076efe08f8 | |
parent | 0896b5697a09e1da532e9e42bbc4b2da2dd2d856 (diff) |
Update for admin changes for Django 1.7
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r-- | devel/views.py | 2 | ||||
-rw-r--r-- | templates/admin/index.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/views.py b/devel/views.py index 972d0abb..92cb098e 100644 --- a/devel/views.py +++ b/devel/views.py @@ -5,6 +5,7 @@ import time from django.http import HttpResponseRedirect from django.contrib.auth.decorators import \ login_required, permission_required, user_passes_test +from django.contrib import admin from django.contrib.admin.models import LogEntry, ADDITION from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType @@ -259,6 +260,7 @@ def admin_log(request, username=None): 'title': "Admin Action Log", 'log_user': user, } + context.update(admin.site.each_context()) return render(request, 'devel/admin_log.html', context) # vim: set ts=4 sw=4 et: diff --git a/templates/admin/index.html b/templates/admin/index.html index fddd55e5..89ee1df1 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -5,7 +5,7 @@ {% block coltype %}colMS{% endblock %} -{% block bodyclass %}dashboard{% endblock %} +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} {% block breadcrumbs %}{% endblock %} @@ -34,9 +34,7 @@ <div class="app-{{ app.app_label }} module"> <table> <caption> - <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}"> - {% blocktrans with name=app.name %}{{ name }}{% endblocktrans %} - </a> + <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">{{ app.name }}</a> </caption> {% for model in app.models %} <tr class="model-{{ model.object_name|lower }}"> |