From: yomguy Date: Tue, 31 Jul 2012 21:30:05 +0000 (+0200) Subject: 10 courses max on desk, add comment to media list, media click go to blank tab X-Git-Tag: 0.8.4^2~9 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a18234ea2bf9cb58a9aca71e5a9f7023d803d5e9;p=teleforma.git 10 courses max on desk, add comment to media list, media click go to blank tab --- diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 6088b59c..2b66a7de 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -14,7 +14,7 @@ {% if media.type == 'webm' %} - + {% if media.item.related.all %} {% for related in media.item.related.all %} {% if related.title == "preview" %} @@ -35,6 +35,9 @@
{% trans "Professor" %}
{{ media.conference.professor }}
{% endif %}
{% trans "Begin" %}
{{ media.conference.date_begin }}
+ {% if media.conference.comment %} +
{% trans "Comment" %}
{{ media.conference.comment }}
+ {% endif %} diff --git a/teleforma/views.py b/teleforma/views.py index 8f4c05b9..6b324fdf 100755 --- a/teleforma/views.py +++ b/teleforma/views.py @@ -204,7 +204,7 @@ class CoursesView(ListView): template_name='teleforma/courses.html' def get_queryset(self): - return get_courses(self.request.user, date_order=True) + return get_courses(self.request.user, date_order=True)[:10] def get_context_data(self, **kwargs): context = super(CoursesView, self).get_context_data(**kwargs)