From 95cc7235b0cd5904aaa1e1abb5360a2d91616099 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 19 Jan 2016 16:51:47 -0700
Subject: [PATCH] Grappelli

---
 .gitignore              | 1 +
 config/settings/base.py | 3 +++
 config/urls.py          | 1 +
 requirements/base.txt   | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index c89e0f5..0a49a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 venv
+staticfiles
 *.py[cod]
 *.pyc
 __pycache__
diff --git a/config/settings/base.py b/config/settings/base.py
index 9dc8b2e..c99b2a8 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -24,6 +24,7 @@ DJANGO_APPS = (
     'django.contrib.staticfiles',
 
     # Admin
+    'grappelli',
     'django.contrib.admin',
 )
 THIRD_PARTY_APPS = (
@@ -161,6 +162,7 @@ TEMPLATES = [
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
                 'django.core.context_processors.request',
+                'django.core.context_processors.request',
             ],
         },
     },
@@ -226,5 +228,6 @@ AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify'
 
 # Location of root django.contrib.admin URL, use {% url 'admin:index' %}
 ADMIN_URL = r'^admin/'
+GRAPPELLI_ADMIN_TITLE = 'CCDB'
 
 # Your common stuff: Below this line define 3rd party library settings
diff --git a/config/urls.py b/config/urls.py
index c3b6a53..18425c4 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -13,6 +13,7 @@ urlpatterns = [
     url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name="about"),
 
     # Django Admin, use {% url 'admin:index' %}
+    url(r'^grappelli/', include('grappelli.urls')), # grappelli URLS
     url(settings.ADMIN_URL, include(admin.site.urls)),
 
     # User management
diff --git a/requirements/base.txt b/requirements/base.txt
index 7a14bf5..2f4bdf5 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -30,3 +30,6 @@ django-bootstrap3==6.2.2
 
 # Data grids
 django-tables2==1.0.4
+
+# Admin
+django-grappelli==2.7.3