From 0e4bf7c225fe2b68296f3a644755b49104459c14 Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Mon, 11 Jun 2012 18:14:11 -0400 Subject: Basic configuration stuff --- settings.py | 7 +++---- templates/base.html | 17 +++++++++++++++++ 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 %} +{% load i18n %} +
@@ -28,6 +30,21 @@ {% endif %}
  • {{month}}
    • + {% block usertools %} + {% if user.is_authenticated %} +
    + {% if user.active %} + Logged in as: {% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %} + {% else %}{% trans 'Welcome,' %} + {% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}. + {% endif %} +
      + {% block userlinks %}{% endblock %} +
    +
    + {% endif %} + {% endblock %} + {% if month_participants and month_discussions %}