reorganize lists

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index c694c0d1b2f2d97a2950316c3703d73fd550395b..07b4125db16cca94a42ae0d39a21c5ee4c104ce7 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1836,11 +1836,14 @@ form .exceed{
     overflow-y: auto;
 }
 
-
 #index p, ul {
     margin: 0.5em;
 }
 
+.course_subtitle #index h3 {
+    color: black;    
+}
+
 #_Form p {
     font-weight: bold;
 }

diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html
index 89f955d16075dd8317eefce2b05f85bb59005ca2..b2d1b6c2b26876738e1aa37b9e909283aeb084bc 100644 (file)
--- a/teleforma/templates/teleforma/answer_form.html
+++ b/teleforma/templates/teleforma/answer_form.html
@@ -92,6 +92,7 @@ $(document).ready(function(){
 {% block index %}
 <div class="module">
   <h3><img src="{{STATIC_URL}}telemeta/images/module_playlist.png" alt="status" style="vertical-align:middle" /> {% trans "Steps" %}</h3>
+ 
  <div id="index">
   
           {% with seminar.docs_1 as docs %}
@@ -143,7 +144,6 @@ $(document).ready(function(){
             {% endwith %}
            {% endif %}
           {% endwith %}
-
         
          {% if seminar_progress == 100 %}
           {% with seminar.docs_correct as docs %}
@@ -159,7 +159,6 @@ $(document).ready(function(){
           {% endwith %}
          {% endif %}
 
-
  </div>
 </div>
 {% endblock index %}

diff --git a/teleforma/templates/teleforma/inc/document_simple_list.html b/teleforma/templates/teleforma/inc/document_simple_list.html
index a699b05ae926b2c1b7d0d3ab45427e7da653318f..76ef7e93dbbb2b86a6d52e4d1acc84c6fa5a3876 100644 (file)
--- a/teleforma/templates/teleforma/inc/document_simple_list.html
+++ b/teleforma/templates/teleforma/inc/document_simple_list.html
@@ -1,12 +1,6 @@
 {% load teleforma_tags %}
 {% load i18n %}
 
-<div class="course_content">
-
-<div class="course_subtitle">
-<h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {{ title }}</h3>
-</div>
-
 <table class="listing" width="100%">
     <tbody>
         {% for doc in docs.all %}
@@ -18,5 +12,3 @@
     </tbody>
 </table>
 
-</div>
-

diff --git a/teleforma/templates/teleforma/inc/evaluation_form.html b/teleforma/templates/teleforma/inc/evaluation_form.html
index 76f54bcc9506f99864ba02899c1d4f226d0306ed..f147c668ee08b12c2fb2a8147c788ff573361ed9 100644 (file)
--- a/teleforma/templates/teleforma/inc/evaluation_form.html
+++ b/teleforma/templates/teleforma/inc/evaluation_form.html
@@ -3,11 +3,6 @@
 {% load i18n %}
 
 
-<div class="course_content">
-<div class="course_subtitle">
-    <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {{ title }}</h3>
-</div>
-
 <table class="listing" width="100%">
     <tbody>
         <tr>
@@ -15,5 +10,3 @@
         </tr>
     </tbody>
 </table>
-
-</div>
\ No newline at end of file

diff --git a/teleforma/templates/teleforma/inc/media_package_list.html b/teleforma/templates/teleforma/inc/media_package_list.html
index dfbdd2a8c7afc53514b3fe9d06042649901a4c36..cd6db170ba0bed43cf38099949cc77d3ca57d3a8 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_package_list.html
+++ b/teleforma/templates/teleforma/inc/media_package_list.html
@@ -2,10 +2,6 @@
 {% load thumbnail %}
 {% load i18n %}
 
-<div class="course_content">
-<div class="course_subtitle">
-    <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {{ title }}</h3>
-</div>
     <table class="listing" width="100%">
     <tbody>
       {% for media_package in media_packages.all %}
@@ -65,4 +61,3 @@
       {% endfor %}
     </tbody>
     </table>
-</div>

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html
index db06a8cd5afa983076f93c35ed6e5f66d7fb143c..1a4c1600bbacdbac38cecb4317f4430e62fec087 100644 (file)
--- a/teleforma/templates/teleforma/inc/question_list.html
+++ b/teleforma/templates/teleforma/inc/question_list.html
@@ -1,12 +1,6 @@
 {% load teleforma_tags %}
 {% load i18n %}
 
-<div class="course_content">
-
-<div class="course_subtitle">
-<h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {{ title }}</h3>
-</div>
-
 <table class="listing" width="100%">
     <tbody>
         {% for question in questions.all %}
@@ -35,6 +29,3 @@
         {% endfor %}
     </tbody>
 </table>
-
-</div>
-

diff --git a/teleforma/templates/teleforma/inc/testimonial_list.html b/teleforma/templates/teleforma/inc/testimonial_list.html
index 759da97c249a7fec59461d52c67a965ea895ee9b..5d71ab035b28ea60047cf2ef89b543a82e686dae 100644 (file)
--- a/teleforma/templates/teleforma/inc/testimonial_list.html
+++ b/teleforma/templates/teleforma/inc/testimonial_list.html
@@ -1,15 +1,8 @@
 {% load teleforma_tags %}
 {% load i18n %}
 
-<div class="course_content">
-
-<div class="course_subtitle">
-<h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {{ title }}</h3>
-</div>
-
 <table class="listing" width="100%">
-    <tbody>
-        
+    <tbody>        
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="95%"><a href="{% url teleforma-seminar-testimonial seminar.id %}?format=pdf" target="_blank" title="{% trans "Testimonial" %}"><img src="{{ STATIC_URL }}teleforma/images/icon_doc_16.png" style="vertical-align:middle" alt="" /> {% trans "Testimonial" %} : {{ seminar.title }}{% if seminar.rank %} n°{{seminar.rank}}{% endif %}</a></td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center"><a href="{% url teleforma-seminar-testimonial-download seminar.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
@@ -18,5 +11,3 @@
     </tbody>
 </table>
 
-</div>
-

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index fc569827885c05ea2d6fb5fa5c71373a1cadcead..7a5ba1375abb5c0b721afcdef59adcbe3a8871b6 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -72,85 +72,74 @@ $(function () {
          {% endif %}
        </div>
         
+      {% with seminar.docs_1 as docs %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 1 : {% if docs.all.count > 1 %}{% trans "read these documents" %}{% else %}{% trans "read this document" %}{% endif %}</h3>
+        </div>
+        {% include "teleforma/inc/document_simple_list.html" %}
+       </div>
+      {% endwith %}
 
-          {% with seminar.docs_1 as docs %}
-           {% if docs.all.count > 1 %}
-            {% with _("Step 1 : read these documents") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-           {% endwith %}
-           {% else %}
-            {% with _("Step 1 : read this document") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-            {% endwith %}
-           {% endif %}
-          {% endwith %}
-
-          {% with seminar.media as media_packages %}
-           {% if media_packages.all.count > 1 %}
-            {% with _("Step 2 : view these conferences") as title %}
-             {% include "teleforma/inc/media_package_list.html" %}
-            {% endwith %}
-           {% else %}
-            {% with _("Step 2 : view this conference") as title %}
-             {% include "teleforma/inc/media_package_list.html" %}
-            {% endwith %}
-           {% endif %}
-          {% endwith %}
-
-          {% with seminar.docs_2 as docs %}
-           {% if docs.all.count > 1 %}
-            {% with _("Step 3 : read these documents") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-           {% endwith %}
-           {% else %}
-            {% with _("Step 3 : read this document") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-            {% endwith %}
-           {% endif %}
-          {% endwith %}
-            
-          {% with seminar.question as questions %}
-           {% if questions.all.count > 1 %}
-            {% with _("Step 4 : answer to these questions") as title %}
-             {% include "teleforma/inc/question_list.html" %}
-            {% endwith %}
-           {% else %}
-
-
-            {% with _("Step 4 : answer to this question") as title %}
-             {% include "teleforma/inc/question_list.html" %}
-            {% endwith %}
-           {% endif %}
-          {% endwith %}
+      {% with seminar.media as media_packages %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 2 : {% if media_packages.all.count > 1 %}{% trans "view these conferences" %}{% else %}{% trans "view this conference" %}{% endif %}</h3>
+        </div>
+        {% include "teleforma/inc/media_package_list.html" %}
+       </div>
+      {% endwith %}
+  
 
-        
-         {% if seminar_progress == 100 %}
-          {% with seminar.docs_correct as docs %}
-           {% if docs.all.count > 1 %}
-            {% with _("Step 5 : read these corrected documents") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-            {% endwith %}
-           {% else %}
-            {% with _("Step 5 : read this corrected document") as title %}
-             {% include "teleforma/inc/document_simple_list.html" %}
-            {% endwith %}
-           {% endif %}
-          {% endwith %}
-
-          {% with seminar.form as form %}
-           {% with _("Step 6 : evaluate the seminar") as title %}
-            {% include "teleforma/inc/evaluation_form.html" %}
-           {% endwith %}
-          {% endwith %}
-         {% endif %}
+     {% with seminar.docs_2 as docs %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 3 : {% if docs.all.count > 1 %}{% trans "read these documents" %}{% else %}{% trans "read this document" %}{% endif %}</h3>
+        </div>
+        {% include "teleforma/inc/document_simple_list.html" %}
+       </div>
+      {% endwith %}
 
-         {% if validated %}
-           {% with _("Step 7 : download your testimonial") as title %}
-            {% include "teleforma/inc/testimonial_list.html" %}
-           {% endwith %}
-         {% endif %}
+     {% with seminar.question as questions %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 4 : {% if questions.all.count > 1 %}{% trans "answer to these questions" %}{% else %}{% trans "answer to this question" %}{% endif %}</h3>
+        </div>
+        {% include "teleforma/inc/question_list.html" %}
+       </div>
+      {% endwith %}
+
+    
+     {% if seminar_progress == 100 %}
+      {% with seminar.docs_correct as docs %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 5 : {% if docs.all.count > 1 %}{% trans "read these documents" %}{% else %}{% trans "read this document" %}{% endif %}</h3>
+        </div>
+        {% include "teleforma/inc/document_simple_list.html" %}
+       </div>
+      {% endwith %}
+
+      {% with seminar.form as form %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 6 : {% trans "evaluate the seminar" %}</h3>
+        </div>
+        {% include "teleforma/inc/evaluation_form.html" %}
+       </div>
+      {% endwith %}
+     {% endif %}
+      
+     {% if validated %}
+       <div class="course_content">
+        <div class="course_subtitle">
+          <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Step" %} 6 : {% trans "download your testimonial" %}</h3>
+        </div>
+        {% include "teleforma/inc/testimonial_list.html" %}
+       </div>
+     {% endif %}
 
-      {% endblock course_content %}
+    {% endblock course_content %}
 
       </div>