diff -r 4ec5ae89a7b0 -r 0c01050f9717 src/cm/templates/site/layout/base.html
--- a/src/cm/templates/site/layout/base.html	Wed Feb 10 14:34:08 2010 +0100
+++ b/src/cm/templates/site/layout/base.html	Thu Feb 11 16:28:10 2010 +0100
@@ -21,15 +21,15 @@
     </script>
      -->
   
-    <link type="text/css" href="{{ MEDIA_URL }}js/lib/jquery/css/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet" />    
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/jquery/js/jquery-1.3.2.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/jquery/js/jquery-ui-1.7.2.custom.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/jquery/js/cookie/jquery.cookie.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/site/layout/base.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/jquery.sparkline/jquery.sparkline.min.js"></script>
+    <link type="text/css" href="{{ CM_MEDIA_PREFIX }}js/lib/jquery/css/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet" />    
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/jquery/js/jquery-1.3.2.min.js"></script>
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/jquery/js/jquery-ui-1.7.2.custom.min.js"></script>
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/jquery/js/cookie/jquery.cookie.js"></script>
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/site/layout/base.js"></script>
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/jquery.sparkline/jquery.sparkline.min.js"></script>
 
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/tipsy/src/javascripts/jquery.tipsy.js"></script>
-    <link type="text/css" href="{{ MEDIA_URL }}js/lib/tipsy/src/stylesheets/tipsy.css" rel="stylesheet" />    
+    <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/lib/tipsy/src/javascripts/jquery.tipsy.js"></script>
+    <link type="text/css" href="{{ CM_MEDIA_PREFIX }}js/lib/tipsy/src/stylesheets/tipsy.css" rel="stylesheet" />    
       <script type="text/javascript">
       <!--
       $(function() {
@@ -51,8 +51,8 @@
 
     {% include "site/layout/req_yui.html" %}
     
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base.css" />   
-    <link rel="shortcut icon" href="{{ MEDIA_URL }}favicon.ico" />
+    <link rel="stylesheet" type="text/css" href="{{ CM_MEDIA_PREFIX }}css/base.css" />   
+    <link rel="shortcut icon" href="{{ CM_MEDIA_PREFIX }}favicon.ico" />
 
     {% include "site/macros/timezone.html" %}