From: olivier <>
Date: Sun, 20 May 2007 19:48:49 +0000 (+0000)
Subject: use named urls for static files
X-Git-Tag: 1.1~928
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=73c2d2d0cd7df04911df5784a74e8f058680cc47;p=telemeta.git

use named urls for static files
---

diff --git a/telemeta/backup/__init__.py b/telemeta/backup/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/telemeta/templates/admin.html b/telemeta/templates/admin.html
index 171f5a31..9993a68a 100644
--- a/telemeta/templates/admin.html
+++ b/telemeta/templates/admin.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block extra_style %}
-<link rel="stylesheet" type="text/css" href="/css/admin.css" />
+<link rel="stylesheet" type="text/css" href="{% url telemeta-css "admin.css" %}" />
 {% endblock %}
 
 {% block content %}
diff --git a/telemeta/templates/base.html b/telemeta/templates/base.html
index 7acd536b..168a751f 100644
--- a/telemeta/templates/base.html
+++ b/telemeta/templates/base.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
 <title>Telemeta</title>
-<link rel="stylesheet" type="text/css" href="/css/telemeta.css" />
+<link rel="stylesheet" type="text/css" href="{% url telemeta-css "telemeta.css" %}" />
 {% block extra_style %}{% endblock %}
 {% block extra_javascript %}{% endblock %}
 </head>
@@ -15,7 +15,7 @@
 -->
 <div id="header">
 <div id="logo">
-<a href="{% url telemeta-home %}"><img src="/images/logo.png"></a>
+<a href="{% url telemeta-home %}"><img src="{% url telemeta-images "logo.png" %}"></a>
 </div>
 
 <div id="quick_search">
diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index eb4e2eac..55361774 100644
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -2,7 +2,7 @@
 {% load telemeta_utils %}
 
 {% block extra_javascript %}
-<script src="/js/swfobject.js" type="text/javascript"></script>
+<script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block submenu %}
@@ -21,9 +21,9 @@
         <!-- This is the XSPF Web Music Player, under the BSD license, 
           from: http://musicplayer.sourceforge.net/-->
         <object type="application/x-shockwave-flash" width="300" height="200"
-          data="/swf/xspf_player.swf?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}">
+          data="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}">
           <param name="movie" 
-            value="/swf/xspf_player.swf?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}" />
+            value="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}" />
         </object>
       {% else %}
         <!-- This is Jeroen Wijering's Flash MP3 Player, 
@@ -33,7 +33,7 @@
           <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
         </p>
         <script type="text/javascript">
-          var so = new SWFObject('/swf/mp3player.swf','playlist','300','200','7');
+          var so = new SWFObject('{% url telemeta-swf "mp3player.swf" %}','playlist','300','200','7');
           so.addVariable("file","{% url telemeta-collection-xspf object.id|urlencode %}");
           so.addVariable("displayheight","0");
           so.write('collection_player_c');
diff --git a/telemeta/templates/mediaitem_detail.html b/telemeta/templates/mediaitem_detail.html
index aeabc635..825aab30 100644
--- a/telemeta/templates/mediaitem_detail.html
+++ b/telemeta/templates/mediaitem_detail.html
@@ -2,7 +2,7 @@
 {% load telemeta_utils %}
 
 {% block extra_javascript %}
-<script src="/js/swfobject.js" type="text/javascript"></script>
+<script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block submenu %}
@@ -18,9 +18,9 @@
         <!-- This is the XSPF Web Music Player, under the BSD license, 
           from: http://musicplayer.sourceforge.net/-->
         <object type="application/x-shockwave-flash" width="300" height="20"
-          data="/swf/xspf_player_slim.swf?playlist_url={% url telemeta-item-xspf item.id|urlencode %}">
+          data="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-item-xspf item.id|urlencode %}">
           <param name="movie" 
-            value="/swf/xspf_player_slim.swf?playlist_url={% url telemeta-item-xspf item.id|urlencode %}" />
+            value="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-item-xspf item.id|urlencode %}" />
         </object><br/>
       {% else %}      
         <!-- This is Jeroen Wijering's Flash MP3 Player, 
@@ -30,7 +30,7 @@
           <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
         </p>
         <script type="text/javascript">
-          var so = new SWFObject('/swf/mp3player.swf','line','300','20','7');
+          var so = new SWFObject('{% url telemeta-swf "mp3player.swf" %}','line','300','20','7');
           so.addVariable("file","{% url telemeta-item-export item.id|urlencode,"MP3" %}");
           so.addVariable("type","mp3");
           so.write('item_player_c');
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 2630b537..2a8b9af4 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -24,6 +24,8 @@ all_collections = { 'queryset': MediaCollection.objects.all(), }
 i_ex = MediaItem.id_regex
 c_ex = MediaCollection.id_regex
 
+htdocs='./telemeta/htdocs'
+
 urlpatterns = patterns('',
     url(r'^$', web_view.index, name="telemeta-home"),
 
@@ -109,12 +111,16 @@ urlpatterns = patterns('',
         name="telemeta-geo-country-collections"),
 
     # CSS+Images (FIXME: for developement only)
-    (r'^css/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': './telemeta/htdocs/css'}),
-    (r'^images/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': './telemeta/htdocs/images'}),
-    (r'^js/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': './telemeta/htdocs/js'}),
-    (r'^swf/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': './telemeta/htdocs/swf'}),
+    url(r'css/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/css'},
+        name="telemeta-css"),
+    url(r'images/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/images'},
+        name="telemeta-images"),
+    url(r'js/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/js'},
+        name="telemeta-js"),
+    url(r'swf/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/swf'},
+        name="telemeta-swf"),
 )
