add help on message page, test user_agent

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index 836454773fa54dceb71761deb3c5ccdde93e3606..86a6f26145059e63704859505dc4074fffb9e668 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -66,6 +66,7 @@ class ScriptsView(ListView):
         context = super(ScriptsView, self).get_context_data(**kwargs)
         context['period'] = Period.objects.get(id=self.kwargs['period_id'])
         context['upload'] = getattr(settings, 'TELEFORMA_EXAM_SCRIPT_UPLOAD', True)
+        print self.request.user_agent.device
         return context
 
     @method_decorator(login_required)

diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html
index a88fdfcaf83cd27dbbee45b0c56aadc204fbefa6..a6e80a634d11d499f6f70fd3d084c8f76e671f5a 100644 (file)
--- a/teleforma/templates/postman/base_write.html
+++ b/teleforma/templates/postman/base_write.html
@@ -27,6 +27,13 @@ function update_professor_recipient() {
 {% if user.student.all or user.is_staff or user.quotas.all %}
 <div style="padding-top: 0.5em;">
 
+{% trans "Vous pouvez ici échanger des messages avec les professeurs et les administrateurs." %}
+<br/>
+{% trans "Pour les questions concernant l'organisation des cours, le planning ou les documents de cours, adressez-vous à <b>Admin-CRFPA</b>." %}
+<br/>
+{% trans "Pour les questions concernant uniquement l'accès à la plateforme et aux médias vidéo ou audio, lire d'abord" %} <a href="{% url teleforma-help %}">la page d'aide</a> {% trans "puis adressez-vous à <b>Support technique</b>." %}
+<br/><br/>
+
 <select id="_adminSelect" name="admins" onchange="update_admin_recipient();">
 <option value="">{% trans "to an administrator" %}</option>
 {% get_all_admins as admins %}

diff --git a/teleforma/templates/teleforma/annals.html b/teleforma/templates/teleforma/annals.html
index 2e0c8f5b55c8817392087b4007fce8a70dffc2b2..dff3e0053c54a3f0df4d1506c12f6477510ecd61 100644 (file)
--- a/teleforma/templates/teleforma/annals.html
+++ b/teleforma/templates/teleforma/annals.html
@@ -48,7 +48,6 @@
        {% if not object_list.items %}
        <div class="course_title">{% trans "No document" %}</div>
        {% else %}
-
        {% for course, iejs in object_list.items %}
 
                        <div class="course_title">{{ course.title }} - {% trans "Annals" %}</div>

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 5673dea6dc326c36657ef343a9f93745180ea5f1..4fd6870d8b40651c1ca9264d1fb9aa19855ec4b0 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -350,7 +350,6 @@ class AnnalsView(ListView):
     def get_queryset(self):
         self.user = self.request.user
         self.all_courses = get_courses(self.request.user)
-        print self.all_courses
         return self.get_docs()
 
     def get_context_data(self, **kwargs):