diff options
| author | Roman Akinfold | 2012-12-27 05:35:03 +0800 | 
|---|---|---|
| committer | Roman Akinfold | 2012-12-27 05:35:03 +0800 | 
| commit | 5ae7786930ea0e6ec35f81ca7a38f36a80a4c6b7 (patch) | |
| tree | 632c6fc0dde0bbef9968444bdf8b74398341fc53 /rest_framework/templates | |
| parent | ed09d26fb8da2391cab4b096d276028384438eb6 (diff) | |
| download | django-rest-framework-5ae7786930ea0e6ec35f81ca7a38f36a80a4c6b7.tar.bz2 | |
Replace get_static_prefix templatetag with static
so now static files urls in html view are correct if we use cloud
storage to serve static files
Diffstat (limited to 'rest_framework/templates')
| -rw-r--r-- | rest_framework/templates/rest_framework/base.html | 18 | ||||
| -rw-r--r-- | rest_framework/templates/rest_framework/login.html | 8 | 
2 files changed, 13 insertions, 13 deletions
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index fb0e19f0..0e09e506 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -1,6 +1,6 @@  {% load url from future %}  {% load rest_framework %} -{% load static %} +{% load staticfiles %}  <!DOCTYPE html>  <html>      <head> @@ -14,10 +14,10 @@          <title>{% block title %}Django REST framework{% endblock %}</title>          {% block style %} -        <link rel="stylesheet" type="text/css" href="{% get_static_prefix %}rest_framework/css/bootstrap.min.css"/> -        <link rel="stylesheet" type="text/css" href="{% get_static_prefix %}rest_framework/css/bootstrap-tweaks.css"/> -        <link rel="stylesheet" type="text/css" href='{% get_static_prefix %}rest_framework/css/prettify.css'/> -        <link rel="stylesheet" type="text/css" href='{% get_static_prefix %}rest_framework/css/default.css'/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>          {% endblock %}      {% endblock %} @@ -195,10 +195,10 @@      {% endblock %}      {% block script %} -    <script src="{% get_static_prefix %}rest_framework/js/jquery-1.8.1-min.js"></script> -    <script src="{% get_static_prefix %}rest_framework/js/bootstrap.min.js"></script> -    <script src="{% get_static_prefix %}rest_framework/js/prettify-min.js"></script> -    <script src="{% get_static_prefix %}rest_framework/js/default.js"></script> +    <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script> +    <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script> +    <script src="{% static "rest_framework/js/prettify-min.js" %}"></script> +    <script src="{% static "rest_framework/js/default.js" %}"></script>      {% endblock %}    </body>  </html> diff --git a/rest_framework/templates/rest_framework/login.html b/rest_framework/templates/rest_framework/login.html index c1271399..3681a158 100644 --- a/rest_framework/templates/rest_framework/login.html +++ b/rest_framework/templates/rest_framework/login.html @@ -1,11 +1,11 @@  {% load url from future %} -{% load static %} +{% load staticfiles %}  <html>      <head> -        <link rel="stylesheet" type="text/css" href="{% get_static_prefix %}rest_framework/css/bootstrap.min.css"/> -        <link rel="stylesheet" type="text/css" href="{% get_static_prefix %}rest_framework/css/bootstrap-tweaks.css"/> -        <link rel="stylesheet" type="text/css" href='{% get_static_prefix %}rest_framework/css/default.css'/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/> +        <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>      </head>      <body class="container">  | 
