fix json from current relative url, add player to edit mode, cleanup

diff --git a/telemeta/htdocs/timeside/src/controller.js b/telemeta/htdocs/timeside/src/controller.js
index 9a1be290766654c31f0ae112824e8db9a2852789..f7d13f0c4215bd3f3954e89b3f78dc022e71cc5c 100644 (file)
--- 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 cae91762ad5e75f3aa379d06c23da2d9f4fdda79..823570802ea942ee5418975067d9b064eafca1bd 100644 (file)
--- 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 73c80221976ec83a74b005f120345d2475788a6b..d1b369c99ee19149b7b6802f5314fa12742c7d28 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail_edit.html
+++ b/telemeta/templates/telemeta_default/collection_detail_edit.html
@@ -4,6 +4,14 @@
 \r
 {% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}\r
 \r
+{% block stylesheets %}\r
+{{ block.super }}\r
+<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />\r
+<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />\r
+<link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />\r
+{% endblock %}\r
+{% block extra_javascript %}\r
+{% endblock %}\r
 \r
 {% if collection %}\r
 \r
@@ -14,11 +22,12 @@
 {% block content %}\r
     <h3>Collection: {{ collection }}</h3>\r
         <div class="infos">\r
-        \r
         <form method="POST" action="">{% csrf_token %}\r
-        {{ formset }}\r
-        <button type="submit">SAVE</button>\r
-\r
+        <table>\r
+            {{ formset }}\r
+        </table>\r
+        <input type="submit" value="save">\r
+        </form>\r
         </div>\r
 {% endblock %}\r
 {% else %}\r

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_edit.html b/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
index 1d099886a15a54445388ba79692e1fc0bd800f36..c88b2c44ca6943125529bf930c25ac09e73b43ea 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_edit.html
@@ -7,34 +7,146 @@
 {% block stylesheets %}\r
 {{ block.super }}\r
 <link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />\r
-<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />\r
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />\r
-{% endblock %}\r
-{% block extra_javascript %}\r
+      <link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />\r
+      <link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />\r
+      {% endblock %}\r
+      {% block extra_javascript %}\r
+\r
+<script src="{% url telemeta-js "wz_jsgraphics.js" %}" type="text/javascript"></script>\r
+<script src="{% url telemeta-js "soundmanager2.js" %}" type="text/javascript"></script>\r
+<script src="{% url telemeta-timeside "src/timeside.js" %}" type="text/javascript"></script>\r
+<script src="{% url telemeta-js "playerUtils.js" %}" type="text/javascript"></script>\r
 \r
+<script type="text/javascript">\r
+    soundManager.url = '{% url telemeta-swf "./" %}';\r
+    soundManager.flashVersion = 9;\r
+    soundManager.useMovieStar = true; // enable MP4/M4A/AAC\r
+    soundManager.debugMode = false;\r
+    set_player_image_url('{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}');\r
+    load_player({{ item.approx_duration.as_seconds }});\r
+</script>\r
 \r
 {% endblock %}\r
 \r
+\r
 {% if item %}\r
 {% block submenu %}\r
     <div>\r
+    <a href="{% url telemeta-item-detail item.public_id %}"><button>EXIT</button></a>\r
     <a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>\r
     </div>\r
 {% endblock %}\r
 \r
 {% block content %}\r
-\r
 <h3>Item : {{ item }}</h3>\r
