]> git.parisson.com Git - teleforma.git/commitdiff
fix conference infos
authoryomguy <yomguy@parisson.com>
Thu, 19 Apr 2012 09:21:02 +0000 (11:21 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 19 Apr 2012 09:21:02 +0000 (11:21 +0200)
teleforma/models.py
teleforma/templates/teleforma/course_conference.html

index 9517d4194b4d1ff8a9121202837ea549fd950dca..a3722cb8901253d3183e915ee61c579c537968cc 100755 (executable)
@@ -148,7 +148,7 @@ class Professor(Model):
                                  verbose_name=_('training'), blank=True, null=True)
 
     def __unicode__(self):
-        return self.user.username
+        return self.user.first_name + ' ' + self.user.last_name
 
     class Meta:
         db_table = app_label + '_' + 'professor'
index 558f265c059bf6e9ec567a11b8066a5c72311f1a..e77cf6bb613cd2a55cdb8c7b199acaae2b310b27 100644 (file)
 {% block general_info %}
 <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 %}">{{ conference.professor }}</a></dd>
+<dt>{% trans "Begin" %}</dt><dd>{{ conference.date_begin }}</dd>
+<dt>{% trans "End" %}</dt><dd>{{ conference.date_end }}</dd>
+<dt>{% trans "Live" %}</dt><dd>{{ conference.streaming }}</dd>
 </dl>
 </div>
 {% endblock general_info %}