From: yomguy <yomguy@parisson.com>
Date: Tue, 5 Jun 2012 00:09:03 +0000 (+0200)
Subject: reorder
X-Git-Tag: 0.4^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=de8d3e77f03d39799c6e76c4c75b7032fec95f5b;p=teleforma.git

reorder
---

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 659db372..048be236 100644
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -33,18 +33,19 @@ $(document).ready(function(){
 {% endwith %}
 {% endblock %}
 
-{% block media %}
+{% block conference %}
 {% with course as course and %}
-{% include "teleforma/inc/media_list.html" %}
+{% include "teleforma/inc/conference_list.html" %}
 {% endwith %}
 {% endblock %}
 
-{% block conference %}
+{% block media %}
 {% with course as course and %}
-{% include "teleforma/inc/conference_list.html" %}
+{% include "teleforma/inc/media_list.html" %}
 {% endwith %}
 {% endblock %}
 
+
 {% else %}
 <div class="course_content">
 <p>{% trans "No document" %}</p>
diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 71066592..8cb6d7d1 100644
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -65,18 +65,20 @@ $(document).ready(function(){
         {% endwith %}
         {% endblock %}
 
-        {% block media %}
+        {% block conference %}
         {% with course as course %}
-        {% include "teleforma/inc/media_list.html" %}
+        {% include "teleforma/inc/conference_list.html" %}
         {% endwith %}
         {% endblock %}
+        {% else %}
 
-        {% block conference %}
+
+        {% block media %}
         {% with course as course %}
-        {% include "teleforma/inc/conference_list.html" %}
+        {% include "teleforma/inc/media_list.html" %}
         {% endwith %}
         {% endblock %}
-        {% else %}
+
         <div class="course_content">
          <p>{% trans "No document" %}</p>
         </div>