+<div class="{% if item.file %}with-rightcol{% endif %}">\r
+\r
+    {% if item.file %}\r
+    <div id="player_maximized" class="ts-skin-lab">\r
+        <a href="#" class="toggle">Minimize</a>\r
+        <div class="wazing"></div>\r
+    </div>\r
+    <div id="rightcol">\r
+        <div id="player_minimized" class="ts-skin-lab">\r
+            <a href="#" class="toggle">Maximize</a>\r
+            <div class="wazing"></div>\r
+            <div id="player" class="ts-player">\r
+                <div class="ts-viewer">\r
+                    <div class="ts-wave">\r
+                        <div class="ts-image-container">\r
+                            <a href="{% url telemeta-item-export item.public_id,"mp3" %}">\r
+                               <img class="ts-image" src="{% url telemeta-item-visualize item.public_id,visualizer_id,360,130 %}"\r
+                                 alt="" /></a>\r
+                        </div>\r
+                    </div>\r
+                </div>\r
+            </div>\r
+        </div>\r
+\r
+        <div class="markers_div" id="markers_div_id"></div>\r
+        <div id="item_edit">\r
+            <div class="item_visualization" id="item_markers_id">\r
+            </div>\r
+            <div class="item_visualization" id="item_visualization_id">\r
+                <form id="visualizer_id_form" method="get" action="#">\r
+                    <!--\r
+                    <select name="visualizer_id" onchange="this.form.submit()">\r
+                        {% for v in visualizers %}\r
+                        <option value="{{ v.id }}" {% ifequal v.id visualizer_id %} selected="selected" {% endifequal %}>\r
+                        {{v.name}}</option>\r
+                        {% endfor %}\r
+                    </select>\r
+                    -->\r
+                    <select id="visualizer_id" name="visualizer_id">\r
+                        {% for v in visualizers %}\r
+                        <option value="{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}">\r
+                                {{v.name}}</option>\r
+                        {% endfor %}\r
+                    </select>\r
+                    <input type="submit" value="Set" />\r
+                </form>\r
+\r
+                <div class="analyzer">\r
+                    <table width="100%">\r
+                        <tr class="analyzer-title">\r
+                            <td>Property</td>\r
+                            <td>Value</td>\r
+                            <td>Unit</td>\r
+                        </tr>\r
+                        {% for analyser in analysers %}\r
+                        <tr class="analyzer-line">\r
+                            <td>\r
+                                {{ analyser.name }}\r
+                            </td>\r
+                            <td>\r
+                                {{ analyser.value }}\r
+                            </td>\r
+                            <td>\r
+                                {{ analyser.unit }}\r
+                            </td>\r
+                        </tr>\r
+                        {% endfor %}\r
+                    </table>\r
+                </div>\r
+                <!--\r
+                        <form method="get" action="#">\r
+                            <p>&nbsp;Vamp plugin analysis</p>\r
+                            <select name="vamp_id">\r
+                            {% for plugin in vamp_plugins %}\r
+                            <option value="{{ plugin }}" {% ifequal plugin vamp_id %} selected="selected" {% endifequal %}>\r
+                            {{ plugin }}</option>\r
+                            {% endfor %}\r
+                            </select>\r
+                            <input type="submit" value="Get" />\r
+                        </form>\r
+                -->\r
+            </div>\r
+        </div>\r
+        {% if audio_export_enabled %}\r
+        <div class="exporter">\r
+            <p>{% trans "Download:" %}\r
+                {% for format in export_formats %}\r
+                <a href="{% url telemeta-item-export item.public_id,format.extension %}">{{ format.name }}</a>\r
+                {% endfor %}</p>\r
+        </div>\r
+        {% endif %}\r
+\r
+    </div>\r
+    {% endif %}\r
 \r
 <div class="infos">\r
-<form method="POST" action="">{% csrf_token %}\r
+ <form method="POST" action="">{% csrf_token %}\r
+   <table>\r
      {{ formset }}\r
-<button type="submit">SAVE</button>\r
-</form>\r
+   </table>\r
+  <input type="submit" value="save">\r
+ </form>\r
 </div>\r
 \r
+</div> <!-- with-rightcol -->\r
 \r
 {% endblock %}\r
+\r
 {% else %}\r
     <p>No such item</p>\r
 {% endif %}\r

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 490a56f70f28f5a6873b45eb39422ee23f6d9c2e..95a7ce8b9ab7674f577751a512cae4364b7c8224 100644 (file)
--- 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):