]> git.parisson.com Git - telemeta.git/commitdiff
fix relative images/, unify the rightcol player for view and edit
authoryomguy <yomguy@parisson.com>
Thu, 3 Mar 2011 00:20:28 +0000 (01:20 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 3 Mar 2011 00:20:28 +0000 (01:20 +0100)
telemeta/htdocs/css/admin.css
telemeta/htdocs/css/telemeta.css
telemeta/models/media.py
telemeta/templates/telemeta_default/base.html
telemeta/templates/telemeta_default/collection_detail.html
telemeta/templates/telemeta_default/collection_detail_edit.html
telemeta/templates/telemeta_default/mediaitem_detail.html
telemeta/templates/telemeta_default/mediaitem_detail_edit.html
telemeta/urls.py
telemeta/web/base.py

index c39e1a26900c6c81f75c511adfa5f567c3a1d033..70c8a4f0fa5d4b5f77fa760e1682140235042e09 100644 (file)
@@ -1,7 +1,7 @@
 /* Shamelessly stolen from trac's admin.css... */
 
 .tabs {
- border: 1px solid black;
+ border: 1px dotted black;
  border-color: gray black black gray;
  margin: 1.8em 0;
  padding: .3em 0 0 .5em;
index 482fc9ecdce4503667e3e65ebc3c6fecab956a5c..f81db508f7d62d40b8283e9f86963672e45b424a 100644 (file)
@@ -237,10 +237,10 @@ label.disabled { color: #d7d7d7 }
 /* Quick search */
 #quick_search {
     position: absolute;
-    top: 1.5em;
+    top: 1.7em;
     left: 35%;
     background-color: #6a0307;
-    padding: 0.5em 0em 0.5em 0.5em;
+    padding: 0.3em 0em 0.3em 0.3em;
     -moz-border-radius: 8px 8px 8px 8px;
     -webkit-border-radius: 8px 8px 8px 8px;
     border-radius: 8px 8px 8px 8px;
@@ -263,6 +263,9 @@ label.disabled { color: #d7d7d7 }
     vertical-align: middle;
     font-size: .8em;
     margin-right: 0;
+    -moz-border-radius: 5px 5px 5px 5px;
+    -webkit-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
 }
 #quick_search_pattern {
     background: #FFF url(search_bg.png) no-repeat;
index a78da49c29c509c51ba80bd8b810a576a5eddcf5..c9a4178ba7341ca9bf54295cfbf03343ade6324b 100644 (file)
@@ -219,6 +219,7 @@ class MediaItem(MediaResource):
 
     collection            = ForeignKey('MediaCollection', related_name="items", 
                                        verbose_name=_('collection'))
+    title                 = CharField(_('title'))
     track                 = CharField(_('item number'))
     old_code              = CharField(_('old code'), unique=True, null=True)
     code                  = CharField(_('code'), unique=True, null=True)
@@ -229,12 +230,10 @@ class MediaItem(MediaResource):
     location_comment      = CharField(_('location details'))
     ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", 
                                            verbose_name=_('population / social group'))
-    title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
     author                = CharField(_('author / compositor'))
     vernacular_style      = WeakForeignKey('VernacularStyle', related_name="items", 
                                            verbose_name=_('vernacular style'))
-    context_comment       = TextField(_('comments'))
     external_references   = TextField(_('published reference'))
     moda_execut           = CharField(_('moda_execut'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
@@ -245,6 +244,7 @@ class MediaItem(MediaResource):
                                            verbose_name=_('generic style'))
     collector_selection   = CharField(_('recordist selection'))
     creator_reference     = CharField(_('reference'))
+    context_comment       = TextField(_('comments'))
     comment               = TextField(_('remarks'))
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
index 13d3fe1d7a1d2909602521a416ca6037fafb78cf..3b33b3a06871bc0b123be32e0fbb4508c06f67ab 100644 (file)
@@ -32,7 +32,7 @@
 
 <div id="auth_info">
 {% if user.is_authenticated %}
-<img src="../../images/user_red.png" style="vertical-align:middle" />
+<img src="images/user_red.png" style="vertical-align:middle" />
 Welcome, 
 {% if user.first_name and user.last_name %}
 {{ user.first_name }} {{ user.last_name }} 
@@ -41,7 +41,7 @@ Welcome,
 {% endif %}
 Account | Help | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
-<img src="../../images/close.png" style="vertical-align:middle" /></a>
+<img src="images/close.png" style="vertical-align:middle" /></a>
 {% else %}
 Help |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
index 1c68a22a4609d78906904650e19b07d9a94222e8..21703effb4bdb1ffef354e606d5944eb1525bd92 100644 (file)
-{% extends "telemeta/base.html" %}\r
-{% load telemeta_utils %}\r
-{% load i18n %}\r
-\r
-{% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}\r
-\r
-{% block extra_javascript %}\r
-<script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>\r
-{% endblock %}\r
-\r
-{% if collection %}\r
-\r
-{% block submenu %}\r
-    <div>\r
-    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>\r
-    \r
-    {% if user.is_authenticated %} \r
-    <a href="{% url telemeta-collection-detail-edit collection.public_id %}"><img src="/images/edit_page.png" alt="EDIT"></a>\r
-    {% endif %}\r
-    \r
-    </div>\r
-{% endblock %}\r
-\r
-{% block content %}\r
-    <h3>Collection: {{ collection }}</h3>\r
-    <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">\r
-        {% if collection.has_mediafile %}\r
-        <div id="rightcol">\r
-            <div id="collection_player">\r
-              <p><b>Listen to this collection</b>\r
-              (<a href="{% url telemeta-collection-m3u collection.public_id %}">M3U</a>,\r
-              <a href="{% url telemeta-collection-xspf collection.public_id %}">XSPF</a>)</p>\r
-                <!-- This is Jeroen Wijering's Flash MP3 Player, \r
-                  under CC Attribution-NonCommercial-ShareAlike 2.0 license\r
-                  from: http://www.jeroenwijering.com/?item=Flash_MP3_Player-->\r
-                <p id="collection_player_c">\r
-                  <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.\r
-                </p>\r
-                <script type="text/javascript">\r
-                  var so = new SWFObject('{% url telemeta-swf "mp3player.swf" %}','playlist','362','200','7');\r
-                  so.addVariable("file","{% url telemeta-collection-xspf collection.public_id %}");\r
-                  so.addVariable("displayheight","0");\r
-                  so.write('collection_player_c');\r
-                </script> \r
-            </div>\r
-        </div>\r
-        {% endif %}\r
-        <div class="intro">\r
-            <span>{% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>\r
-        </div>\r
-        <div class="infos">\r
-        {% block general_info %}\r
-            <dl class="listing">\r
-                {% dl_field collection "reference" %}\r
-                {% dl_field collection "title"  %}\r
-                {% dl_field collection "alt_title" %}\r
-                {% dl_field collection "creator"  %}\r
-                {% dl_field collection "recording_context" %}\r
-                {% if collection.recorded_from_year %}\r
-                    <dt>{% trans "Recording year" %}</dt>\r
-                    <dd>{{ collection.recorded_from_year|default:'' }} {{ collection.recorded_to_year|prepend:" - "  }}</dd>\r
-                {% endif %}\r
-                {% dl_field collection "year_published"  %}\r
-            </dl>\r
-        {% endblock general_info %}\r
-        </div>\r
-        <div class="extraInfos">\r
-        {% block geoethnic_data %}\r
-            <div>\r
-                <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4>\r
-                <div>\r
-                    <dl class="listing">\r
-                        {% dl_field collection "countries" join with ", " %}\r
-                        {% dl_field collection "ethnic_groups" join with ", "  %}\r
-                    </dl>\r
-                </div>\r
-            </div>\r
-        {% endblock geoethnic_data %}\r
-        </div>\r
-        <div class="extraInfos">\r
-        {% block legal_data %}\r
-            <div>\r
-                <h4><a href="#">{% trans "Legal mentions" %}</a></h4>\r
-                <div>\r
-                    <dl class="listing">\r
-                        {% if collection.collector_is_creator %}\r
-                          {% if collection.creator %}\r
-                          <dt>{% trans "Recordist" %}</dt><dd>{{ collection.creator }}</dd>\r
-                          {% endif%}\r
-                        {% else %}\r
-                        {% dl_field collection "collector" %}\r
-                        {% endif %}\r
-                        {% dl_field collection "publisher" %}\r
-                        {% dl_field collection "publisher_collection" %}\r
-                        {% dl_field collection "publisher_serial" %}\r
-                        {% dl_field collection "booklet_author" %}\r
-                        {% dl_field collection "external_references" %}\r
-                        {% dl_field collection "doctype_code" %}\r
-                        {% dl_field collection "public_access_label" %}\r
-                        {% dl_field collection "legal_rights" %}\r
-                    </dl>\r
-                </div>\r
-            </div>\r
-        {% endblock legal_data %}\r
-        </div>\r
-        <div class="extraInfos">\r
-        {% block archive_data %}\r
-            <div>\r
-                <h4><a href="#">{% trans "Archiving data" %}</a></h4>\r
-                <div>\r
-                    <dl class="listing">\r
-                        {% dl_field collection "acquisition_mode" %}\r
-                        {% dl_field collection "cnrs_contributor" %}\r
-                        {% dl_field collection "metadata_author" %}\r
-                        {% dl_field collection "booklet_description" %}\r
-                        {% dl_field collection "publishing_status" %}\r
-                        <!-- FIXME: alt_ids unsupported\r
-                        {% dl_field collection "alt_ids" %}\r
-                        -->\r
-                        {% dl_field collection "comment" %}\r
-                        {% dl_field collection "metadata_writer" %}\r
-                        {% dl_field collection "travail" %}\r
-                        {% dl_field collection "items_done" %}\r
-                    </dl>\r
-                </div>\r
-            </div>\r
-        {% endblock archive_data %}\r
-        </div>\r
-        <div class="extraInfos">\r
-        {% block technical_data %}\r
-            <div>\r
-                <h4><a href="#">{% trans "Technical data" %}</a></h4>\r
-                <div>\r
-                    <dl class="listing">\r
-                        {% dl_field collection "code" %}\r
-                        {% dl_field collection "old_code" %}\r
-                        <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>\r
-                        {% dl_field collection "approx_duration" %}\r
-                        {% dl_field collection "computed_duration" %}\r
-                        {% dl_field collection "physical_items_num" %}\r
-                        <div class="wazing"></div>\r
-                        <dt>{% trans "Number of items" %}</dt><dd>{{ collection.items.count }}</dd>\r
-                        {% dl_field collection "physical_format" %}\r
-                        {% dl_field collection "ad_conversion" %}\r
-                    </dl>\r
-                </div>\r
-            </div>\r
-        {% endblock technical_data %}\r
-        </div>\r
-        <h4>Items</h4>\r
-        {% with collection.items.enriched as items %}\r
-        {% with "1" as location_name %}\r
-            {% include "telemeta/inc/mediaitem_list.html" %}\r
-        {% endwith %}\r
-        {% endwith %}\r
-        <!--\r
-        {% with collection.ordered_items as items %}\r
-            {% include "telemeta/inc/mediaitem_list.html" %}\r
-        {% endwith %}\r
-        -->\r
-        </div>\r
-    </div>\r
-{% endblock %}\r
-{% else %}\r
-    <p>No such collection</p>\r
-{% endif %}\r
-\r
+{% extends "telemeta/base.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+{% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}
+
+{% block extra_javascript %}
+<script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>
+{% endblock %}
+
+{% if collection %}
+
+{% block submenu %}
+    <div>
+    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
+    
+    {% if user.is_authenticated %} 
+    <a href="{% url telemeta-collection-detail-edit collection.public_id %}"><img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
+    {% endif %}
+    
+    </div>
+{% endblock %}
+
+{% block content %}
+    <h3>Collection: {{ collection }}</h3>
+    <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">
+        {% if collection.has_mediafile %}
+        <div id="rightcol">
+            <div id="collection_player">
+              <p><b>Listen to this collection</b>
+              (<a href="{% url telemeta-collection-m3u collection.public_id %}">M3U</a>,
+              <a href="{% url telemeta-collection-xspf collection.public_id %}">XSPF</a>)</p>
+                <!-- This is Jeroen Wijering's Flash MP3 Player, 
+                  under CC Attribution-NonCommercial-ShareAlike 2.0 license
+                  from: http://www.jeroenwijering.com/?item=Flash_MP3_Player-->
+                <p id="collection_player_c">
+                  <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
+                </p>
+                <script type="text/javascript">
+                  var so = new SWFObject('{% url telemeta-swf "mp3player.swf" %}','playlist','362','200','7');
+                  so.addVariable("file","{% url telemeta-collection-xspf collection.public_id %}");
+                  so.addVariable("displayheight","0");
+                  so.write('collection_player_c');
+                </script> 
+            </div>
+        </div>
+        {% endif %}
+        <div class="intro">
+            <span>{% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
+        </div>
+        <div class="infos">
+        {% block general_info %}
+            <dl class="listing">
+                {% dl_field collection "reference" %}
+                {% dl_field collection "title"  %}
+                {% dl_field collection "alt_title" %}
+                {% dl_field collection "creator"  %}
+                {% dl_field collection "recording_context" %}
+                {% if collection.recorded_from_year %}
+                    <dt>{% trans "Recording year" %}</dt>
+                    <dd>{{ collection.recorded_from_year|default:'' }} {{ collection.recorded_to_year|prepend:" - "  }}</dd>
+                {% endif %}
+                {% dl_field collection "year_published"  %}
+            </dl>
+        {% endblock general_info %}
+        </div>
+        <div class="extraInfos">
+        {% block geoethnic_data %}
+            <div>
+                <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4>
+                <div>
+                    <dl class="listing">
+                        {% dl_field collection "countries" join with ", " %}
+                        {% dl_field collection "ethnic_groups" join with ", "  %}
+                    </dl>
+                </div>
+            </div>
+        {% endblock geoethnic_data %}
+        </div>
+        <div class="extraInfos">
+        {% block legal_data %}
+            <div>
+                <h4><a href="#">{% trans "Legal mentions" %}</a></h4>
+                <div>
+                    <dl class="listing">
+                        {% if collection.collector_is_creator %}
+                          {% if collection.creator %}
+                          <dt>{% trans "Recordist" %}</dt><dd>{{ collection.creator }}</dd>
+                          {% endif%}
+                        {% else %}
+                        {% dl_field collection "collector" %}
+                        {% endif %}
+                        {% dl_field collection "publisher" %}
+                        {% dl_field collection "publisher_collection" %}
+                        {% dl_field collection "publisher_serial" %}
+                        {% dl_field collection "booklet_author" %}
+                        {% dl_field collection "external_references" %}
+                        {% dl_field collection "doctype_code" %}
+                        {% dl_field collection "public_access_label" %}
+                        {% dl_field collection "legal_rights" %}
+                    </dl>
+                </div>
+            </div>
+        {% endblock legal_data %}
+        </div>
+        <div class="extraInfos">
+        {% block archive_data %}
+            <div>
+                <h4><a href="#">{% trans "Archiving data" %}</a></h4>
+                <div>
+                    <dl class="listing">
+                        {% dl_field collection "acquisition_mode" %}
+                        {% dl_field collection "cnrs_contributor" %}
+                        {% dl_field collection "metadata_author" %}
+                        {% dl_field collection "booklet_description" %}
+                        {% dl_field collection "publishing_status" %}
+                        <!-- FIXME: alt_ids unsupported
+                        {% dl_field collection "alt_ids" %}
+                        -->
+                        {% dl_field collection "comment" %}
+                        {% dl_field collection "metadata_writer" %}
+                        {% dl_field collection "travail" %}
+                        {% dl_field collection "items_done" %}
+                    </dl>
+                </div>
+            </div>
+        {% endblock archive_data %}
+        </div>
+        <div class="extraInfos">
+        {% block technical_data %}
+            <div>
+                <h4><a href="#">{% trans "Technical data" %}</a></h4>
+                <div>
+                    <dl class="listing">
+                        {% dl_field collection "code" %}
+                        {% dl_field collection "old_code" %}
+                        <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>
+                        {% dl_field collection "approx_duration" %}
+                        {% dl_field collection "computed_duration" %}
+                        {% dl_field collection "physical_items_num" %}
+                        <div class="wazing"></div>
+                        <dt>{% trans "Number of items" %}</dt><dd>{{ collection.items.count }}</dd>
+                        {% dl_field collection "physical_format" %}
+                        {% dl_field collection "ad_conversion" %}
+                    </dl>
+                </div>
+            </div>
+        {% endblock technical_data %}
+        </div>
+        <h4>Items</h4>
+        {% with collection.items.enriched as items %}
+        {% with "1" as location_name %}
+            {% include "telemeta/inc/mediaitem_list.html" %}
+        {% endwith %}
+        {% endwith %}
+        <!--
+        {% with collection.ordered_items as items %}
+            {% include "telemeta/inc/mediaitem_list.html" %}
+        {% endwith %}
+        -->
+        </div>
+    </div>
+{% endblock %}
+{% else %}
+    <p>No such collection</p>
+{% endif %}
+
index 3313bedcef28f87e5d10ae569933947649a1a9d0..f70d98cd07bf75bbff990c6c202c6d8d2c4452c4 100644 (file)
@@ -18,7 +18,7 @@
 {% block submenu %}
     <div><a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
     <a href="{% url telemeta-collection-detail collection.public_id %}">
-     <img src="/images/edit_cancel.png"></a>
+     <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
     </div>
 {% endblock %}
 
@@ -31,8 +31,8 @@
         </table>
         <div align="center">
          <a href="{% url telemeta-collection-detail collection.public_id %}">
-          <img src="/images/edit_cancel.png"></a>
-         <input type="image" src="/images/save_changes.png" value="save">
+          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
+         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>
         </div>
         </form>
         </div>
index f3b868cd35facb9584b6fc6d6dee7eb228a7c820..e8179d53857bad32c66f558de395088ee84759c2 100644 (file)
             </td>
             <td align="right">
                 {% if user.is_authenticated and user.is_staff%}
-                <a href="{% url telemeta-item-detail-edit item.public_id %}"><img src="../../images/edit_page.png" alt="EDIT"></a>
+                {% block tools %}
+                <a href="{% url telemeta-item-detail-edit item.public_id %}"><img src="images/edit_page.png" alt="EDIT"></a>
+                {% endblock tools %}
                 {% endif %}
-                <a href="{% url telemeta-item-detail previous %}"><img src="../../images/previous.png" alt="PREVIOUS"></a>
-                <a href="{% url telemeta-item-detail next %}"><img src="../../images/next.png" alt="NEXT"></a>
+                <a href="{% url telemeta-item-detail previous %}"><img src="images/previous.png" alt="PREVIOUS"></a>
+                <a href="{% url telemeta-item-detail next %}"><img src="images/next.png" alt="NEXT"></a>
             </td>
         </tr>
     </table>
 {% endblock %}
 
 {% block content %}
-
-<h3><img src="../../images/item.png" style="vertical-align:middle" /> Item : {{ item }}</h3>
-
+<h3><img src="images/item.png" style="vertical-align:middle" /> 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>
             </div>
         </div>
-
-
-
-
         <div class="item_visualization" id="item_visualization_id">
-            
             <form id="visualizer_id_form" method="get" action="#">
-                <img src="../../images/plots.png" style="vertical-align:middle" />&nbsp;Visualization :
+                <img src="images/plots.png" style="vertical-align:middle" />&nbsp;Visualization :
                 <select id="visualizer_id" name="visualizer_id">
                     {% for v in visualizers %}
                     <option value="{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}">
                 <input type="submit" value="Set" />
             </form>
 
-
             <!--
                     <form method="get" action="#">
                         <p>&nbsp;Vamp plugin analysis</p>
         </div>
         <!--</div>-->
 
-
         {% if audio_export_enabled %}
         <div class="exporter">
-            <p><img src="../../images/download.png" style="vertical-align:middle" /> {% trans "Download:" %}
+            <p><img src="images/download.png" style="vertical-align:middle" /> {% trans "Download:" %}
                 {% for format in export_formats %}
                 <a href="{% url telemeta-item-export item.public_id,format.extension %}">
-                <img src="../../images/{{ format.extension }}.png" style="vertical-align:middle" alt="{{ format.extension }}" /></a>
+                <img src="images/{{ format.extension }}.png" style="vertical-align:middle" alt="{{ format.extension }}" /></a>
                 {% endfor %}</p>
         </div>
         {% endif %}
     </div>
     {% endif %}
 
+    {% block infos %}
     <div class="infos">
         {% block general_info %}
         <dl class="listing">
         </div>
         {% endblock technical_data %}
     </div>
-
+  {% endblock infos %}
 </div> <!-- with-rightcol -->
-
 {% endblock %}
 {% else %}
 <p>No such item</p>
index 7e87d67fd1f55771f26a2ec11503dacf585f91a7..d74d06f9174bc0d292fd3fdbd26ccb0ab999e678 100644 (file)
-{% extends "telemeta/base.html" %}
-{% load telemeta_utils %}
-{% load i18n %}
-
-{% block head_title %}{% trans "Item" %}{{item|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 %}
-
-<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-dublincore item.public_id %}">Dublin Core</a>
-    <a href="{% url telemeta-item-detail item.public_id %}">
-      <img src="/images/edit_cancel.png"></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 %}
-
+{% extends "telemeta/mediaitem_detail.html" %}
+
+    {% block tools %}
+     <a href="{% url telemeta-item-detail item.public_id %}">
+         <img src="images/edit_cancel.png" /></a>
+    {% endblock tools %}
+
+  {% block infos %}    
+    <div class="infos">
+     <form method="POST" action="">{% csrf_token %}
+       <table>
+         {{ form }}
+       </table>
+       <div align="center">
+        <a href="{% url telemeta-item-detail item.public_id %}">
+         <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
+        <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />
+       </div>
+     </form>
     </div>
-    {% endif %}
-
-<div class="infos">
- <form method="POST" action="">{% csrf_token %}
-   <table>
-     {{ form }}
-   </table>
-   <div align="center">
-    <a href="{% url telemeta-item-detail item.public_id %}">
-     <img src="/images/edit_cancel.png"></a>
-    <input type="image" src="/images/save_changes.png" value="save">
-   </div>
- </form>
-</div>
-
-</div> <!-- with-rightcol -->
-
-{% endblock %}
-
-{% else %}
-    <p>No such item</p>
-{% endif %}
+  {% endblock infos %}
index 42bfebfbd350a648f81cd94a0a45c07e7f0d4246..f8c1d24488e1e2e1385273695a301b2bc2d7c7c2 100644 (file)
@@ -161,7 +161,7 @@ urlpatterns = patterns('',
     url(r'^css/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': htdocs+'/css'},
         name="telemeta-css"),
-    url(r'^images/(?P<path>.*)$', 'django.views.static.serve', 
+    url(r'images/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': htdocs+'/images'},
         name="telemeta-images"),
     url(r'^js/(?P<path>.*)$', 'django.views.static.serve', 
index e325effc275940e5866a18ede5f69ec2030645a4..a18d5b2e519da878b57c02b9dbd5dc002a471fe2 100644 (file)
@@ -465,15 +465,15 @@ class WebView(object):
     def __get_admin_context_vars(self):
         return {"enumerations": self.__get_enumerations_list()}
     
-    @method_decorator(login_required) #@login_required
+    @method_decorator(login_required)
     def admin_index(self, request):
         return render(request, 'telemeta/admin.html', self.__get_admin_context_vars())
 
-    @method_decorator(login_required) #@login_required
+    @method_decorator(login_required)
     def admin_general(self, request):
         return render(request, 'telemeta/admin_general.html', self.__get_admin_context_vars())
     
-    @method_decorator(login_required) #@login_required
+    @method_decorator(login_required)
     def admin_enumerations(self, request):
         return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars())