Skip to content

D
django-rest-framework
Commit 5ae77869 by Roman Akinfold
Options

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
parent ed09d26f
Showing with 13 additions and 13 deletions
rest_framework/templates/rest_framework/base.html
{% load url from future %} {% load url from future %}
{% load rest_framework %} {% load rest_framework %}
{% load static %} {% load staticfiles %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<title>{% block title %}Django REST framework{% endblock %}</title> <title>{% block title %}Django REST framework{% endblock %}</title>
{% block style %} {% 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="{% static "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="{% static "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="{% static "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/default.css" %}"/>
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
...@@ -195,10 +195,10 @@ ...@@ -195,10 +195,10 @@
{% endblock %} {% endblock %}
{% block script %} {% block script %}
<script src="{% get_static_prefix %}rest_framework/js/jquery-1.8.1-min.js"></script> <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
<script src="{% get_static_prefix %}rest_framework/js/bootstrap.min.js"></script> <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
<script src="{% get_static_prefix %}rest_framework/js/prettify-min.js"></script> <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
<script src="{% get_static_prefix %}rest_framework/js/default.js"></script> <script src="{% static "rest_framework/js/default.js" %}"></script>
{% endblock %} {% endblock %}
</body> </body>
</html> </html>
rest_framework/templates/rest_framework/login.html
{% load url from future %} {% load url from future %}
{% load static %} {% load staticfiles %}
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="{% get_static_prefix %}rest_framework/css/bootstrap.min.css"/> <link rel="stylesheet" type="text/css" href="{% static "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="{% static "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/default.css" %}"/>
</head> </head>
<body class="container"> <body class="container">
......
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