add static again

diff --git a/telemeta/htdocs/swf/mp3player.swf b/telemeta/htdocs/swf/mp3player.swf
deleted file mode 100644 (file)
index 70fca8c..0000000
Binary files a/telemeta/htdocs/swf/mp3player.swf and /dev/null differ

diff --git a/telemeta/htdocs/swf/xspf_player.swf b/telemeta/htdocs/swf/xspf_player.swf
deleted file mode 100644 (file)
index f03790a..0000000
Binary files a/telemeta/htdocs/swf/xspf_player.swf and /dev/null differ

diff --git a/telemeta/htdocs/swf/xspf_player_slim.swf b/telemeta/htdocs/swf/xspf_player_slim.swf
deleted file mode 100644 (file)
index 24b36c9..0000000
Binary files a/telemeta/htdocs/swf/xspf_player_slim.swf and /dev/null differ

diff --git a/telemeta/static/telemeta/swf/mp3player.swf b/telemeta/static/telemeta/swf/mp3player.swf
new file mode 100644 (file)
index 0000000..70fca8c
Binary files /dev/null and b/telemeta/static/telemeta/swf/mp3player.swf differ

diff --git a/telemeta/static/telemeta/swf/xspf_player.swf b/telemeta/static/telemeta/swf/xspf_player.swf
new file mode 100644 (file)
index 0000000..f03790a
Binary files /dev/null and b/telemeta/static/telemeta/swf/xspf_player.swf differ

diff --git a/telemeta/static/telemeta/swf/xspf_player_slim.swf b/telemeta/static/telemeta/swf/xspf_player_slim.swf
new file mode 100644 (file)
index 0000000..24b36c9
Binary files /dev/null and b/telemeta/static/telemeta/swf/xspf_player_slim.swf differ

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 6db05cc13e9aa75d069f476b275103e5d723c7a3..b9283c6cfdfb0e87b2d4e1cc57afbe9252924083 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -51,7 +51,7 @@
 
 <div id="auth_info">
 {% if user.is_authenticated %}
-<img src="{% url telemeta-images "user.png" %}" alt="user" style="vertical-align:middle" />
+<img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle" />
 {% trans "Welcome" %},
 {% if user.first_name and user.last_name %}
 {{ user.first_name }} {{ user.last_name }} |

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index b33f21a27033cebe350789b95a8e97577cfa08d5..376246831bc0dde2e61ea51e82826a7885ecfd0e 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -5,14 +5,14 @@
 {% block head_title %}{% trans "Collection" %}{{collection|prepend:' : '}} - {{ block.super }}{% endblock %}
 
 {% block extra_javascript %}
