mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 01:47:59 +03:00 
			
		
		
		
	Use staticfiles for serving css.  Fixes #116.
				
					
				
			This commit is contained in:
		
							parent
							
								
									f34ed6d1f3
								
							
						
					
					
						commit
						765ec0b76e
					
				
							
								
								
									
										1152
									
								
								djangorestframework/static/css/djangorestframework.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1152
									
								
								djangorestframework/static/css/djangorestframework.css
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
					@ -1,23 +1,12 @@
 | 
				
			||||||
{% load urlize_quoted_links %}{% load add_query_param %}<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 | 
					<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 | 
				
			||||||
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 | 
					        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 | 
				
			||||||
 | 
					{% load urlize_quoted_links %}
 | 
				
			||||||
 | 
					{% load add_query_param %}
 | 
				
			||||||
 | 
					{% load static %}
 | 
				
			||||||
<html xmlns="http://www.w3.org/1999/xhtml">
 | 
					<html xmlns="http://www.w3.org/1999/xhtml">
 | 
				
			||||||
  	<head>
 | 
					  	<head>
 | 
				
			||||||
     <style>
 | 
					      	<link rel="stylesheet" type="text/css" href='{% get_static_prefix %}css/djangorestframework.css'/>
 | 
				
			||||||
       /* Override some of the Django admin styling */
 | 
					 | 
				
			||||||
       #site-name a {color: #F4F379 !important;}
 | 
					 | 
				
			||||||
       .errorlist {display: inline !important}
 | 
					 | 
				
			||||||
       .errorlist li {display: inline !important; background: white !important; color: black !important; border: 0 !important;}
 | 
					 | 
				
			||||||
	   /* Custom styles */
 | 
					 | 
				
			||||||
	   .version{font-size:8px;}
 | 
					 | 
				
			||||||
     </style>
 | 
					 | 
				
			||||||
    {% 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>
 | 
					  		<title>Django REST framework - {{ name }}</title>
 | 
				
			||||||
  	</head>
 | 
					  	</head>
 | 
				
			||||||
  <body>
 | 
					  <body>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -53,16 +53,10 @@ MEDIA_ROOT = os.path.join(os.getenv('EPIO_DATA_DIRECTORY', '.'), 'media')
 | 
				
			||||||
# trailing slash if there is a path component (optional in other cases).
 | 
					# trailing slash if there is a path component (optional in other cases).
 | 
				
			||||||
# Examples: "http://media.lawrence.com", "http://example.com/media/"
 | 
					# Examples: "http://media.lawrence.com", "http://example.com/media/"
 | 
				
			||||||
# NOTE: None of the djangorestframework examples serve media content via MEDIA_URL.
 | 
					# NOTE: None of the djangorestframework examples serve media content via MEDIA_URL.
 | 
				
			||||||
MEDIA_URL = ''
 | 
					MEDIA_URL = '/uploads/'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					STATIC_URL = '/static/'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 | 
					 | 
				
			||||||
# trailing slash.
 | 
					 | 
				
			||||||
# Examples: "http://foo.com/media/", "/media/".
 | 
					 | 
				
			||||||
# NOTE: djangorestframework does not require the admin app to be installed,
 | 
					 | 
				
			||||||
# but it does require the admin media be served.  Django's test server will do
 | 
					 | 
				
			||||||
# this for you automatically, but in production you'll want to make sure you
 | 
					 | 
				
			||||||
# serve the admin media from somewhere.
 | 
					 | 
				
			||||||
ADMIN_MEDIA_PREFIX = '/static/admin'
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Make this unique, and don't share it with anybody.
 | 
					# Make this unique, and don't share it with anybody.
 | 
				
			||||||
SECRET_KEY = 't&9mru2_k$t8e2-9uq-wu2a1)9v*us&j3i#lsqkt(lbx*vh1cu'
 | 
					SECRET_KEY = 't&9mru2_k$t8e2-9uq-wu2a1)9v*us&j3i#lsqkt(lbx*vh1cu'
 | 
				
			||||||
| 
						 | 
					@ -102,6 +96,7 @@ INSTALLED_APPS = (
 | 
				
			||||||
    'django.contrib.contenttypes',
 | 
					    'django.contrib.contenttypes',
 | 
				
			||||||
    'django.contrib.sessions',
 | 
					    'django.contrib.sessions',
 | 
				
			||||||
    'django.contrib.sites',
 | 
					    'django.contrib.sites',
 | 
				
			||||||
 | 
					    'django.contrib.staticfiles',
 | 
				
			||||||
    'django.contrib.messages',
 | 
					    'django.contrib.messages',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    'djangorestframework',
 | 
					    'djangorestframework',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,7 @@
 | 
				
			||||||
from django.conf.urls.defaults import patterns, include, url
 | 
					from django.conf.urls.defaults import patterns, include, url
 | 
				
			||||||
from django.conf import settings
 | 
					from django.conf import settings
 | 
				
			||||||
from sandbox.views import Sandbox
 | 
					from sandbox.views import Sandbox
 | 
				
			||||||
 | 
					from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 | 
				
			||||||
 | 
					
 | 
				
			||||||
urlpatterns = patterns('',
 | 
					urlpatterns = patterns('',
 | 
				
			||||||
    (r'^$', Sandbox.as_view()),
 | 
					    (r'^$', Sandbox.as_view()),
 | 
				
			||||||
| 
						 | 
					@ -15,3 +16,4 @@ urlpatterns = patterns('',
 | 
				
			||||||
    (r'^', include('djangorestframework.urls')),
 | 
					    (r'^', include('djangorestframework.urls')),
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					urlpatterns += staticfiles_urlpatterns()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user