From d4305e491ea6b4632e5576188be9813dcbe518d7 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Mon, 14 Feb 2011 13:46:31 +0100
Subject: [PATCH] fix json from current relative url, add player to edit mode,
 cleanup

---
 telemeta/htdocs/timeside/src/controller.js    |   2 +-
 telemeta/htdocs/timeside/src/markermap.js     |   2 +-
 .../collection_detail_edit.html               |  17 ++-
 .../mediaitem_detail_edit.html                | 128 ++++++++++++++++--
 telemeta/web/base.py                          |   7 +-
 5 files changed, 137 insertions(+), 19 deletions(-)

diff --git a/telemeta/htdocs/timeside/src/controller.js b/telemeta/htdocs/timeside/src/controller.js
index 9a1be290..f7d13f0c 100644
--- a/telemeta/htdocs/timeside/src/controller.js
+++ b/telemeta/htdocs/timeside/src/controller.js
@@ -78,7 +78,7 @@ TimeSide(function($N) {
             var me = this;
             $.ajax({
                 type: "POST",
-                url: 'http://localhost:9000/json/',
+                url: '/json/',
                 contentType: "application/json",
                 data: data2send,
                 dataType: "json",
diff --git a/telemeta/htdocs/timeside/src/markermap.js b/telemeta/htdocs/timeside/src/markermap.js
index cae91762..82357080 100644
--- a/telemeta/htdocs/timeside/src/markermap.js
+++ b/telemeta/htdocs/timeside/src/markermap.js
@@ -437,7 +437,7 @@ TimeSide(function($N, $J) {
 
             $.ajax({
                 type: "POST",
-                url: 'http://localhost:9000/json/',
+                url: '/json/',
                 contentType: "application/json",
                 data: data2send,
                 success: function(){
diff --git a/telemeta/templates/telemeta_default/collection_detail_edit.html b/telemeta/templates/telemeta_default/collection_detail_edit.html
index 73c80221..d1b369c9 100644
--- a/telemeta/templates/telemeta_default/collection_detail_edit.html
+++ b/telemeta/templates/telemeta_default/collection_detail_edit.html
@@ -4,6 +4,14 @@
 
 {% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}
 
+{% block stylesheets %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />
+{% endblock %}
+{% block extra_javascript %}
+{% endblock %}
 
 {% if collection %}
 
@@ -14,11 +22,12 @@
 {% block content %}
     <h3>Collection: {{ collection }}</h3>
         <div class="infos">
-        
         <form method="POST" action="">{% csrf_token %}
-        {{ formset }}
-        <button type="submit">SAVE</button>
-
+        <table>
+            {{ formset }}
+        </table>
+        <input type="submit" value="save">
+        </form>
         </div>
 {% endblock %}
 {% else %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_edit.html b/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
index 1d099886..c88b2c44 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
@@ -7,34 +7,146 @@
 {% block stylesheets %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />
-{% endblock %}
-{% block extra_javascript %}
+      <link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />
+      <link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />
+      {% endblock %}
+      {% block extra_javascript %}
+
+<script src="{% url telemeta-js "wz_jsgraphics.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "soundmanager2.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-timeside "src/timeside.js" %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "playerUtils.js" %}" type="text/javascript"></script>
 
+<script type="text/javascript">
+    soundManager.url = '{% url telemeta-swf "./" %}';
+    soundManager.flashVersion = 9;
+    soundManager.useMovieStar = true; // enable MP4/M4A/AAC
+    soundManager.debugMode = false;
+    set_player_image_url('{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}');
+    load_player({{ item.approx_duration.as_seconds }});
+</script>
 
 {% endblock %}
 
+
 {% if item %}
 {% block submenu %}
     <div>
+    <a href="{% url telemeta-item-detail item.public_id %}"><button>EXIT</button></a>
     <a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>
     </div>
 {% endblock %}
 
 {% block content %}
-
 <h3>Item : {{ item }}</h3>
+<div class="{% if item.file %}with-rightcol{% endif %}">
+
+    {% if item.file %}
+    <div id="player_maximized" class="ts-skin-lab">
+        <a href="#" class="toggle">Minimize</a>
+        <div class="wazing"></div>
+    </div>
+    <div id="rightcol">
+        <div id="player_minimized" class="ts-skin-lab">
+            <a href="#" class="toggle">Maximize</a>
+            <div class="wazing"></div>
+            <div id="player" class="ts-player">
+                <div class="ts-viewer">
+                    <div class="ts-wave">
+                        <div class="ts-image-container">
+                            <a href="{% url telemeta-item-export item.public_id,"mp3" %}">
+                               <img class="ts-image" src="{% url telemeta-item-visualize item.public_id,visualizer_id,360,130 %}"
+                                 alt="" /></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="markers_div" id="markers_div_id"></div>
+        <div id="item_edit">
+            <div class="item_visualization" id="item_markers_id">
+            </div>
+            <div class="item_visualization" id="item_visualization_id">
+                <form id="visualizer_id_form" method="get" action="#">
+                    <!--
+                    <select name="visualizer_id" onchange="this.form.submit()">
+                        {% for v in visualizers %}
+                        <option value="{{ v.id }}" {% ifequal v.id visualizer_id %} selected="selected" {% endifequal %}>
+                        {{v.name}}</option>
+                        {% endfor %}
+                    </select>
+                    -->
+                    <select id="visualizer_id" name="visualizer_id">
+                        {% for v in visualizers %}
+                        <option value="{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}">
+                                {{v.name}}</option>
+                        {% endfor %}
+                    </select>
+                    <input type="submit" value="Set" />
+                </form>
+
+                <div class="analyzer">
+                    <table width="100%">
+                        <tr class="analyzer-title">
+                            <td>Property</td>
+                            <td>Value</td>
+                            <td>Unit</td>
+                        </tr>
+                        {% for analyser in analysers %}
+                        <tr class="analyzer-line">
+                            <td>
+                                {{ analyser.name }}
+                            </td>
+                            <td>
+                                {{ analyser.value }}
+                            </td>
+                            <td>
+                                {{ analyser.unit }}
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+                <!--
+                        <form method="get" action="#">
+                            <p>&nbsp;Vamp plugin analysis</p>
+                            <select name="vamp_id">
+                            {% for plugin in vamp_plugins %}
+                            <option value="{{ plugin }}" {% ifequal plugin vamp_id %} selected="selected" {% endifequal %}>
+                            {{ plugin }}</option>
+                            {% endfor %}
+                            </select>
+                            <input type="submit" value="Get" />
+                        </form>
+                -->
+            </div>
+        </div>
+        {% if audio_export_enabled %}
+        <div class="exporter">
+            <p>{% trans "Download:" %}
+                {% for format in export_formats %}
+                <a href="{% url telemeta-item-export item.public_id,format.extension %}">{{ format.name }}</a>
+                {% endfor %}</p>
+        </div>
+        {% endif %}
+
+    </div>
+    {% endif %}
 
 <div class="infos">
-<form method="POST" action="">{% csrf_token %}
+ <form method="POST" action="">{% csrf_token %}
+   <table>
      {{ formset }}
-<button type="submit">SAVE</button>
-</form>
+   </table>
+  <input type="submit" value="save">
+ </form>
 </div>
 
+</div> <!-- with-rightcol -->
 
 {% endblock %}
+
 {% else %}
     <p>No such item</p>
 {% endif %}
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 490a56f7..95a7ce8b 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -181,7 +181,7 @@ class WebView(object):
                     })
         
     def item_analyze(self, item):
-        public_id = item.public_id
+        public_id = str(item.public_id)
         analyze_file = public_id + '.xml'
         
         if self.cache.exists(analyze_file):
@@ -375,7 +375,7 @@ class WebView(object):
             if func and value and value != "0":
                 try:
                     res = func(value)
-                    if len(res) > 2:
+                    if len(res)  > 2:
                         collections, items, value = res
                     else: 
                         collections, items = res
@@ -599,9 +599,6 @@ class WebView(object):
     def del_marker(request, public_id):
         m = MediaItemMarker.objects.get(public_id=public_id)
         m.delete()
-#        m = MediaItemMarker.objects.filter(public_id=public_id)
-#        for marker in m:
-#            marker.delete()
         
     @jsonrpc_method('telemeta.get_markers')
     def get_markers(request, item_id):
-- 
2.39.5