From 5337ec492425c8cda8e61f37a608b8727e7ac3ef Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 15:31:31 +0200
Subject: [PATCH] fix media metadata

---
 .../teleforma/course_conference.html          |  2 +-
 .../templates/teleforma/course_media.html     | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index acd17994..505ccf08 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -56,8 +56,8 @@
 <div class="course_content" id="media_infos">
 <dl class="listing">
 <dt>{% trans "Title" %}</dt><dd>{{ conference.course.title }}</dd>
-<dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
 <dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></dd>
+<dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
 <dt>{% trans "Room" %}</dt><dd>{{ conference.room }}</dd>
 <dt>{% trans "Begin" %}</dt><dd>{{ conference.date_begin }}</dd>
 <dt>{% trans "End" %}</dt><dd>{{ conference.date_end|yes_no }}</dd>
diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 844a187f..28c31615 100644
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -21,7 +21,7 @@ $(document).ready(function(){
 {% block course %}
 <div class="course_media">
 
-<div class="course_title">{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}{% if media.item %} - {{ media.item }}{% endif %}
+<div class="course_title">{{ course.title }} - {{ type }}{% if media.conference %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
 </div>
 
 {% if access_error %}
@@ -56,18 +56,15 @@ $(document).ready(function(){
 <dt>{% trans "Professor" %}</dt>
     <dd><a href="{% url telemeta-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a></dd>
 {% endif %}
-<dt>{% field_label item "approx_duration" %}</dt>
-    <dd>{{ item.approx_duration }}</a></dd>
+
 {% if media.conference %}
-<dt>{% trans "Begin date" %}</dt>
-    <dd>{{ media.conference.date_begin }}</dd>
-<dt>{% trans "End date" %}</dt>
-    <dd>{{ media.conference.date_end }}</dd>
+<dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+<dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
+<dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
+<dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>
 {% endif %}
-<dt>{% trans "Date added" %}</dt>
-    <dd>{{ media.date_added }}</dd>
-<dt>{% trans "Mime type" %}</dt>
-    <dd>{{ mime_type }}</dd>
+<dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
+<dt>{% trans "Mime type" %}</dt><dd>{{ mime_type }}</dd>
 </dl>
 </div>
 {% endblock general_info %}
-- 
2.39.5