From: yomguy <yomguy@localhost.localdomain>
Date: Fri, 26 Nov 2010 00:59:42 +0000 (+0000)
Subject: try templates
X-Git-Tag: 1.1~486^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4e614ccf74f785531032fd27c8d74b9c28e95354;p=telemeta.git

try templates
---

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index b09e6a88..90729006 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -1 +1,208 @@
 {% extends "telemeta_default/mediaitem_detail.html" %}
+
+{% 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,"m4a" %}">
+                        <img class="ts-image" src="{% url telemeta-item-visualize item.public_id,visualizer_id,1800,233 %}"
+                          alt="" /></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        </div>
+
+        <div class="item_visualization">
+            <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>
+
+        {% 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">
+    {% block general_info %}
+        <dl class="listing">
+            {% dl_field item "title" %}
+            {% dl_field item "alt_title" %}
+            {% dl_field item "collector" %}
+            <dt>{% field_label item "collection" %}</dt>
+            <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd>
+            {% if item.recorded_from_date %}
+                <dt>{% trans "Recording date" %}</dt>
+                <dd>{{ item.recorded_from_date }} {{ item.recorded_to_date|prepend:" - "  }}</dd>
+            {% endif %}
+        </dl>
+    {% endblock general_info %}
+    </div>
+    <div class="extraInfos">
+    {% block geoethnic_data %}
+        <div>
+            <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4>
+            <dl class="listing">
+                {% if item.location %}
+                    <dt>{% trans "Location" %}</dt>
+                    <dd>{{ item.location.fullnames|join:"<br/>" }}</dd>
+                {% endif %}
+                {% dl_field item "location_comment" %}
+                {% dl_field item "cultural_area" %}
+                {% dl_field item "ethnic_group" %}
+                {% dl_field item "context_comment" %}
+                {% dl_field item "keywords" join with ", " %}
+            </dl>
+        </div>
+    {% endblock geoethnic_data %}
+    </div>
+    <div class="extraInfos">
+    {% block musical_data %}
+        <div>
+            <h4><a href="#">{% trans "Musical informations" %}</a></h4>
+            <dl class="listing">
+                {% dl_field item "vernacular_style" %}
+                {% dl_field item "generic_style" %}
+                {% dl_field item "author" %}
+            </dl>
+            {% if item.performances %}
+            <div class="instruments">
+                <table class="instruments">
+                <thead>
+                    <tr>
+                        <td>{% field_label "MediaItemPerformance" "instruments_num" %}</td>
+                        <td>{% field_label "MediaItemPerformance" "instrument" %}</td>
+                        <td>{% field_label "MediaItemPerformance" "alias" %}</td>
+                        <td>{% field_label "MediaItemPerformance" "musicians" %}</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for performance in item.performances.all %}
+                    <tr>
+                        <td>{{ performance.instruments_num }}</td>
+                        <td>{{ performance.instrument|default:"" }}</td>
+                        <td>{{ performance.alias|default:"" }}</td>
+                        <td>{{ performance.musicians }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+                </table>
+            </div>
+            {% endif %}
+        </div>
+    {% endblock musical_data %}
+    </div>
+    <div class="extraInfos">
+    {% block general_data %}
+        <div>
+            <h4><a href="#">{% trans "General informations" %}</a></h4>
+            <dl class="listing">
+                {% dl_field item "comment" %}
+                {% dl_field item "collector_selection" %}
+            </dl>
+        </div>
+    {% endblock general_data %}
+    </div>
+    <div class="extraInfos">
+    {% block archive_data %}
+        <div>
+            <h4><a href="#">{% trans "Archiving data" %}</a></h4>
+            <dl class="listing">
+                {% dl_field item "code" %}
+                {% dl_field item "old_code" %}
+                {% dl_field item "track" %}
+                {% dl_field item "creator_reference" %}
+                {% dl_field item "external_references" %}
+                {% dl_field item "public_access_label" %}
+            </dl>
+        </div>
+    {% endblock archive_data %}
+    </div>
+    <div class="extraInfos">
+    {% block technical_data %}
+        <div>
+            <h4><a href="#">{% trans "Technical data" %}</a></h4>
+            <div>
+                <dl class="listing">
+                    <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>
+                    {% dl_field item "approx_duration" %}
+                </dl>
+            </div>
+        </div>
+    {% endblock technical_data %}
+    </div>
+
+</div> <!-- with-rightcol -->
+
+{% endblock %}
\ No newline at end of file
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index b50b2777..12f61cce 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -124,7 +124,7 @@ class WebView:
         if request.REQUEST.has_key('grapher_id'):
             grapher_id = request.REQUEST['grapher_id']
         else:
-            grapher_id = 'waveform'
+            grapher_id = 'waveform_awdio'
         
         file = public_id + '.xml'