From fd469a307075cdc02d1c979add7cd7415788c59c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 11 Dec 2014 01:10:01 +0100 Subject: [PATCH] remove custom admin templates, add suit as admin theme --- example/sandbox/settings.py | 1 + setup.py | 1 + telemeta/templates/admin/base.html | 48 ------------------------- telemeta/templates/admin/base_site.html | 10 ------ 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 telemeta/templates/admin/base.html delete mode 100644 telemeta/templates/admin/base_site.html diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py index 0651affe..5817fcfd 100644 --- a/example/sandbox/settings.py +++ b/example/sandbox/settings.py @@ -124,6 +124,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', + 'suit', 'django.contrib.admin', 'django.contrib.staticfiles', 'django_extensions', diff --git a/setup.py b/setup.py index e9e56a8e..03fdbfe3 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ setup( 'django-bootstrap3', 'django-bootstrap-pagination', 'django-json-rpc==0.6.2', + 'django-suit', 'timeside>=0.5.6', 'south', 'sorl-thumbnail', diff --git a/telemeta/templates/admin/base.html b/telemeta/templates/admin/base.html deleted file mode 100644 index d5f4b3f1..00000000 --- a/telemeta/templates/admin/base.html +++ /dev/null @@ -1,48 +0,0 @@ - - - -{% block title %}{% endblock %} - -{% block extrastyle %}{% endblock %} - -{% if LANGUAGE_BIDI %}{% endif %} - -{% block extrahead %}{% endblock %} -{% block blockbots %}{% endblock %} - -{% load i18n %} - - - - -
- - {% if not is_popup %} - {% block breadcrumbs %}{% endblock %} - {% endif %} - - {% if messages %} - - {% endif %} - - -
- {% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} - {% block content %} - {% block object-tools %}{% endblock %} - {{ content }} - {% endblock %} - {% block sidebar %}{% endblock %} -
-
- - - {% block footer %}{% endblock %} -
- - - - diff --git a/telemeta/templates/admin/base_site.html b/telemeta/templates/admin/base_site.html deleted file mode 100644 index 966fef70..00000000 --- a/telemeta/templates/admin/base_site.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "admin/base.html" %} -{% load i18n %} - -{% block title %}{{ title }} | {% trans 'Telemta site admin' %}{% endblock %} - -{% block branding %} -

{% trans 'Telemeta administration' %}

-{% endblock %} - -{% block nav-global %}{% endblock %} -- 2.39.5