changeset 8:8be7bdae8fb6

Fix some bugs on how static data was served during debug
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Sat, 26 Jun 2010 02:19:08 -0500
parents 6c2d400091fd
children 2da64c6aa689
files templates/base.djhtml urls.py
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/templates/base.djhtml	Sat Jun 26 02:04:53 2010 -0500
+++ b/templates/base.djhtml	Sat Jun 26 02:19:08 2010 -0500
@@ -16,9 +16,9 @@
     enables collaboration with Octave-related personal projects and
     code" />
 
-    <link href="/media/{% block cssid %}base{% endblock %}.css" 
+    <link href="/static/{% block cssid %}base{% endblock %}.css" 
           rel="stylesheet" type="text/css" media="screen" />
-    <link href="/media/print.css" 
+    <link href="/static/print.css" 
           rel="stylesheet" type="text/css" media="print" />
       {% block extrahead %}{% endblock %}
   </head>
@@ -28,7 +28,7 @@
 
   <div id="container">
     <div id="header">
-      <h1 id="logo"><a href="http://www.octave.org/"><img src="/site_media/icon.png"
+      <h1 id="logo"><a href="http://www.octave.org/"><img src="/static/icon.png"
       alt="Octave" /></a></h1>
       <ul id="nav-global">
         <li id="nav-homepage"><a href="/">Home</a></li>
--- a/urls.py	Sat Jun 26 02:04:53 2010 -0500
+++ b/urls.py	Sat Jun 26 02:19:08 2010 -0500
@@ -23,7 +23,8 @@
 from django.conf import settings
 
 if settings.DEBUG:
-    urlpatterns.insert (1,
-    (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
-     {'document_root': 'media/', 'show_indexes': True}),
-    )
+     urlpatterns += patterns('',
+                    (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+                    {'document_root': 'media/', 'show_indexes': True}),
+                    )
+