diff options
| author | Tom Christie | 2012-01-21 02:39:02 -0800 |
|---|---|---|
| committer | Tom Christie | 2012-01-21 02:39:02 -0800 |
| commit | 7a87fc87c2eb43509fa6d037c88707aaff7c9b2a (patch) | |
| tree | 3f98cb07c2a5df6e11735d9935d9d529ea08757e | |
| parent | bf8fe66f443381981ee0b1d8583895a5a57b69e5 (diff) | |
| parent | 26c1558e0f10ebf6549d51e29255ada2e8825521 (diff) | |
| download | django-rest-framework-7a87fc87c2eb43509fa6d037c88707aaff7c9b2a.tar.bz2 | |
Merge pull request #138 from mjumbewu/feature/admin_static_files
Support both staticfiles and ADMIN_MEDIA_PREFIX styles.
| -rw-r--r-- | djangorestframework/templates/api_login.html | 22 | ||||
| -rw-r--r-- | djangorestframework/templates/renderer.html | 9 |
2 files changed, 21 insertions, 10 deletions
diff --git a/djangorestframework/templates/api_login.html b/djangorestframework/templates/api_login.html index 9d06e851..750f898b 100644 --- a/djangorestframework/templates/api_login.html +++ b/djangorestframework/templates/api_login.html @@ -1,8 +1,14 @@ <html> <head> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/login.css' /> + {% if ADMIN_MEDIA_PREFIX %} + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/login.css' /> + {% else %} + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/forms.css'/> + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/login.css' /> + {% endif %} <style> .form-row {border-bottom: 0.25em !important}</style> </head> @@ -11,12 +17,12 @@ <div id="header"> <div id="branding"> <h1 id="site-name">Django REST framework</h1> - </div> + </div> </div> <div id="content" class="colM"> - + <div id="content-main"> <form method="post" action="{% url djangorestframework.utils.staticviews.api_login %}" id="login-form"> {% csrf_token %} @@ -37,12 +43,12 @@ document.getElementById('id_username').focus() </script> </div> - + <br class="clear"> </div> - <div id="footer"></div> + <div id="footer"></div> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html index 132bdb81..0532d515 100644 --- a/djangorestframework/templates/renderer.html +++ b/djangorestframework/templates/renderer.html @@ -11,8 +11,13 @@ /* Custom styles */ .version{font-size:8px;} </style> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> + {% if ADMIN_MEDIA_PREFIX %} + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> + {% else %} + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/forms.css'/> + {% endif %} <title>Django REST framework - {{ name }}</title> </head> <body> |