aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Oswald2012-02-15 10:30:56 +0900
committerPaul Oswald2012-02-15 10:33:49 +0900
commitcbd0752740b4dfb054179f68ca330b8ac212ec77 (patch)
tree00551ded470ef8cd6212cf642fa0a3bf287b9647
parente0f7d2cd9f9ef1f9788d402b6a2861946d4c2fc9 (diff)
downloaddjango-rest-framework-cbd0752740b4dfb054179f68ca330b8ac212ec77.tar.bz2
Move the templates into a named directory
-rw-r--r--djangorestframework/renderers.py6
-rw-r--r--djangorestframework/templates/djangorestframework/api_login.html (renamed from djangorestframework/templates/api_login.html)0
-rw-r--r--djangorestframework/templates/djangorestframework/base_renderer.html (renamed from djangorestframework/templates/base_renderer.html)0
-rw-r--r--djangorestframework/templates/djangorestframework/renderer.html (renamed from djangorestframework/templates/renderer.html)2
-rw-r--r--djangorestframework/templates/djangorestframework/renderer.txt (renamed from djangorestframework/templates/renderer.txt)0
-rw-r--r--djangorestframework/utils/staticviews.py4
6 files changed, 6 insertions, 6 deletions
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py
index bb0f789a..33c549fd 100644
--- a/djangorestframework/renderers.py
+++ b/djangorestframework/renderers.py
@@ -373,7 +373,7 @@ class DocumentingHTMLRenderer(DocumentingTemplateRenderer):
media_type = 'text/html'
format = 'html'
- template = 'renderer.html'
+ template = 'djangorestframework/renderer.html'
class DocumentingXHTMLRenderer(DocumentingTemplateRenderer):
@@ -385,7 +385,7 @@ class DocumentingXHTMLRenderer(DocumentingTemplateRenderer):
media_type = 'application/xhtml+xml'
format = 'xhtml'
- template = 'renderer.html'
+ template = 'djangorestframework/renderer.html'
class DocumentingPlainTextRenderer(DocumentingTemplateRenderer):
@@ -397,7 +397,7 @@ class DocumentingPlainTextRenderer(DocumentingTemplateRenderer):
media_type = 'text/plain'
format = 'txt'
- template = 'renderer.txt'
+ template = 'djangorestframework/renderer.txt'
DEFAULT_RENDERERS = (
diff --git a/djangorestframework/templates/api_login.html b/djangorestframework/templates/djangorestframework/api_login.html
index 07929f0c..07929f0c 100644
--- a/djangorestframework/templates/api_login.html
+++ b/djangorestframework/templates/djangorestframework/api_login.html
diff --git a/djangorestframework/templates/base_renderer.html b/djangorestframework/templates/djangorestframework/base_renderer.html
index 1d4ae92a..1d4ae92a 100644
--- a/djangorestframework/templates/base_renderer.html
+++ b/djangorestframework/templates/djangorestframework/base_renderer.html
diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/djangorestframework/renderer.html
index adb42c7f..01ca5543 100644
--- a/djangorestframework/templates/renderer.html
+++ b/djangorestframework/templates/djangorestframework/renderer.html
@@ -1,3 +1,3 @@
-{% extends "base_renderer.html" %}
+{% extends "djangorestframework/base_renderer.html" %}
{# Override this template in your own templates directory to customize #} \ No newline at end of file
diff --git a/djangorestframework/templates/renderer.txt b/djangorestframework/templates/djangorestframework/renderer.txt
index b584952c..b584952c 100644
--- a/djangorestframework/templates/renderer.txt
+++ b/djangorestframework/templates/djangorestframework/renderer.txt
diff --git a/djangorestframework/utils/staticviews.py b/djangorestframework/utils/staticviews.py
index 9bae0ee7..caa63ccd 100644
--- a/djangorestframework/utils/staticviews.py
+++ b/djangorestframework/utils/staticviews.py
@@ -12,7 +12,7 @@ import base64
# be making settings changes in order to accomodate django-rest-framework
@csrf_protect
@never_cache
-def api_login(request, template_name='api_login.html',
+def api_login(request, template_name='djangorestframework/api_login.html',
redirect_field_name=REDIRECT_FIELD_NAME,
authentication_form=AuthenticationForm):
"""Displays the login form and handles the login action."""
@@ -57,5 +57,5 @@ def api_login(request, template_name='api_login.html',
}, context_instance=RequestContext(request))
-def api_logout(request, next_page=None, template_name='api_login.html', redirect_field_name=REDIRECT_FIELD_NAME):
+def api_logout(request, next_page=None, template_name='djangorestframework/api_login.html', redirect_field_name=REDIRECT_FIELD_NAME):
return logout(request, next_page, template_name, redirect_field_name)