Merge branch 'dev' into tc202-dev

diff --cc example/settings.py
Simple merge

diff --cc teleforma/admin.py
index 2a2dbcae3d62e23e7f9d3ef011602d875fa703b7,d8f0564dd8dc12f7362ac9afacf69243344de5d4..c715def208c7c35d531046a1d9d1b9a0f6b64a0d
--- 1/teleforma/admin.py
--- 2/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -143,8 -185,8 +185,9 @@@ class TrainingAdmin(admin.ModelAdmin)
  class CourseAdmin(admin.ModelAdmin):
      model = Course
      ordering = ['number']
 +    # filter_horizontal = ['types']
  
+ 
  class DocumentAdmin(admin.ModelAdmin):
      exclude = ['readers']
      filter_horizontal = ['course_type']

diff --cc teleforma/locale/fr/LC_MESSAGES/django.po
Simple merge

diff --cc teleforma/models/core.py
Simple merge

diff --cc teleforma/models/crfpa.py
index cdf51abf28702b7c38d586e5d39b436ea0564827,34ca3260afedfffc1ad574119f87a2917403b841..36a93a6b4e05c5b6dfdbae5e7a735a54ae6a44de
mode 100644,100755..100755
--- 1/teleforma/models/crfpa.py
--- 2/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py

diff --cc teleforma/templates/teleforma/course_detail.html
index 14011027c23bb6a63584e624fb9de1a5c5f05f55,af1ba6e57526c3ebfa1af2b75966739f23b35aae..e02e52a80dc26af72010443f4d60514dea25a4f0
--- 1/teleforma/templates/teleforma/course_detail.html
--- 2/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@@ -23,24 -30,42 +30,42 @@@ $(document).ready(function()
       {% with c.course as course %}
        {% for type in c.types %}
        <div class="course">
 -        <div class="course_title">{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}
 +        <div class="course_title">{{ course.title }}{% if type.name != "None" %} - {{ type }}{% endif %}{% if course.description %} - {{ course.description }}{% endif %}
          </div>
  
-         {% if not user.correctors.all or user.is_staff %}
-         {% block conference %}
-          {% include "teleforma/inc/conference_list.html" %}
-         {% endblock %}
+           {% if type.name == 'Quiz' %}
+           <div class="course_content">
+               {% if course.quiz.all %}
+               <table class="listing" width="100%">
+                   <tbody>
+                   {% for quiz in course.quiz.all %}
+                   <td class="border-top"><a href="{% url quiz_start_page slug=quiz.url %}">{{quiz.title}}</a></td>
+                   <td class="border-top">{{quiz.description}}</td>
+                   {% endfor %}
+                   </tbody>
+               </table>
+               {% else %}
+               <p>Aucun quiz</p>
+               {% endif %}
+           </div>
  
-         {% block media %}
-          {% include "teleforma/inc/media_list.html" %}
-         {% endblock %}
-         {% endif %}
+         {% else %}
+           {% if show_media %}
+           {% block conference %}
+            {% include "teleforma/inc/conference_list.html" %}
+           {% endblock %}
+ 
+           {% block media %}
+            {% include "teleforma/inc/media_list.html" %}
+           {% endblock %}
+           {% endif %}
  
-         {% block document %}
-          {% with forloop.counter as type_counter %}
-           {% include "teleforma/inc/document_list.html" %}
-          {% endwith %}
-         {% endblock %}
+           {% block document %}
+            {% with forloop.counter as type_counter %}
+             {% include "teleforma/inc/document_list.html" %}
+            {% endwith %}
+           {% endblock %}
+         {% endif %}
  
          </div>
        {% endfor %}

diff --cc teleforma/templates/teleforma/course_media.html
Simple merge

diff --cc teleforma/templates/telemeta/base.html
index ce86b938f982c7627750c7562d3057ecb6f454ba,80487b4c3f1761b3c09d349cd59b9e8d746f915b..2b0230e6ca05d9bd006cea3aa72edac3c0ac3c3a
--- 1/teleforma/templates/telemeta/base.html
--- 2/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@@ -2,16 -2,19 +2,15 @@@
  {% load i18n %}
  {% load telemeta_utils %}
  {% load teleforma_tags %}
 -{% get_googletools as googletools %}
 -{%  if googletools %}
 -{% load googletools %}
 -{% endif %}
  {% get_current_language as LANGUAGE_CODE %}
  {% get_available_languages as LANGUAGES %}
- <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
- 
- <head>
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}><head>
  <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
- <meta name="Viewport" content="width=device-width" />
+ <!--<meta name="Viewport" content="width=device-width" />
  <meta name="Viewport" content="initial-scale=1.0" />
  <meta name="Viewport" content="maximum-scale=1.5" />
- <meta name="Viewport" content="user-scalable=1" />
+ <meta name="Viewport" content="user-scalable=1" />-->
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
  <meta name="apple-mobile-web-app-capable" content="yes" />
  <meta names="apple-mobile-web-app-status-bar-style" content="black-translucent" />
  <link rel="icon" href="/static/teleforma/images/favicon.ico"/>

diff --cc teleforma/templatetags/teleforma_tags.py
index 2e08c68890400d035b5e9e14c30752f0b5ab2813,ed8ef8ef81dfa3aaba9b06251671c44c3d27ee77..dc098b4e2ba02e6f40262d5b4b16a8fa85ab8f2b
--- 1/teleforma/templatetags/teleforma_tags.py
--- 2/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@@ -219,16 -226,14 +226,14 @@@ def scripts_count(user, period, statuse
          return ' (' + str(len(scripts)) + ')'
      else:
          return ''
 -    
 +
+ @register.simple_tag
+ def untreated_scripts_count(user, period):
+     return scripts_count(user, period, (3,))
+ 
  @register.simple_tag
  def treated_scripts_count(user, period):
-     Q1 = Q(status=4, author=user, period=period)
-     Q2 = Q(status=4, corrector=user, period=period)
-     scripts = Script.objects.filter(Q1 | Q2)
-     if scripts:
-         return ' (' + str(len(scripts)) + ')'
-     else:
-         return ''
+     return scripts_count(user, period, (4,))
  
  @register.simple_tag
  def get_training_profile(user):
@@@ -242,3 -247,32 +247,32 @@@
              for training in student.trainings.all():
                  text += unicode(training) + ' '
      return text
 -    
 -    course = get_object_or_404(Course, id=course_id) 
+ 
+ @register.inclusion_tag('teleforma/inc/newsitems_portlet.html', takes_context=True)
+ def newsitems_portlet(context, course_id, period_id):
+     request = context['request']
+     user = request.user
+     def get_data(newsitem):
+         return {
+         'id':newsitem.id,
+         'title':newsitem.title,
+         'text':newsitem.text,
+         'creator':newsitem.creator,
+         'created':newsitem.created,
+         'can_edit':newsitem.can_edit(request),
+         'can_delete':newsitem.can_delete(request),
+         }
 -    can_add = False 
++
++    course = get_object_or_404(Course, id=course_id)
+     course_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, course__id=course_id, period_id=period_id).order_by('-created')]
+     all_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, period_id=period_id).order_by('-created')]
 -            'course_newsitems':course_newsitems, 
++    can_add = False
+     if user.is_staff or user.professor.count():
+         can_add = True
+     return {
+             'can_add':can_add,
+             'course':course,
+             'period_id':period_id,
++            'course_newsitems':course_newsitems,
+             'all_newsitems':all_newsitems
+            }

diff --cc teleforma/views/core.py
Simple merge