Commit 5076b6af authored by Titia de Castro's avatar Titia de Castro

Merge remote-tracking branch 'origin' into decastro/announcements

parents 9d170c81 c1751c54
<html lang="en">
<head>
<link rel="stylesheet" href="style.css">
<title>{% block title %}Widget{% endblock %}</title>
{% block styles %}{% endblock %}
</head>
<body>
<div id="content">
{% block content %}{% endblock %}
</div>
{% block scripts %}{% endblock %}
</body>
</html>
\ No newline at end of file
...@@ -62,7 +62,7 @@ ROOT_URLCONF = 'widget.urls' ...@@ -62,7 +62,7 @@ ROOT_URLCONF = 'widget.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [], 'DIRS': [os.path.join(BASE_DIR, 'templates')],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment