From 98832f87828bb739aa21bc44ab1d5cc05b7b68d1 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 26 Aug 2011 11:24:28 +0100
Subject: [PATCH] Add Nexus/Gargoyle

---
 app/conf/common.py      |  2 ++
 app/templates/base.html |  2 +-
 app/urls.py             | 10 +++++++++-
 requirements.txt        |  2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/conf/common.py b/app/conf/common.py
index 73fa86b..7faff01 100644
--- a/app/conf/common.py
+++ b/app/conf/common.py
@@ -62,6 +62,8 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.humanize',
     'django.contrib.staticfiles',
+    'nexus',
+    'gargoyle',
     'sentry',
     'sentry.client',
     'south',
diff --git a/app/templates/base.html b/app/templates/base.html
index b8b17b7..cf3241a 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -30,7 +30,7 @@
                     <li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
                 {% endif %}
                 {% if request.user.is_staff %}
-                    <li><a href="/admin/">Admin</a></li>
+                    <li><a href="/nexus/">Admin</a></li>
                 {% endif %}
                     <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
             {% else %}
diff --git a/app/urls.py b/app/urls.py
index b227dc7..0acebf2 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -4,6 +4,7 @@ from django.contrib.auth.views import login
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.conf import settings
 
+
 from utils import installed
 from registration.views import register
 from sso.forms import RegistrationFormUniqueEmailBlocked
@@ -13,7 +14,6 @@ admin.autodiscover()
 urlpatterns = patterns('',
     ('', include('registration.backends.default.urls')),
     (r'^register/$', register, {'backend': 'registration.backends.default.DefaultBackend', 'form_class': RegistrationFormUniqueEmailBlocked}),
-    (r'^admin/', include(admin.site.urls)),
     ('', include('sso.urls')),
     (r'^eve/', include('eve_api.urls')),
     (r'^eveapi/', include('eve_proxy.urls')),
@@ -40,5 +40,13 @@ if installed('sentry'):
         (r'^sentry/', include('sentry.web.urls')),
     )
 
+if installed('nexus'):
+    import nexus
+    nexus.autodiscover()
+
+    urlpatterns += patterns('',
+        (r'^nexus/', include(nexus.site.urls)),
+    )
+
 if settings.DEBUG:
    urlpatterns += staticfiles_urlpatterns()
diff --git a/requirements.txt b/requirements.txt
index 297bd58..c5340d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,3 +13,5 @@ django-celery==2.2.4
 -e git+https://github.com/ericflo/django-pagination.git@47e7ec874cd7dddda5ed#egg=django-pagination
 xmpppy
 django-sentry
+nexus
+gargoyle