-<script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/swfobject.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/popupdiv.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
 <script>
     {% if user.is_authenticated %}
     jQuery(document).ready(function(){
         var p = playlistUtils;
-        
+
         {% for playlist in playlists %}
         p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
         {% endfor %}
@@ -33,8 +33,8 @@
 {% if collection %}
 
 {% block title %}
-    <img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> 
-    Collection : 
+    <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" />
+    Collection :
     <a href="{% url telemeta-collection-detail collection.public_id %}">{{ collection.title }}</a>
 {% endblock %}
 
@@ -63,26 +63,26 @@
               (<a href="{% url telemeta-collection-m3u collection.public_id %}">M3U</a>,
               <a href="{% url telemeta-collection-xspf collection.public_id %}">XSPF</a>)</h3>
              </div>
-                <!-- This is Jeroen Wijering's Flash MP3 Player, 
+                <!-- This is Jeroen Wijering's Flash MP3 Player,
                   under CC Attribution-NonCommercial-ShareAlike 2.0 license
                   from: http://www.jeroenwijering.com/?item=Flash_MP3_Player-->
                 <p id="collection_player_c">
                   <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
                 </p>
                 <script type="text/javascript">
-                  var so = new SWFObject('{% url telemeta-swf "mp3player.swf" %}','playlist','362','200','7');
+                  var so = new SWFObject('{{ STATIC_URL }}telemeta/swf/mp3player.swf','playlist','362','200','7');
                   so.addVariable("file","{% url telemeta-collection-xspf collection.public_id %}");
                   so.addVariable("displayheight","0");
                   so.addParam("wmode", "opaque");
                   so.write('collection_player_c');
-                </script> 
+                </script>
             </div>
         </div>
         {% endif %}
         {% endif %}
       {% block infos %}
         <div class="intro">
-            <span><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
+            <span><img src="{{ STATIC_URL }}telemeta/images/item_title.png" style="vertical-align:middle" /> {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
         </div>
         <div class="infos">
         {% block general_info %}
@@ -199,9 +199,9 @@
             {% endblock related %}
         </div>
         {% endif %}
-        
+
         <div class="extraInfos">
-        <h4><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> Items</h4>
+        <h4><img src="{{ STATIC_URL }}telemeta/images/item_title.png" style="vertical-align:middle" /> Items</h4>
         {% with "1" as location_name %}
             {% include "telemeta/inc/mediaitem_list.html" %}
         {% endwith %}

diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html
index cc09245c4017c6a7f658356bc48c70dd56a7a44a..bad287c3327e518f93d5e4bd8d6b31241de5393d 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_list.html
@@ -47,7 +47,7 @@
     <td align="center">
         {% if item.file %}
          <a href="{% url telemeta-item-detail item.public_id %}">
-          <img src="images/ok.png" alt="yes" style="vertical-align:middle" /></a>
+          <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" /></a>
         {% endif %}
     </td>
 </tr>

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index db1fc7c2789095367ed085f5dd1004d611a70ae3..95ee73f1b9756f4742320c84eb28c520defdc292 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -80,8 +80,8 @@
 </script>
 
 {% if "video" in mime_type %}
-<script src="{{ STATIC_URL }}telemeta/video-js/video.js" ></script>
-<link href="{{ STATIC_URL }}telemeta/video-js/video-js.css" rel="stylesheet">
+<script src="{{ STATIC_URL }}video-js/video.js" ></script>
+<link href="{{ STATIC_URL }}video-js/video-js.css" rel="stylesheet">
 {% endif %}
 
 {% endif %}

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 8b762f8f92d4a03d08636157fb2cfb9c74d69aa0..8dab15e38023f3109b9c71b2dfccccb87d99afad 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -48,7 +48,7 @@ import telemeta.config
 telemeta.config.check()
 
 # initialization
-general_view = HomeView()
+home_view = HomeView()
 admin_view = AdminView()
 collection_view = CollectionView()
 item_view = ItemView()
@@ -71,10 +71,10 @@ all_fonds = { 'queryset': MediaFonds.objects.all().order_by('title') }
 # ID's regular expressions
 export_extensions = "|".join(item_view.list_export_extensions())
 
-htdocs = os.path.dirname(__file__) + '/htdocs'
+htdocs = os.path.dirname(__file__) + '/static/telemeta'
 
 urlpatterns = patterns('',
-    url(r'^$', general_view.home, name="telemeta-home"),
+    url(r'^$', home_view.home, name="telemeta-home"),
 
     # items
     url(r'^archives/items/$', 'django.views.generic.list_detail.object_list',
@@ -194,21 +194,21 @@ urlpatterns = patterns('',
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/dc/xml/$', resource_view.detail,
         {'format': 'dublin_core_xml'},
         name="telemeta-resource-dublincore-xml"),
-    url(r'^archives/$', general_view.search, name="telemeta-archives"),
+    url(r'^archives/$', home_view.search, name="telemeta-archives"),
 
     # search
-    url(r'^search/$', general_view.search, name="telemeta-search"),
-    url(r'^search/collections/$', general_view.search, {'type': 'collections'},
+    url(r'^search/$', home_view.search, name="telemeta-search"),
+    url(r'^search/collections/$', home_view.search, {'type': 'collections'},
         name="telemeta-search-collections"),
-    url(r'^search/items/$', general_view.search, {'type': 'items'},
+    url(r'^search/items/$', home_view.search, {'type': 'items'},
         name="telemeta-search-items"),
-    url(r'^search/corpus/$', general_view.search, {'type': 'corpus'},
+    url(r'^search/corpus/$', home_view.search, {'type': 'corpus'},
         name="telemeta-search-corpus"),
-    url(r'^search/fonds/$', general_view.search, {'type': 'fonds'},
+    url(r'^search/fonds/$', home_view.search, {'type': 'fonds'},
         name="telemeta-search-fonds"),
 
-    url(r'^search/criteria/$', general_view.edit_search, name="telemeta-search-criteria"),
-    url(r'^complete_location/$', general_view.complete_location, name="telemeta-complete-location"),
+    url(r'^search/criteria/$', home_view.edit_search, name="telemeta-search-criteria"),
+    url(r'^complete_location/$', home_view.complete_location, name="telemeta-complete-location"),
 
     # administration
     url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"),
@@ -291,10 +291,10 @@ urlpatterns = patterns('',
         name="telemeta-video-js"),
 
     # Flat pages
-    url(r'^pages/(?P<path>.*)$', general_view.render_flatpage, name="telemeta-flatpage"),
+    url(r'^pages/(?P<path>.*)$', home_view.render_flatpage, name="telemeta-flatpage"),
 
     # OAI-PMH Data Provider
-    url(r'^oai/.*$', general_view.handle_oai_request, name="telemeta-oai"),
+    url(r'^oai/.*$', home_view.handle_oai_request, name="telemeta-oai"),
 
     # Authentication
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
@@ -303,15 +303,15 @@ urlpatterns = patterns('',
         name="telemeta-login"),
     #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'},
     #    name="telemeta-login"),
-    url(r'^logout/$', general_view.logout, name="telemeta-logout"),
+    url(r'^logout/$', home_view.logout, name="telemeta-logout"),
 
     # Users
-    url(r'^accounts/$', general_view.users, name="telemeta-users"),
+    url(r'^accounts/$', home_view.users, name="telemeta-users"),
 
     # Desk
-    url(r'^desk/lists/$', general_view.lists, name="telemeta-desk-lists"),
+    url(r'^desk/lists/$', home_view.lists, name="telemeta-desk-lists"),
     url(r'^desk/profile/(?P<username>[A-Za-z0-9._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"),
-    url(r'^desk/home/$', general_view.home, name="telemeta-desk-home"),
+    url(r'^desk/home/$', home_view.home, name="telemeta-desk-home"),
 
     # Profiles
     url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),