From cbd0752740b4dfb054179f68ca330b8ac212ec77 Mon Sep 17 00:00:00 2001 From: Paul Oswald Date: Wed, 15 Feb 2012 10:30:56 +0900 Subject: Move the templates into a named directory --- djangorestframework/renderers.py | 6 +- djangorestframework/templates/api_login.html | 44 ------- djangorestframework/templates/base_renderer.html | 142 --------------------- .../templates/djangorestframework/api_login.html | 44 +++++++ .../djangorestframework/base_renderer.html | 142 +++++++++++++++++++++ .../templates/djangorestframework/renderer.html | 3 + .../templates/djangorestframework/renderer.txt | 8 ++ djangorestframework/templates/renderer.html | 3 - djangorestframework/templates/renderer.txt | 8 -- djangorestframework/utils/staticviews.py | 4 +- 10 files changed, 202 insertions(+), 202 deletions(-) delete mode 100644 djangorestframework/templates/api_login.html delete mode 100644 djangorestframework/templates/base_renderer.html create mode 100644 djangorestframework/templates/djangorestframework/api_login.html create mode 100644 djangorestframework/templates/djangorestframework/base_renderer.html create mode 100644 djangorestframework/templates/djangorestframework/renderer.html create mode 100644 djangorestframework/templates/djangorestframework/renderer.txt delete mode 100644 djangorestframework/templates/renderer.html delete mode 100644 djangorestframework/templates/renderer.txt 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/api_login.html deleted file mode 100644 index 07929f0c..00000000 --- a/djangorestframework/templates/api_login.html +++ /dev/null @@ -1,44 +0,0 @@ -{% load static %} - - - - - - - - -
- - - -
-
-
- {% csrf_token %} -
- {{ form.username }} -
-
- {{ form.password }} - -
-
- -
-
- -
-
-
- - - -
- - diff --git a/djangorestframework/templates/base_renderer.html b/djangorestframework/templates/base_renderer.html deleted file mode 100644 index 1d4ae92a..00000000 --- a/djangorestframework/templates/base_renderer.html +++ /dev/null @@ -1,142 +0,0 @@ - - -{% load urlize_quoted_links %} -{% load add_query_param %} -{% load static %} - - - - {% block extrastyle %}{% endblock %} - {% block title %}Django REST framework - {{ name }}{% endblock %} - {% block extrahead %}{% endblock %} - {% block blockbots %}{% endblock %} - - -
- - - -
- {% block breadcrumbs %} - {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} - {{ breadcrumb_name }} {% if not forloop.last %}›{% endif %} - {% endfor %} - {% endblock %} -
- - -
- - {% if 'OPTIONS' in view.allowed_methods %} -
- {% csrf_token %} - - -
- {% endif %} - -
-

{{ name }}

-

{{ description }}

-
- 
{{ response.status }} {{ response.status_text }}{% autoescape off %}
-{% for key, val in response.headers.items %}{{ key }}: {{ val|urlize_quoted_links }}
-{% endfor %}
-{{ content|urlize_quoted_links }}
{% endautoescape %}
- - {% if 'GET' in view.allowed_methods %} -
-
-

GET {{ name }}

