From 452990ccc49ebeb002f6a09b7e9e0b8de940b874 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Thu, 2 Jun 2011 01:08:41 -0400 Subject: [PATCH] Removing admin_tools --- requirements.txt | 3 --- settings.py | 3 --- symlink-dependencies.sh | 2 +- urls.py | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index f357398..87041e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,10 +6,7 @@ -e git://github.com/alex/django-templatetag-sugar.git#egg=templatetag_sugar -e hg+http://bitbucket.org/dwaiter/django-bcrypt#egg=django-bcrypt -e hg+ssh://hg@bitbucket.org/nicksergeant/django-registration#egg=django-registration - -# Admin -e svn+http://django-grappelli.googlecode.com/svn/trunk#egg=django-grappelli --e hg+http://bitbucket.org/fetzig/grappelli-admin-tools#egg=admin_tools # Deployment -e git://github.com/bitprophet/fabric.git#egg=fabric diff --git a/settings.py b/settings.py index b4974e8..5bde2e6 100644 --- a/settings.py +++ b/settings.py @@ -32,7 +32,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.i18n', 'django.core.context_processors.media', 'django.core.context_processors.request', - 'grappelli.context_processors.admin_template_path', ) TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', @@ -53,8 +52,6 @@ TEMPLATE_DIRS = os.path.join(BASE_PATH, 'templates') INSTALLED_APPS = ( 'grappelli', - 'admin_tools.theming', - 'admin_tools.menu', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/symlink-dependencies.sh b/symlink-dependencies.sh index b5382b0..757fff9 100755 --- a/symlink-dependencies.sh +++ b/symlink-dependencies.sh @@ -1,3 +1,3 @@ #!/bin/bash -ln -s "$VIRTUAL_ENV/src/django-grappelli/grappelli/media" "media/admin" +ln -s "$VIRTUAL_ENV/src/django-grappelli/grappelli/static/grappelli" "media/admin" diff --git a/urls.py b/urls.py index 6089425..d1362f5 100644 --- a/urls.py +++ b/urls.py @@ -9,7 +9,6 @@ from views import home urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), - url(r'^admin_tools/', include('admin_tools.urls')), url(r'^grappelli/', include('grappelli.urls')), url(r'^404/$', direct_to_template, {'template': '404.html'}),