From: yomguy <yomguy@parisson.com>
Date: Sat, 18 Aug 2012 21:51:03 +0000 (+0200)
Subject: fix conference details, add cours link title, add conf admin search fields
X-Git-Tag: 0.9-probarreau~375
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=97e2819249cf96a7c5c9f8c4d16fb9245e5815ce;p=teleforma.git

fix conference details, add cours link title, add conf admin search fields
---

diff --git a/teleforma/admin.py b/teleforma/admin.py
index d55c4053..a2d4119a 100644
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -48,7 +48,7 @@ class MediaAdmin(admin.ModelAdmin):
 
 class ConferenceAdmin(admin.ModelAdmin):
     exclude = ['readers']
-    search_fields = ['public_id']
+    search_fields = ['public_id', 'id']
 
 
 admin.site.unregister(User)
diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 5d569f1f..fa0085d3 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -37,7 +37,7 @@
         <a href="{% url teleforma-conference-audio conference.id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
     </div>
 
-{{ course.title }} - {{ type }} - {% trans "Session" %} {{ conference.session }}
+<a href="{% url teleforma-course-detail course.id %}" style="color: #000;">{{ course.title }}</a> - {{ type }} - {% trans "Session" %} {{ conference.session }}
 
 </div>
 
@@ -65,15 +65,23 @@
 {% block general_info %}
 <div class="course_content" id="media_infos">
 <dl class="listing">
-<dt>{% trans "Title" %}</dt><dd>{{ conference.course.title }}</dd>
+
 {% if conference.professor %}
-<dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></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>
-<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>
+{% 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 %}
 <dt>{% trans "Live" %}</dt><dd>{{ conference.streaming|yes_no }}</dd>
+{% 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>
+
+<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 007642ab..102fb9fe 100644
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -80,7 +80,7 @@ $(document).ready(function(){
         {% endif %}
     </div>
 
-    {{ course.title }} - {{ type }}{% if media.conference %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
+    <a href="{% url teleforma-course-detail course.id %}" style="color: #000;">{{ course.title }}</a> - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
 
 </div>
 
@@ -125,21 +125,25 @@ $(document).ready(function(){
 {% block general_info %}
 <div class="course_content" id="media_infos">
 <dl class="listing">
-{% dl_field item "title" placeholder %}
+
+{% if media.conference %}
 {% 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 %}
-
-{% if media.conference %}
+<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>
-<dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
-<dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>
-<dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>
-{% endif %}
+{% if media.conference.room %}<dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>{% endif %}
+{% if user.is_staff or user.is_superuser %}
+<dt>{% trans "Conference ID" %}</dt><dd>{{ media.conference.public_id }}</dd>
 <dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
+{% endif %}
+{% endif %}
+
 <dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
+
 </dl>
 </div>