From: Guillaume Pellerin Date: Wed, 9 Dec 2015 16:31:36 +0000 (+0100) Subject: fix extends X-Git-Tag: 2.8.1-pro~270 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b67cfa2e0d223ba3f073ecc019e12b303ab40b8e;p=teleforma.git fix extends --- diff --git a/teleforma/templates/quiz/base.html b/teleforma/templates/quiz/base.html index c565dd49..614042eb 100644 --- a/teleforma/templates/quiz/base.html +++ b/teleforma/templates/quiz/base.html @@ -1,3 +1,21 @@ -{% extends "teleforma/base.html" %} +{% extends "teleforma/answer_form.html" %} +{% load teleforma_tags %} {% load i18n %} +{% block extra_javascript %} +{% endblock extra_javascript %} + +{% block extra_stylesheets %}{% endblock %} + +{% block course_content %} + +
+
+

{% trans "Step" %} 2bis : {% trans "answer to this quiz" %}

+
+
+ {% include quiz/quiz/quiz_detail.html %} +
+
+ +{% endblock course_content %} diff --git a/teleforma/templates/quiz/progress.html b/teleforma/templates/quiz/progress.html index 5337c71c..d94ecb22 100644 --- a/teleforma/templates/quiz/progress.html +++ b/teleforma/templates/quiz/progress.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "quiz/base.html" %} {% load i18n %} {% load quiz_tags %} diff --git a/teleforma/templates/quiz/question.html b/teleforma/templates/quiz/question.html index 113f28e6..7e11454a 100644 --- a/teleforma/templates/quiz/question.html +++ b/teleforma/templates/quiz/question.html @@ -1,4 +1,4 @@ -{% extends "teleforma/base.html" %} +{% extends "quiz/base.html" %} {% load i18n%} {% load quiz_tags %} diff --git a/teleforma/templates/quiz/quiz/category_list.html b/teleforma/templates/quiz/quiz/category_list.html index 90ffe0a7..a642c683 100644 --- a/teleforma/templates/quiz/quiz/category_list.html +++ b/teleforma/templates/quiz/quiz/category_list.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'quiz/base.html' %} {% load i18n %} {% block title %}{% trans "All Quizzes" %}{% endblock %} diff --git a/teleforma/templates/quiz/quiz/quiz_detail.html b/teleforma/templates/quiz/quiz/quiz_detail.html index 2681f778..af55849a 100644 --- a/teleforma/templates/quiz/quiz/quiz_detail.html +++ b/teleforma/templates/quiz/quiz/quiz_detail.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'quiz/base.html' %} {% load i18n %} {% block title %} {{ quiz.title }} diff --git a/teleforma/templates/quiz/quiz/sitting_detail.html b/teleforma/templates/quiz/quiz/sitting_detail.html index fe8da8c2..91f6c663 100644 --- a/teleforma/templates/quiz/quiz/sitting_detail.html +++ b/teleforma/templates/quiz/quiz/sitting_detail.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'quiz/base.html' %} {% load i18n %} {% load quiz_tags %} {% block title %} diff --git a/teleforma/templates/quiz/quiz/sitting_list.html b/teleforma/templates/quiz/quiz/sitting_list.html index 915c8a8e..7826e493 100644 --- a/teleforma/templates/quiz/quiz/sitting_list.html +++ b/teleforma/templates/quiz/quiz/sitting_list.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'quiz/base.html' %} {% load i18n %} {% block title %}{% trans "All Quizzes" %}{% endblock %} diff --git a/teleforma/templates/quiz/result.html b/teleforma/templates/quiz/result.html index e99e7932..8e74bf9a 100644 --- a/teleforma/templates/quiz/result.html +++ b/teleforma/templates/quiz/result.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "quiz/base.html" %} {% load i18n %} {% load quiz_tags %} diff --git a/teleforma/templates/quiz/single_complete.html b/teleforma/templates/quiz/single_complete.html index 9b016f97..58381104 100644 --- a/teleforma/templates/quiz/single_complete.html +++ b/teleforma/templates/quiz/single_complete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "quiz/base.html" %} {% load i18n %} {% load quiz_tags %} diff --git a/teleforma/templates/quiz/view_quiz_category.html b/teleforma/templates/quiz/view_quiz_category.html index 29aeda62..556eb234 100644 --- a/teleforma/templates/quiz/view_quiz_category.html +++ b/teleforma/templates/quiz/view_quiz_category.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'quiz/base.html' %} {% load i18n %} {% block title %}{% trans "Quizzes related to" %} {{ category.category }}{% endblock %}