From ad4548cf1aa556fe7300f5384cea6961fe45ce46 Mon Sep 17 00:00:00 2001
From: riccardo <riccardo@parisson.com>
Date: Mon, 16 May 2011 14:15:04 +0200
Subject: [PATCH] cleanup part3

---
 telemeta/htdocs/css/telemeta.css                          | 2 +-
 telemeta/htdocs/{timeside/src => js}/playlist.js          | 0
 telemeta/htdocs/{js => timeside/src}/playerLoader.js      | 0
 telemeta/templates/telemeta_default/home.html             | 2 +-
 telemeta/templates/telemeta_default/mediaitem_detail.html | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename telemeta/htdocs/{timeside/src => js}/playlist.js (100%)
 rename telemeta/htdocs/{js => timeside/src}/playerLoader.js (100%)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 55c98e28..c7dd9f0d 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -433,7 +433,7 @@ form.login .submit {
 #menu {
     background-color: #6a0307 ;
     font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;
-    padding: 0em 0em 9px 0em;
+    padding: 0em 0em 2px 0em;
     border-bottom: .5em solid #6a0307;
     border-top: .75em solid #6a0307;
 }
diff --git a/telemeta/htdocs/timeside/src/playlist.js b/telemeta/htdocs/js/playlist.js
similarity index 100%
rename from telemeta/htdocs/timeside/src/playlist.js
rename to telemeta/htdocs/js/playlist.js
diff --git a/telemeta/htdocs/js/playerLoader.js b/telemeta/htdocs/timeside/src/playerLoader.js
similarity index 100%
rename from telemeta/htdocs/js/playerLoader.js
rename to telemeta/htdocs/timeside/src/playerLoader.js
diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 99c1c999..d8141f5f 100644
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -4,7 +4,7 @@
 
 {% block extra_javascript %}
 <script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-timeside "src/playlist.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
 <script>
     jQuery(window).ready(function(){
 
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index ddd08ee7..bccc88c0 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -17,7 +17,7 @@
       <!--<script src="{% url telemeta-js "wz_jsgraphics.js" %}" type="text/javascript"></script>-->
 <script src="{% url telemeta-js "soundmanager2-nodebug-jsmin.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-timeside "src/playlist.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
 <script type="text/javascript">
     soundManager.url = '{% url telemeta-swf "./" %}';
     soundManager.flashVersion = 9;
@@ -70,7 +70,7 @@
     visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}";
     {% endfor %}
     
-    var scripts = ["{% url telemeta-js "wz_jsgraphics.js" %}", "{% url telemeta-timeside "src/timeside.js" %}","{% url telemeta-js "playerLoader.js" %}"];
+    var scripts = ["{% url telemeta-js "wz_jsgraphics.js" %}", "{% url telemeta-timeside "src/timeside.js" %}","{% url telemeta-timeside "src/playerLoader.js" %}"];
 
     jQuery(window).ready(function(){
         //if soundmanager is ready, the callback is executed immetiately
-- 
2.39.5