From: yomguy <yomguy@parisson.com>
Date: Sat, 18 Aug 2012 21:57:39 +0000 (+0200)
Subject: fix again media and conf infos
X-Git-Tag: 0.9-probarreau~374
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=383bbbd11fcab8445acf7449dbe94cc593398e3b;p=teleforma.git

fix again media and conf infos
---

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index fa0085d3..bca98fb5 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -67,10 +67,11 @@
 <dl class="listing">
 
 {% if conference.professor %}
+<dt>{% trans "Course" %}</dt><dd><a href="{% url teleforma-course-detail course.id %}">{{ conference.course.title }}</a> - {{ conference.course_type }}</dd>
+<dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
 <dt>{% trans "Professor" %}</dt>
     <dd><a href="{% url telemeta-profile-detail media.conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></dd>
 {% endif %}
-<dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
 {% if conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ conference.comment }}</dd>{% endif %}
 <dt>{% trans "Begin date" %}</dt><dd>{{ conference.date_begin }}</dd>
 {% if conference.date_end %}<dt>{% trans "End date" %}</dt><dd>{{ conference.date_end|yes_no }}</dd>{% endif %}
@@ -78,10 +79,9 @@
 {% if conference.room %}<dt>{% trans "Room" %}</dt><dd>{{ conference.room }}</dd>{% endif %}
 {% if user.is_staff or user.is_superuser %}
 <dt>{% trans "Conference ID" %}</dt><dd>{{ conference.public_id }}</dd>
-
+{% endif %}
 <dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
 
-
 </dl>
 </div>
 {% endblock general_info %}
diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 102fb9fe..cbf3b100 100644
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -127,11 +127,12 @@ $(document).ready(function(){
 <dl class="listing">
 
 {% if media.conference %}
+<dt>{% trans "Course" %}</dt><dd><a href="{% url teleforma-course-detail course.id %}">{{ media.course.title }}</a> - {{ media.conference.course_type }}</dd>
+<dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
 {% if media.conference.professor %}
 <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>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
 {% if media.conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>{% endif %}
 <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
 <dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>