Adding context for accessing media root from templates

firstclown · Aug 28, 2008 · c0e8b8c · c0e8b8c
1 parent cf16842
commit c0e8b8c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/lies/context_processors.py b/lies/context_processors.py
@@ -0,0 +1,3 @@
+def media_url(request):
+    from django.conf import settings
+    return {'media_url': settings.MEDIA_URL}
diff --git a/lies/views.py b/lies/views.py
@@ -1,6 +1,7 @@
 from django.shortcuts import render_to_response
 from django.http import HttpResponseRedirect,HttpResponse
 from django.core import urlresolvers,serializers
+from django.template import RequestContext
 from lieswetellourselves.lies.models import Lie,Vote
 from lieswetellourselves.lies.forms import LieForm
 from lieswetellourselves.lies.json_encode import json_encode
@@ -45,4 +46,4 @@ def list_lies(request):
     if(request.is_ajax()):
         return HttpResponse(json_encode(object_list))
     else:
-        return render_to_response('lies/lie_list.html', {'object_list':object_list, 'form': LieForm()})
+        return render_to_response('lies/lie_list.html', {'object_list':object_list, 'form': LieForm()}, context_instance=RequestContext(request))
diff --git a/settings.py b/settings.py
@@ -40,7 +40,7 @@
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/site-media/'
+MEDIA_URL = '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
@@ -74,6 +74,8 @@
     '/home/firstclown/Projects/lieswetellourselves/lies/templates/',
 )
 
+TEMPLATE_CONTEXT_PROCESSORS = ('lieswetellourselves.lies.context_processors.media_url',)
+
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',

diff --git a/templates/lie_base.html b/templates/lie_base.html
@@ -3,15 +3,15 @@
     <head>
         <title>{% block title %}{% endblock%}</title>
         <!-- css -->
-        <link rel="stylesheet" type="text/css" href="http://media.lieswetellourselves.com/reset-fonts-grids.css">
-        <link rel="stylesheet" type="text/css" href="http://media.lieswetellourselves.com/base-min.css">
-        <link rel="stylesheet" type="text/css" href="http://media.lieswetellourselves.com/lies.css">
+        <link rel="stylesheet" type="text/css" href="{{ media_url }}reset-fonts-grids.css">
+        <link rel="stylesheet" type="text/css" href="{{ media_url }}base-min.css">
+        <link rel="stylesheet" type="text/css" href="{{ media_url }}lies.css">
         <!-- js -->
-        <script type="text/javascript" src="http://media.lieswetellourselves.com/yahoo-dom-event.js"></script>
-        <script type="text/javascript" src="http://media.lieswetellourselves.com/animation-min.js"></script>
-        <script type="text/javascript" src="http://media.lieswetellourselves.com/connection-min.js"></script>
-        <script type="text/javascript" src="http://media.lieswetellourselves.com/json-min.js"></script>
-        <script type="text/javascript" src="http://media.lieswetellourselves.com/lies.js"></script>
+        <script type="text/javascript" src="{{ media_url }}yahoo-dom-event.js"></script>
+        <script type="text/javascript" src="{{ media_url }}animation-min.js"></script>
+        <script type="text/javascript" src="{{ media_url }}connection-min.js"></script>
+        <script type="text/javascript" src="{{ media_url }}json-min.js"></script>
+        <script type="text/javascript" src="{{ media_url }}lies.js"></script>
     </head>
     <body>
         <div id="doc">

diff --git a/urls.py b/urls.py
@@ -13,7 +13,7 @@
 
     # Uncomment the next line for to enable the admin:
     # (r'^admin/(.*)', admin.site.root),
-    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/home/firstclown/Projects/lieswetellourselves/media'}),
+#    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/home/firstclown/Projects/lieswetellourselves/media'}),
     (r'', include('lieswetellourselves.lies.urls')),
 
 )