From f5e754c285bd10128abf735473b12473bc2f8325 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Fri, 16 Aug 2013 16:28:23 +0200 Subject: [PATCH] Getting templates and URLS to work --- .../{{cookiecutter.repo_name}}/config/urls.py | 12 ++++++++++-- .../{{cookiecutter.repo_name}}/templates/base.html | 8 ++++---- .../templates/pages/about.html | 2 +- .../templates/pages/home.html | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py index e8459d7d..d796beff 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py @@ -1,4 +1,9 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.conf import settings from django.conf.urls import patterns, include, url +from django.conf.urls.static import static from django.views.generic import TemplateView # Uncomment the next two lines to enable the admin: @@ -16,6 +21,9 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), - # Uncomment the next line to enable the admin: url(r'^users/', include("users.urls", namespace="users")), -) + url(r'^users/', include("users.urls", namespace="users")), + #url(r'^avatar/', include('avatar.urls')), + url(r'^accounts/', include('allauth.urls')), +) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html index 4e847b06..752eaf73 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html @@ -1,4 +1,4 @@ -{% raw %}{% load staticfiles %} +{% raw %}{% load staticfiles i18n %} @@ -32,11 +32,11 @@ - {{ project_name }} + {{ project_name }}