-
- GET - {% for format in available_formats %} - {% with FORMAT_PARAM|add:"="|add:format as param %} - [{{ format }}] - {% endwith %} - {% endfor %} -
-
-
- {% endif %} - - {# Only display the POST/PUT/DELETE forms if method tunneling via POST forms is enabled and the user has permissions on this view. #} - {% if METHOD_PARAM and response.status != 403 %} - - {% if 'POST' in view.allowed_methods %} -
-
-

POST {{ name }}

- {% csrf_token %} - {{ post_form.non_field_errors }} - {% for field in post_form %} -
- {{ field.label_tag }} - {{ field }} - {{ field.help_text }} - {{ field.errors }} -
- {% endfor %} -
- -
-
-
- {% endif %} - - {% if 'PUT' in view.allowed_methods %} -
-
-

PUT {{ name }}

- - {% csrf_token %} - {{ put_form.non_field_errors }} - {% for field in put_form %} -
- {{ field.label_tag }} - {{ field }} - {{ field.help_text }} - {{ field.errors }} -
- {% endfor %} -
- -
-
-
- {% endif %} - - {% if 'DELETE' in view.allowed_methods %} -
-
-

DELETE {{ name }}

- {% csrf_token %} - -
- -
-
-
- {% endif %} - - {% endif %} -
- - -
- - - {% block footer %}{% endblock %} -
- - diff --git a/djangorestframework/templates/djangorestframework/api_login.html b/djangorestframework/templates/djangorestframework/api_login.html new file mode 100644 index 00000000..07929f0c --- /dev/null +++ b/djangorestframework/templates/djangorestframework/api_login.html @@ -0,0 +1,44 @@ +{% load static %} + + + + + + + + +
+ + + +
+
+
+ {% csrf_token %} +
+ {{ form.username }} +
+
+ {{ form.password }} + +
+
+ +
+
+ +
+
+
+ + + +
+ + diff --git a/djangorestframework/templates/djangorestframework/base_renderer.html b/djangorestframework/templates/djangorestframework/base_renderer.html new file mode 100644 index 00000000..1d4ae92a --- /dev/null +++ b/djangorestframework/templates/djangorestframework/base_renderer.html @@ -0,0 +1,142 @@ + + +{% load urlize_quoted_links %} +{% load add_query_param %} +{% load static %} + + + + {% block extrastyle %}{% endblock %} + {% block title %}Django REST framework - {{ name }}{% endblock %} + {% block extrahead %}{% endblock %} + {% block blockbots %}{% endblock %} + + +
+ + + +
+ {% block breadcrumbs %} + {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} + {{ breadcrumb_name }} {% if not forloop.last %}›{% endif %} + {% endfor %} + {% endblock %} +
+ + +
+ + {% if 'OPTIONS' in view.allowed_methods %} +
+ {% csrf_token %} + + +
+ {% endif %} + +
+

{{ name }}

+

{{ description }}

+
+ 
{{ response.status }} {{ response.status_text }}{% autoescape off %}
+{% for key, val in response.headers.items %}{{ key }}: {{ val|urlize_quoted_links }}
+{% endfor %}
+{{ content|urlize_quoted_links }}
{% endautoescape %}
+ + {% if 'GET' in view.allowed_methods %} +
+
+

GET {{ name }}

+
+ GET + {% for format in available_formats %} + {% with FORMAT_PARAM|add:"="|add:format as param %} + [{{ format }}] + {% endwith %} + {% endfor %} +
+
+
+ {% endif %} + + {# Only display the POST/PUT/DELETE forms if method tunneling via POST forms is enabled and the user has permissions on this view. #} + {% if METHOD_PARAM and response.status != 403 %} + + {% if 'POST' in view.allowed_methods %} +
+
+

POST {{ name }}

+ {% csrf_token %} + {{ post_form.non_field_errors }} + {% for field in post_form %} +
+ {{ field.label_tag }} + {{ field }} + {{ field.help_text }} + {{ field.errors }} +
+ {% endfor %} +
+ +
+
+
+ {% endif %} + + {% if 'PUT' in view.allowed_methods %} +
+
+

PUT {{ name }}

+ + {% csrf_token %} + {{ put_form.non_field_errors }} + {% for field in put_form %} +
+ {{ field.label_tag }} + {{ field }} + {{ field.help_text }} + {{ field.errors }} +
+ {% endfor %} +
+ +
+
+
+ {% endif %} + + {% if 'DELETE' in view.allowed_methods %} +
+
+

DELETE {{ name }}

+ {% csrf_token %} + +
+ +
+
+
+ {% endif %} + + {% endif %} +
+ + +
+ + + {% block footer %}{% endblock %} +
+ + diff --git a/djangorestframework/templates/djangorestframework/renderer.html b/djangorestframework/templates/djangorestframework/renderer.html new file mode 100644 index 00000000..01ca5543 --- /dev/null +++ b/djangorestframework/templates/djangorestframework/renderer.html @@ -0,0 +1,3 @@ +{% 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/djangorestframework/renderer.txt b/djangorestframework/templates/djangorestframework/renderer.txt new file mode 100644 index 00000000..b584952c --- /dev/null +++ b/djangorestframework/templates/djangorestframework/renderer.txt @@ -0,0 +1,8 @@ +{% autoescape off %}{{ name }} + +{{ description }} + +HTTP/1.0 {{ response.status }} {{ response.status_text }} +{% for key, val in response.headers.items %}{{ key }}: {{ val }} +{% endfor %} +{{ content }}{% endautoescape %} diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html deleted file mode 100644 index adb42c7f..00000000 --- a/djangorestframework/templates/renderer.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends "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/renderer.txt deleted file mode 100644 index b584952c..00000000 --- a/djangorestframework/templates/renderer.txt +++ /dev/null @@ -1,8 +0,0 @@ -{% autoescape off %}{{ name }} - -{{ description }} - -HTTP/1.0 {{ response.status }} {{ response.status_text }} -{% for key, val in response.headers.items %}{{ key }}: {{ val }} -{% endfor %} -{{ content }}{% endautoescape %} 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) -- cgit v1.2.3