From af065d3e5a17eb80a1c7dcf8ba9dc86620c1e8ac Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 17 Sep 2012 18:02:55 +0200 Subject: [PATCH] cleanup and static libs --- telemeta/{htdocs => static}/timeside/README | 0 .../timeside/js/libs/jquery-1.6.min.js | 0 .../timeside/js/libs/raphael-min.js | 0 .../timeside/js/libs/soundmanager2-jsmin.js | 0 .../js/libs/soundmanager2-nodebug-jsmin.js | 0 .../timeside/js/libs/soundmanager2-nodebug.js | 0 .../timeside/js/libs/soundmanager2.js | 0 .../timeside/js/markermap.js | 0 .../{htdocs => static}/timeside/js/player.js | 0 .../{htdocs => static}/timeside/js/ruler.js | 0 .../timeside/js/rulermarker.js | 0 .../timeside/js/timeside.js | 0 .../timeside/skins/classic/img/forward.png | Bin .../timeside/skins/classic/img/pause.png | Bin .../timeside/skins/classic/img/play.png | Bin .../skins/classic/img/player_controlbg.png | Bin .../timeside/skins/classic/img/rewind.png | Bin .../timeside/skins/classic/img/setmarker.png | Bin .../timeside/skins/classic/img/volumeoff.png | Bin .../timeside/skins/classic/img/volumeon.png | Bin .../timeside/skins/classic/img/wait.gif | Bin .../timeside/skins/classic/style.css | 0 .../skins/lab/img/controlbg-inverted.png | Bin .../timeside/skins/lab/img/controlbg.png | Bin .../timeside/skins/lab/img/empty.png | Bin .../timeside/skins/lab/img/forward.png | Bin .../timeside/skins/lab/img/pause.png | Bin .../timeside/skins/lab/img/play.png | Bin .../timeside/skins/lab/img/rewind.png | Bin .../timeside/skins/lab/img/setmarker.png | Bin .../timeside/skins/lab/img/volume.png | Bin .../timeside/skins/lab/img/volumeoff.png | Bin .../timeside/skins/lab/img/volumeon.png | Bin .../timeside/skins/lab/img/wait.gif | Bin .../timeside/skins/lab/img/wait2.gif | Bin .../timeside/skins/lab/img/wait3.gif | Bin .../timeside/skins/lab/style.css | 0 .../timeside/swf/soundmanager2.swf | Bin .../timeside/swf/soundmanager2_debug.swf | Bin .../timeside/swf/soundmanager2_flash9.swf | Bin .../swf/soundmanager2_flash9_debug.swf | Bin .../{htdocs => static}/video-js/video-js.css | 0 .../video-js/video-js.min.css | 0 .../{htdocs => static}/video-js/video-js.png | Bin .../{htdocs => static}/video-js/video-js.swf | Bin telemeta/{htdocs => static}/video-js/video.js | 0 .../{htdocs => static}/video-js/video.min.js | 0 telemeta/templates/telemeta/home.html | 2 +- .../templates/telemeta/mediaitem_detail.html | 22 +++++++++--------- 49 files changed, 12 insertions(+), 12 deletions(-) rename telemeta/{htdocs => static}/timeside/README (100%) rename telemeta/{htdocs => static}/timeside/js/libs/jquery-1.6.min.js (100%) rename telemeta/{htdocs => static}/timeside/js/libs/raphael-min.js (100%) rename telemeta/{htdocs => static}/timeside/js/libs/soundmanager2-jsmin.js (100%) rename telemeta/{htdocs => static}/timeside/js/libs/soundmanager2-nodebug-jsmin.js (100%) rename telemeta/{htdocs => static}/timeside/js/libs/soundmanager2-nodebug.js (100%) rename telemeta/{htdocs => static}/timeside/js/libs/soundmanager2.js (100%) rename telemeta/{htdocs => static}/timeside/js/markermap.js (100%) rename telemeta/{htdocs => static}/timeside/js/player.js (100%) rename telemeta/{htdocs => static}/timeside/js/ruler.js (100%) rename telemeta/{htdocs => static}/timeside/js/rulermarker.js (100%) rename telemeta/{htdocs => static}/timeside/js/timeside.js (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/forward.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/pause.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/play.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/player_controlbg.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/rewind.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/setmarker.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/volumeoff.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/volumeon.png (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/img/wait.gif (100%) rename telemeta/{htdocs => static}/timeside/skins/classic/style.css (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/controlbg-inverted.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/controlbg.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/empty.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/forward.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/pause.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/play.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/rewind.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/setmarker.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/volume.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/volumeoff.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/volumeon.png (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/wait.gif (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/wait2.gif (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/img/wait3.gif (100%) rename telemeta/{htdocs => static}/timeside/skins/lab/style.css (100%) rename telemeta/{htdocs => static}/timeside/swf/soundmanager2.swf (100%) rename telemeta/{htdocs => static}/timeside/swf/soundmanager2_debug.swf (100%) rename telemeta/{htdocs => static}/timeside/swf/soundmanager2_flash9.swf (100%) rename telemeta/{htdocs => static}/timeside/swf/soundmanager2_flash9_debug.swf (100%) rename telemeta/{htdocs => static}/video-js/video-js.css (100%) rename telemeta/{htdocs => static}/video-js/video-js.min.css (100%) rename telemeta/{htdocs => static}/video-js/video-js.png (100%) rename telemeta/{htdocs => static}/video-js/video-js.swf (100%) rename telemeta/{htdocs => static}/video-js/video.js (100%) rename telemeta/{htdocs => static}/video-js/video.min.js (100%) diff --git a/telemeta/htdocs/timeside/README b/telemeta/static/timeside/README similarity index 100% rename from telemeta/htdocs/timeside/README rename to telemeta/static/timeside/README diff --git a/telemeta/htdocs/timeside/js/libs/jquery-1.6.min.js b/telemeta/static/timeside/js/libs/jquery-1.6.min.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/jquery-1.6.min.js rename to telemeta/static/timeside/js/libs/jquery-1.6.min.js diff --git a/telemeta/htdocs/timeside/js/libs/raphael-min.js b/telemeta/static/timeside/js/libs/raphael-min.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/raphael-min.js rename to telemeta/static/timeside/js/libs/raphael-min.js diff --git a/telemeta/htdocs/timeside/js/libs/soundmanager2-jsmin.js b/telemeta/static/timeside/js/libs/soundmanager2-jsmin.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/soundmanager2-jsmin.js rename to telemeta/static/timeside/js/libs/soundmanager2-jsmin.js diff --git a/telemeta/htdocs/timeside/js/libs/soundmanager2-nodebug-jsmin.js b/telemeta/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/soundmanager2-nodebug-jsmin.js rename to telemeta/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js diff --git a/telemeta/htdocs/timeside/js/libs/soundmanager2-nodebug.js b/telemeta/static/timeside/js/libs/soundmanager2-nodebug.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/soundmanager2-nodebug.js rename to telemeta/static/timeside/js/libs/soundmanager2-nodebug.js diff --git a/telemeta/htdocs/timeside/js/libs/soundmanager2.js b/telemeta/static/timeside/js/libs/soundmanager2.js similarity index 100% rename from telemeta/htdocs/timeside/js/libs/soundmanager2.js rename to telemeta/static/timeside/js/libs/soundmanager2.js diff --git a/telemeta/htdocs/timeside/js/markermap.js b/telemeta/static/timeside/js/markermap.js similarity index 100% rename from telemeta/htdocs/timeside/js/markermap.js rename to telemeta/static/timeside/js/markermap.js diff --git a/telemeta/htdocs/timeside/js/player.js b/telemeta/static/timeside/js/player.js similarity index 100% rename from telemeta/htdocs/timeside/js/player.js rename to telemeta/static/timeside/js/player.js diff --git a/telemeta/htdocs/timeside/js/ruler.js b/telemeta/static/timeside/js/ruler.js similarity index 100% rename from telemeta/htdocs/timeside/js/ruler.js rename to telemeta/static/timeside/js/ruler.js diff --git a/telemeta/htdocs/timeside/js/rulermarker.js b/telemeta/static/timeside/js/rulermarker.js similarity index 100% rename from telemeta/htdocs/timeside/js/rulermarker.js rename to telemeta/static/timeside/js/rulermarker.js diff --git a/telemeta/htdocs/timeside/js/timeside.js b/telemeta/static/timeside/js/timeside.js similarity index 100% rename from telemeta/htdocs/timeside/js/timeside.js rename to telemeta/static/timeside/js/timeside.js diff --git a/telemeta/htdocs/timeside/skins/classic/img/forward.png b/telemeta/static/timeside/skins/classic/img/forward.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/forward.png rename to telemeta/static/timeside/skins/classic/img/forward.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/pause.png b/telemeta/static/timeside/skins/classic/img/pause.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/pause.png rename to telemeta/static/timeside/skins/classic/img/pause.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/play.png b/telemeta/static/timeside/skins/classic/img/play.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/play.png rename to telemeta/static/timeside/skins/classic/img/play.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/player_controlbg.png b/telemeta/static/timeside/skins/classic/img/player_controlbg.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/player_controlbg.png rename to telemeta/static/timeside/skins/classic/img/player_controlbg.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/rewind.png b/telemeta/static/timeside/skins/classic/img/rewind.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/rewind.png rename to telemeta/static/timeside/skins/classic/img/rewind.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/setmarker.png b/telemeta/static/timeside/skins/classic/img/setmarker.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/setmarker.png rename to telemeta/static/timeside/skins/classic/img/setmarker.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/volumeoff.png b/telemeta/static/timeside/skins/classic/img/volumeoff.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/volumeoff.png rename to telemeta/static/timeside/skins/classic/img/volumeoff.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/volumeon.png b/telemeta/static/timeside/skins/classic/img/volumeon.png similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/volumeon.png rename to telemeta/static/timeside/skins/classic/img/volumeon.png diff --git a/telemeta/htdocs/timeside/skins/classic/img/wait.gif b/telemeta/static/timeside/skins/classic/img/wait.gif similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/img/wait.gif rename to telemeta/static/timeside/skins/classic/img/wait.gif diff --git a/telemeta/htdocs/timeside/skins/classic/style.css b/telemeta/static/timeside/skins/classic/style.css similarity index 100% rename from telemeta/htdocs/timeside/skins/classic/style.css rename to telemeta/static/timeside/skins/classic/style.css diff --git a/telemeta/htdocs/timeside/skins/lab/img/controlbg-inverted.png b/telemeta/static/timeside/skins/lab/img/controlbg-inverted.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/controlbg-inverted.png rename to telemeta/static/timeside/skins/lab/img/controlbg-inverted.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/controlbg.png b/telemeta/static/timeside/skins/lab/img/controlbg.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/controlbg.png rename to telemeta/static/timeside/skins/lab/img/controlbg.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/empty.png b/telemeta/static/timeside/skins/lab/img/empty.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/empty.png rename to telemeta/static/timeside/skins/lab/img/empty.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/forward.png b/telemeta/static/timeside/skins/lab/img/forward.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/forward.png rename to telemeta/static/timeside/skins/lab/img/forward.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/pause.png b/telemeta/static/timeside/skins/lab/img/pause.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/pause.png rename to telemeta/static/timeside/skins/lab/img/pause.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/play.png b/telemeta/static/timeside/skins/lab/img/play.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/play.png rename to telemeta/static/timeside/skins/lab/img/play.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/rewind.png b/telemeta/static/timeside/skins/lab/img/rewind.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/rewind.png rename to telemeta/static/timeside/skins/lab/img/rewind.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/setmarker.png b/telemeta/static/timeside/skins/lab/img/setmarker.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/setmarker.png rename to telemeta/static/timeside/skins/lab/img/setmarker.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/volume.png b/telemeta/static/timeside/skins/lab/img/volume.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/volume.png rename to telemeta/static/timeside/skins/lab/img/volume.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/volumeoff.png b/telemeta/static/timeside/skins/lab/img/volumeoff.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/volumeoff.png rename to telemeta/static/timeside/skins/lab/img/volumeoff.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/volumeon.png b/telemeta/static/timeside/skins/lab/img/volumeon.png similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/volumeon.png rename to telemeta/static/timeside/skins/lab/img/volumeon.png diff --git a/telemeta/htdocs/timeside/skins/lab/img/wait.gif b/telemeta/static/timeside/skins/lab/img/wait.gif similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/wait.gif rename to telemeta/static/timeside/skins/lab/img/wait.gif diff --git a/telemeta/htdocs/timeside/skins/lab/img/wait2.gif b/telemeta/static/timeside/skins/lab/img/wait2.gif similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/wait2.gif rename to telemeta/static/timeside/skins/lab/img/wait2.gif diff --git a/telemeta/htdocs/timeside/skins/lab/img/wait3.gif b/telemeta/static/timeside/skins/lab/img/wait3.gif similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/img/wait3.gif rename to telemeta/static/timeside/skins/lab/img/wait3.gif diff --git a/telemeta/htdocs/timeside/skins/lab/style.css b/telemeta/static/timeside/skins/lab/style.css similarity index 100% rename from telemeta/htdocs/timeside/skins/lab/style.css rename to telemeta/static/timeside/skins/lab/style.css diff --git a/telemeta/htdocs/timeside/swf/soundmanager2.swf b/telemeta/static/timeside/swf/soundmanager2.swf similarity index 100% rename from telemeta/htdocs/timeside/swf/soundmanager2.swf rename to telemeta/static/timeside/swf/soundmanager2.swf diff --git a/telemeta/htdocs/timeside/swf/soundmanager2_debug.swf b/telemeta/static/timeside/swf/soundmanager2_debug.swf similarity index 100% rename from telemeta/htdocs/timeside/swf/soundmanager2_debug.swf rename to telemeta/static/timeside/swf/soundmanager2_debug.swf diff --git a/telemeta/htdocs/timeside/swf/soundmanager2_flash9.swf b/telemeta/static/timeside/swf/soundmanager2_flash9.swf similarity index 100% rename from telemeta/htdocs/timeside/swf/soundmanager2_flash9.swf rename to telemeta/static/timeside/swf/soundmanager2_flash9.swf diff --git a/telemeta/htdocs/timeside/swf/soundmanager2_flash9_debug.swf b/telemeta/static/timeside/swf/soundmanager2_flash9_debug.swf similarity index 100% rename from telemeta/htdocs/timeside/swf/soundmanager2_flash9_debug.swf rename to telemeta/static/timeside/swf/soundmanager2_flash9_debug.swf diff --git a/telemeta/htdocs/video-js/video-js.css b/telemeta/static/video-js/video-js.css similarity index 100% rename from telemeta/htdocs/video-js/video-js.css rename to telemeta/static/video-js/video-js.css diff --git a/telemeta/htdocs/video-js/video-js.min.css b/telemeta/static/video-js/video-js.min.css similarity index 100% rename from telemeta/htdocs/video-js/video-js.min.css rename to telemeta/static/video-js/video-js.min.css diff --git a/telemeta/htdocs/video-js/video-js.png b/telemeta/static/video-js/video-js.png similarity index 100% rename from telemeta/htdocs/video-js/video-js.png rename to telemeta/static/video-js/video-js.png diff --git a/telemeta/htdocs/video-js/video-js.swf b/telemeta/static/video-js/video-js.swf similarity index 100% rename from telemeta/htdocs/video-js/video-js.swf rename to telemeta/static/video-js/video-js.swf diff --git a/telemeta/htdocs/video-js/video.js b/telemeta/static/video-js/video.js similarity index 100% rename from telemeta/htdocs/video-js/video.js rename to telemeta/static/video-js/video.js diff --git a/telemeta/htdocs/video-js/video.min.js b/telemeta/static/video-js/video.min.js similarity index 100% rename from telemeta/htdocs/video-js/video.min.js rename to telemeta/static/video-js/video.min.js diff --git a/telemeta/templates/telemeta/home.html b/telemeta/templates/telemeta/home.html index e32a9d29..8732187b 100644 --- a/telemeta/templates/telemeta/home.html +++ b/telemeta/templates/telemeta/home.html @@ -33,7 +33,7 @@ {{ block.super }}
-

+

Partenaires


CNRS    diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 11332739..3e27f333 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -6,8 +6,8 @@ {% block stylesheets %} {{ block.super }} - - + + {% endblock %} {% block extra_javascript %} @@ -15,18 +15,18 @@ {% if item.file %} {% if public_access or perms.telemeta.can_play_all_items %} - - + + {% endif %} {% endif %} - - + + {% if item.file %} {% if public_access or perms.telemeta.can_play_all_items %} - - + + {% endif %} {% endif %} @@ -80,8 +80,8 @@ {% if "video" in mime_type %} - - + + {% endif %} {% endif %} @@ -90,7 +90,7 @@ {% if item %} {% block title %} -item +item Item : {{ item }} {% endblock %} -- 2.39.5