diff --git a/requirements/development.txt b/requirements/development.txt index e48c037891..d363fd07d9 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -14,7 +14,6 @@ slate==0.3 ghostscript==0.4.1 pdfminer==20110227 APScheduler==2.0.2 -django-grappelli==2.3.3 Pillow==1.7.4 cssmin==0.1.4 django-compressor==1.1 diff --git a/requirements/production.txt b/requirements/production.txt index dd976f27a7..e2654a82b1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -11,7 +11,6 @@ slate==0.3 ghostscript==0.4.1 pdfminer==20110227 APScheduler==2.0.2 -django-grappelli==2.3.3 Pillow==1.7.4 cssmin==0.1.4 django-compressor==1.1 diff --git a/settings.py b/settings.py index 5c025e3fc4..27ef8c818f 100644 --- a/settings.py +++ b/settings.py @@ -81,7 +81,6 @@ STATIC_URL = '/%s-static/' % PROJECT_NAME # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -#ADMIN_MEDIA_PREFIX = STATIC_URL + 'grappelli/' ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' # Make this unique, and don't share it with anybody. @@ -118,7 +117,6 @@ TEMPLATE_DIRS = ( ) INSTALLED_APPS = ( - #'grappelli', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -288,8 +286,6 @@ CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler' CELERY_DISABLE_RATE_LIMITS = True #--------- Web theme --------------- WEB_THEME_ENABLE_SCROLL_JS = False -#--------- Grappelli ---------------- -#GRAPPELLI_ADMIN_TITLE = PROJECT_TITLE #--------- Django ------------------- LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = '/' diff --git a/urls.py b/urls.py index e23e774472..38ab8788b2 100644 --- a/urls.py +++ b/urls.py @@ -15,7 +15,6 @@ urlpatterns = patterns('', (r'^tags/', include('tags.urls')), (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), - #(r'^grappelli/', include('grappelli.urls')), (r'^sentry/', include('sentry.urls')), (r'^comments/', include('document_comments.urls')), (r'^user_management/', include('user_management.urls')),