From 9f435fc5959c8206d853db25e71610eb1bc2360c Mon Sep 17 00:00:00 2001 From: Audrey Roy Date: Sat, 18 May 2013 13:57:22 +0200 Subject: [PATCH] Getting admin2 to use the bootstrap theme properly. --- djadmin2/templates/admin2/bootstrap/base.html | 4 ++-- djadmin2/templates/admin2/bootstrap/index.html | 2 +- example/example/settings.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index 06daaf9..3ed6f0c 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -4,7 +4,7 @@ django-admin2 - +
@@ -12,7 +12,7 @@
- + {% block extrajs %}{% endblock %} diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/admin2/bootstrap/index.html index 74a2879..90980ac 100644 --- a/djadmin2/templates/admin2/bootstrap/index.html +++ b/djadmin2/templates/admin2/bootstrap/index.html @@ -1,4 +1,4 @@ -{% extends "admin/base.html" %} +{% extends "admin2/bootstrap/base.html" %} {% block content %}

Index

diff --git a/example/example/settings.py b/example/example/settings.py index ecf7331..9d7ecbd 100644 --- a/example/example/settings.py +++ b/example/example/settings.py @@ -152,4 +152,4 @@ LOGGING = { } -ADMIN2_THEME_DIRECTORY = "admin2/monkey/" \ No newline at end of file +ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/" \ No newline at end of file