fix media ordering

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
index 9f47ed5050659bc7be098bf1e4ca1968855c72f7..09f1078eb61afa6114573771317cb3a2e58b02c1 100755 (executable)
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
@@ -43,6 +43,7 @@ from teleforma.models.core import *
 from forms_builder.forms.models import Form
 from django.core.urlresolvers import reverse
 
+
 class MediaPackage(MediaBase):
     "Media resource package handling multiple (audio and video) media types"
 
@@ -67,6 +68,7 @@ class MediaPackage(MediaBase):
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'media_package'
+        ordering = ['rank']
 
 
 class SeminarType(models.Model):

diff --git a/teleforma/templates/teleforma/seminar_media_audio.html b/teleforma/templates/teleforma/seminar_media_audio.html
index bf472d1e04df738af9301180d13023607610e1c6..f1af0a129ea49fe7fbe72c5cfae5daba6f048f36 100644 (file)
--- a/teleforma/templates/teleforma/seminar_media_audio.html
+++ b/teleforma/templates/teleforma/seminar_media_audio.html
@@ -26,7 +26,7 @@
         {% endif %}
     </div>
 
-    <a href="{% url teleforma-seminar-detail seminar.id %}" style="color: #000;">{{ seminar.title }}</a>
+    <a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a>
 
 </div>
 

diff --git a/teleforma/templates/teleforma/seminar_media_video.html b/teleforma/templates/teleforma/seminar_media_video.html
index 17752fe91da9d2713238e5bcd9de1fea346c8cc8..06c56749956e6c6d76114e00f7329f735a66fae0 100644 (file)
--- a/teleforma/templates/teleforma/seminar_media_video.html
+++ b/teleforma/templates/teleforma/seminar_media_video.html
@@ -74,7 +74,7 @@ $(window).ready(function(){
         {% endif %}
     </div>
 
-    <a href="{% url teleforma-seminar-detail seminar.id %}" style="color: #000;">{{ seminar.title }}</a>
+    <a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a>
 
 </div>
 

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 456aab1c06586d04aa6566c7281a5b158be170b6..9ba695ed462b66e3fc9d05b11c591e6b98bd4656 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -363,8 +363,7 @@ def evaluation_form_detail(request, pk, template='teleforma/evaluation_form.html
     context['form'] = form
     context['seminar_progress'] = seminar_progress(request.user, seminar)
     
-    return render_to_response(template, context, request_context)
-
+    return render_to_response(template, context, request_context)    
 
 
 class PDFTemplateResponseMixin(TemplateResponseMixin):