install quiz, fix last urls

diff --git a/app/settings.py b/app/settings.py
index 04839c8ba3fce4637171eeebc017ee4310db4f06..70e840a350718c207e05afb11cf0130712567d50 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -139,21 +139,25 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
-    #'south',
+    # 'south',
     'teleforma',
     'sorl.thumbnail',
     'django_extensions',
     'pagination',
     'postman',
-#    'private_files',
-    #'markup_mixin',
+    # 'private_files',
+    # 'markup_mixin',
     #'notes',
-#    'jquery',
+    # 'jquery',
     'timezones',
     'jqchat',
-#    'follow',
+    # 'follow',
     # 'googletools',
-     'telecaster',
+    'telecaster',
+    'multichoice',
+    'true_false',
+    'essay',
+    'quiz',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 84cde210a65b1b0e9de832eb44b16d7c24872a84..a42d5fa9ea40ca7462bcf16dee5120429744e10d 100755 (executable)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -339,8 +339,7 @@ class Home(models.Model):
                              default="Page d'accueil")
     text = HTMLField('Texte', blank=True)
     video = models.ForeignKey(Media, verbose_name="Video", null=True, blank=True)
-    modified_at = models.DateTimeField(u'Date de modification', auto_now=True,
-                                       default=datetime.datetime.now)
+    modified_at = models.DateTimeField(u'Date de modification', auto_now=True)
     periods = models.ManyToManyField('Period', related_name="home_texts",
                                      verbose_name=u'Périodes associées',
                                      blank=True, null=True)

diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index c5637236b15970ce3efe8f470e4b38d80e879eb0..5e43b0e53a6fdb9dcb94b8465377e5417a36f358 100644 (file)
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -35,7 +35,7 @@
             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
                 {% if stream.streaming %}
                     <td {% if forloop.first %}class="border-top"{% endif %} width="230px">
-                        <a href="{% url teleforma-conference-detail period.id stream.conference.id %}" title="{% trans "View" %}">
+                        <a href="{% url 'teleforma-conference-detail' period.id stream.conference.id %}" title="{% trans "View" %}">
                         <img id="snapshot-{{ stream.course.code }}-{{ stream.course_type }}" src="{{ stream.snapshot_url }}" width="100%" alt="{% trans 'Click here' %}" />
                         </a>
                     </td>
@@ -45,7 +45,7 @@
                             <dt>{% trans "Title" %}</dt><dd>{{ stream.conference.course.title }}</dd>
                             <dt>{% trans "Session" %}</dt><dd>{{ stream.conference.session }}</dd>
                             {% if stream.conference.professor.user.username %}
-                              <dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail stream.conference.professor.user.username %}" target="_blank">{{ stream.conference.professor }}</a></dd>
+                              <dt>{% trans "Professor" %}</dt><dd><a href="{% url 'telemeta-profile-detail' stream.conference.professor.user.username %}" target="_blank">{{ stream.conference.professor }}</a></dd>
                             {% endif %}
                             <dt>{% trans "Begin" %}</dt><dd>{{ stream.conference.date_begin }}</dd>
                             </dl>