Skip to content

Commit

Permalink
add grappelli
Browse files Browse the repository at this point in the history
  • Loading branch information
miltontony committed Feb 3, 2015
1 parent 637a54a commit 14dcba4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ pytest
pytest-django
pytest-cov
pytest-xdist
django-grappelli<2.6.1
5 changes: 4 additions & 1 deletion sso/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ def abspath(*args):
# Application definition

INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'raven.contrib.django.raven_compat',
'grappelli',
'django.contrib.admin',
'south',
'unicoresso',
'mama_cas',
Expand Down Expand Up @@ -102,6 +103,8 @@ def abspath(*args):

LOGIN_URL = '/login/'

GRAPPELLI_ADMIN_TITLE = 'Universal Core Hub'

try:
from sso.local_settings import *
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion sso/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
),
url(r'', include('mama_cas.urls')),
url(r'^admin/', include(admin.site.urls)),

url(r'^grappelli/', include('grappelli.urls')),
)
10 changes: 3 additions & 7 deletions unicoresso/templates/home.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{% extends "mama_cas/__base.html" %}
{% load i18n %}
{% block content %}
<div class="row">
<div class="col-sm-6 col-md-4 col-md-offset-4">
<h2>Welcome to the Hub</h2>

</div>
</div>
{% endblock %}
{% block title %}{% trans "Universal Core Hub" %}{% endblock title %}
{% block content_title %}{% trans "Welcome to the Hub" %}{% endblock content_title %}
{% block content %}{% endblock %}

0 comments on commit 14dcba4

Please sign in to comment.