From e7528e8dd3e54770593d237cd11e0b7542110631 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 24 Jan 2013 14:14:44 +0100 Subject: [PATCH] media back button on left --- .../teleforma/seminar_media_video.html | 19 ++++++++++--------- teleforma/views/core.py | 1 - teleforma/views/pro.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/teleforma/templates/teleforma/seminar_media_video.html b/teleforma/templates/teleforma/seminar_media_video.html index b9d817de..9e121d5d 100644 --- a/teleforma/templates/teleforma/seminar_media_video.html +++ b/teleforma/templates/teleforma/seminar_media_video.html @@ -70,18 +70,19 @@ $(window).ready(function(){
-
+
 {% trans "Back" %} - +
+
 {% trans "Audio" %} - + {% if user.is_staff %} {% if media.is_published %}{% trans " published" %}{% else %}{% trans " rejected" %}{% endif %} {% endif %}
- - {{ seminar.title }} - +
+ {{ seminar.title }} +
{% if access_error %} @@ -97,7 +98,7 @@ $(window).ready(function(){ {% for transcoded in media.item.transcoded.all %} {% if "video" in transcoded.mime_type %} - {% endif %} + {% endif %} {% endfor %}
@@ -158,7 +159,7 @@ function jumpToTimeoffset(time) { var url = video.attr("src"); var abs_url = url.split("#")[0]; video.attr("src", abs_url + '#t=' + String(time)); - Player.play(); + Player.play(); } @@ -167,7 +168,7 @@ function jumpToTimeoffset(time) { {% block module-action-right %} {% if media.item.file and media.is_published and media.item.file.path|in_download_formats %} -
+ {% endif %} diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 2b9bd645..f4d3d961 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -328,7 +328,6 @@ class DocumentView(DetailView): def get_context_data(self, **kwargs): context = super(DocumentView, self).get_context_data(**kwargs) seminars = all_seminars(self.request)['all_seminars'] - context['all_courses'] = all_courses document = self.get_object() context['course'] = document.course context['notes'] = document.notes.all().filter(author=self.request.user) diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 01d7a960..b595fa00 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -198,7 +198,7 @@ class SeminarMediaView(MediaView): context['seminar'] = seminar context['media'] = media context['seminar_progress'] = seminar_progress(user, seminar) - revision, c = SeminarRevision.objects.get_or_create(seminar=seminar, user=user) + revision, c = SeminarRevision.objects.create(seminar=seminar, user=user) revision.save() return context -- 2.39.5