diff options
| -rw-r--r-- | settings.py | 7 | ||||
| -rw-r--r-- | templates/base.html | 17 | ||||
| -rw-r--r-- | urls.py | 8 |
3 files changed, 24 insertions, 8 deletions
diff --git a/settings.py b/settings.py index b1feed0..fd23432 100644 --- a/settings.py +++ b/settings.py @@ -119,17 +119,16 @@ TEMPLATE_DIRS = ( ) INSTALLED_APPS = ( -# 'django.contrib.auth', + 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', # 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: + 'django.contrib.admin', # 'django.contrib.admindocs', 'rdbms', + 'social_auth', 'djangorestframework', 'gravatar', ) diff --git a/templates/base.html b/templates/base.html index dc84fcb..233d81b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,6 +15,8 @@ {% endblock %} </head> +{% load i18n %} + <body> <!-- Header --> <div class="header"> @@ -28,6 +30,21 @@ {% endif %} <li id="page_date">{{month}}</li> </ul> + {% block usertools %} + {% if user.is_authenticated %} + <div id="user-tools"> + {% if user.active %} + Logged in as: <a href="{% url user_profile %}">{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</a> + {% else %}{% trans 'Welcome,' %} + <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>. + {% endif %} + <ul class="userlinks"> + {% block userlinks %}{% endblock %} + </ul> + </div> + {% endif %} + {% endblock %} + {% if month_participants and month_discussions %} <ul class="inline-block" id="top_right"> <li class="participant"> {{month_participants}} participants</li> @@ -5,8 +5,8 @@ from api import EmailResource, ThreadResource, SearchResource from django.contrib.staticfiles.urls import staticfiles_urlpatterns # Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() +from django.contrib import admin +admin.autodiscover() urlpatterns = patterns('', # Index @@ -72,8 +72,8 @@ urlpatterns = patterns('', # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - # Uncomment the next line to enable the admin: - # url(r'^admin/', include(admin.site.urls)), + # Admin + url(r'^admin/', include(admin.site.urls)), ) #) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) urlpatterns += staticfiles_urlpatterns() |