Add Nexus/Gargoyle

This commit is contained in:
2011-08-26 11:24:28 +01:00
parent 6c6f6ec6c5
commit 98832f8782
4 changed files with 14 additions and 2 deletions

View File

@@ -62,6 +62,8 @@ INSTALLED_APPS = (
'django.contrib.sites', 'django.contrib.sites',
'django.contrib.humanize', 'django.contrib.humanize',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'nexus',
'gargoyle',
'sentry', 'sentry',
'sentry.client', 'sentry.client',
'south', 'south',

View File

@@ -30,7 +30,7 @@
<li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li> <li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
{% endif %} {% endif %}
{% if request.user.is_staff %} {% if request.user.is_staff %}
<li><a href="/admin/">Admin</a></li> <li><a href="/nexus/">Admin</a></li>
{% endif %} {% endif %}
<li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li> <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
{% else %} {% else %}

View File

@@ -4,6 +4,7 @@ from django.contrib.auth.views import login
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.conf import settings from django.conf import settings
from utils import installed from utils import installed
from registration.views import register from registration.views import register
from sso.forms import RegistrationFormUniqueEmailBlocked from sso.forms import RegistrationFormUniqueEmailBlocked
@@ -13,7 +14,6 @@ admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
('', include('registration.backends.default.urls')), ('', include('registration.backends.default.urls')),
(r'^register/$', register, {'backend': 'registration.backends.default.DefaultBackend', 'form_class': RegistrationFormUniqueEmailBlocked}), (r'^register/$', register, {'backend': 'registration.backends.default.DefaultBackend', 'form_class': RegistrationFormUniqueEmailBlocked}),
(r'^admin/', include(admin.site.urls)),
('', include('sso.urls')), ('', include('sso.urls')),
(r'^eve/', include('eve_api.urls')), (r'^eve/', include('eve_api.urls')),
(r'^eveapi/', include('eve_proxy.urls')), (r'^eveapi/', include('eve_proxy.urls')),
@@ -40,5 +40,13 @@ if installed('sentry'):
(r'^sentry/', include('sentry.web.urls')), (r'^sentry/', include('sentry.web.urls')),
) )
if installed('nexus'):
import nexus
nexus.autodiscover()
urlpatterns += patterns('',
(r'^nexus/', include(nexus.site.urls)),
)
if settings.DEBUG: if settings.DEBUG:
urlpatterns += staticfiles_urlpatterns() urlpatterns += staticfiles_urlpatterns()

View File

@@ -13,3 +13,5 @@ django-celery==2.2.4
-e git+https://github.com/ericflo/django-pagination.git@47e7ec874cd7dddda5ed#egg=django-pagination -e git+https://github.com/ericflo/django-pagination.git@47e7ec874cd7dddda5ed#egg=django-pagination
xmpppy xmpppy
django-sentry django-sentry
nexus
gargoyle