Start using mediasync.

sunlightlabs · Oct 3, 2011 · 2453dbb · 2453dbb
1 parent 31c74cd
commit 2453dbb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 18 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -11,3 +11,5 @@ django-postmark
 django-extensions
 python-memcached
 django-debug-toolbar
+flup
+django-mediasync
diff --git a/settings.py b/settings.py
@@ -83,6 +83,10 @@
 #     'django.template.loaders.eggs.Loader',
 )
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.core.context_processors.request',
+)
+
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -114,6 +118,7 @@
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
     'django_extensions',
+    'mediasync',
     'postmark',
     'duns',
     'debug_toolbar'

diff --git a/templates/base.html b/templates/base.html
@@ -1,3 +1,4 @@
+{% load media %}
 <!DOCTYPE html>
 
 <html>
@@ -11,7 +12,7 @@
 		{% block head_epilogue %}
 		{% endblock %}
 	</head>
-    <link rel="stylesheet" href="media/css/duns.css" type="text/css" media="screen" />
+	{% css duns.css %}
 	<body>
 		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
 	    <div class="sf_mini_header">
@@ -37,9 +38,9 @@ <h1><a class="textReplace" href="/">Six Degrees of Corporations</a></h1>
 	        <nav>
 	            <ul>
 	                <li class="first"><a href="">About</a></li>
-	                <li><a href="/existing-identifiers">Existing Identifer Systems</a></li>
-	                <li><a href="/singapore-uen">Case Study</a></li>
-	                <li><a href="/resources">Resources</a></li>
+					<li><a href="{% url existing-identifiers %}">Existing Identifer Systems</a></li>
+					<li><a href="{% url singapore-uen %}">Case Study</a></li>
+					<li><a href="{% url resources %}">Resources</a></li>
 	            </ul>    
 	        </nav>   
 	        <div class="clear"></div> 

diff --git a/templates/index.html b/templates/index.html
@@ -1,16 +1,17 @@
 {% extends "base.html" %}
+{% load media %}
 
 {% block head_epilogue %}
-	<script type="text/javascript" src="media/js/jquery-1.5.1.min.js"></script>
-	<script type="text/javascript" src="media/js/jquery.mousewheel.min.js"></script>
-	<script type="text/javascript" src="media/js/traer.js"></script>
-	<script type="text/javascript" src="media/js/processing-1.3.0-api.js"></script>
-	<script type="text/javascript" src="media/js/extend.js"></script>
-	<script type="text/javascript" src="media/js/ratelimitedcall.js"></script>
-	<script type="text/javascript" src="media/js/meanbuffer.js"></script>
-	<script type="text/javascript" src="media/js/crawler.js"></script>
-	<script type="text/javascript" src="media/js/particlegraph.js"></script>
-	<script type="text/javascript" src="media/js/dunsweb.js"></script>
+	{% js "jquery-1.5.1.min.js" %}
+	{% js "jquery.mousewheel.min.js" %}
+	{% js "traer.js" %}
+	{% js "processing-1.3.0-api.js" %}
+	{% js "extend.js" %}
+	{% js "ratelimitedcall.js" %}
+	{% js "meanbuffer.js" %}
+	{% js "crawler.js" %}
+	{% js "particlegraph.js" %}
+	{% js "dunsweb.js" %}
 {% endblock %}
 
 {% block body %}

diff --git a/urls.py b/urls.py
@@ -15,10 +15,14 @@
 
     # Uncomment the next line to enable the admin:
     # url(r'^admin/', include(admin.site.urls)),
-    url(r'^$', direct_to_template, {'template': 'index.html'}),
-    url(r'^existing-identifiers/$', direct_to_template, {'template': 'existing_identifiers.html'}),
-    url(r'^singapore-uen/$', direct_to_template, {'template': 'singapore_uen.html'}),
-    url(r'^resources/$', direct_to_template, {'template': 'resources.html'}),
+    url(r'^$', direct_to_template, {'template': 'index.html'}, 
+        name='index'),
+    url(r'^existing-identifiers/$', direct_to_template, {'template': 'existing_identifiers.html'}, 
+        name='existing-identifiers'),
+    url(r'^singapore-uen/$', direct_to_template, {'template': 'singapore_uen.html'}, 
+        name='singapore-uen'),
+    url(r'^resources/$', direct_to_template, {'template': 'resources.html'}, 
+        name='resources'),
     url(r'^contact', include('contactform.urls')),
     url(r'^duns[/]?', include('duns.urls')),
 )