diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py
index 5db49bbc9c5..e21f4699d42 100644
--- a/addons/survey/__manifest__.py
+++ b/addons/survey/__manifest__.py
@@ -49,6 +49,7 @@ sent mails with personal token for the invitation of the survey.
'data/survey_demo_certification.xml',
'data/survey_demo_quiz.xml',
'data/survey_demo_quiz_userinput.xml',
+ 'data/survey_demo_conditional.xml',
'data/survey.user_input.line.csv'
],
'installable': True,
diff --git a/addons/survey/data/survey_demo_conditional.xml b/addons/survey/data/survey_demo_conditional.xml
new file mode 100644
index 00000000000..02298e082a6
--- /dev/null
+++ b/addons/survey/data/survey_demo_conditional.xml
@@ -0,0 +1,474 @@
+
+
+
+
+ Burger Quiz
+ burger00-quiz-1234-abcd-344ca2tgb31e
+ open
+ public
+
+ scoring_with_answers
+ 55
+ limited
+ 10.0
+ page_per_question
+
+
Choose your favourite subject and show how good you are. Ready ?
+
+
+
+
+
+ Start
+
+ 1
+
+
+
+
+
+ 2
+ Pick a subject
+ multiple_choice
+
+
+
+
+ 1
+ Geography
+
+
+
+ 2
+ History
+
+
+
+ 3
+ Sciences
+
+
+
+ 4
+ Art & Culture
+
+
+
+
+ Geography
+
+ 100
+
+
+
+
+
+ 110
+ How long is the White Nile river?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ 1450 km
+
+
+
+ 2
+ 3700 km
+
+ 10
+
+
+
+ 3
+ 6650 km
+
+
+
+
+
+ 120
+ What is the biggest city in the world ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ Shanghai
+
+
+
+ 2
+ Tokyo
+
+ 10
+
+
+
+ 3
+ New York
+
+
+
+ 4
+ Istanbul
+
+
+
+
+ 130
+ What is the highest volcano in Europe ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ Mount Teide (Spain - Tenerife)
+
+
+
+ 2
+ Eyjafjallajökull (Iceland)
+
+
+
+ 3
+ Mount Etna (Italy - Sicily)
+
+
+
+ 4
+ Mount Elbrus (Russia)
+
+ 10
+
+
+
+
+ History
+
+ 200
+
+
+
+
+
+ 210
+ When did Genghis Khan die ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ 1227
+
+ 10
+
+
+
+ 2
+ 1324
+
+
+
+ 3
+ 1055
+
+
+
+
+ 220
+ Who is the architect of the Great Pyramid of Giza ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ Imhotep
+
+
+
+ 2
+ Amenhotep
+
+
+
+ 3
+ Hemiunu
+
+ 10
+
+
+
+ 4
+ Papyrus
+
+
+
+
+ 230
+ How many years did the 100 years war last ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ 99 years
+
+
+
+ 2
+ 100 years
+
+
+
+ 3
+ 116 years
+
+ 10
+
+
+
+ 4
+ 127 years
+
+
+
+
+ Sciences
+
+ 300
+
+
+
+
+
+ 310
+ Who received a Nobel prize in Physics for the discovery of neutrino oscillations, which shows that neutrinos have mass ?
+ multiple_choice
+
+
+
+
+
+
+
+ 1
+ Arthur B. McDonald
+
+ 5
+
+
+
+ 2
+ Peter W. Higgs
+
+
+
+ 3
+ Takaaki Kajita
+
+ 5
+
+
+
+ 4
+ Willard S. Boyle
+
+
+
+
+ 320
+ What is, approximately, the critical mass of plutonium-239 ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ 5.7 kg
+
+
+
+ 2
+ 10 kg
+
+ 10
+
+
+
+ 3
+ 16.2 kg
+
+
+
+ 4
+ 47 kg
+
+
+
+
+ 330
+ Can Humans ever directly see a photon ?
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ Yes, that's the only thing a human eye can see.
+
+ 10
+
+
+
+ 2
+ No, it's to small for the human eye.
+
+
+
+
+ Art & Culture
+
+ 400
+
+
+
+
+
+ 410
+ Which Musician is not in the 27th Club ?
+ multiple_choice
+
+
+
+
+
+
+
+ 1
+ Kurt Cobain
+
+
+
+ 2
+ Kim Jong-hyun
+
+
+
+ 3
+ Avicii
+
+ 5
+
+
+
+ 4
+ Cliff Burton
+
+ 5
+
+
+
+
+ 420
+ Which painting/drawing was not made by Pablo Picasso ?
+ simple_choice
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ 2
+
+
+
+ 10
+
+
+
+ 3
+
+
+
+
+
+ 4
+
+
+
+
+
+
+ 430
+ Which quote is from Jean-Claude Van Damme
+ simple_choice
+
+
+
+
+
+
+
+ 1
+ I’ve never really wanted to go to Japan. Simply because I don’t like eating fish. And I know that’s very popular out there in Africa.
+
+
+
+ 2
+ I am fascinated by air. If you remove the air from the sky, all the birds would fall to the ground. And all the planes, too.
+
+ 10
+
+
+
+ 3
+ I've been noticing gravity since I was very young !
+
+
+
+ 4
+ I actually don't like thinking. I think people think I like to think a lot. And I don't. I do not like to think at all.
+
+
+
diff --git a/addons/survey/data/survey_demo_quiz.xml b/addons/survey/data/survey_demo_quiz.xml
index e2b11c6fc32..96aab5a4860 100644
--- a/addons/survey/data/survey_demo_quiz.xml
+++ b/addons/survey/data/survey_demo_quiz.xml
@@ -198,7 +198,7 @@
- 23
+ 24A "Citrus" could give you ...multiple_choice
@@ -235,7 +235,7 @@
- 24
+ 25How often should you water those plantsmatrixsimple
@@ -264,7 +264,7 @@
- 25
+ 26When do you harvest those fruitsBest time to do it, is the right time to do it.matrix
@@ -312,7 +312,7 @@
Trees
- 26
+ 30
@@ -325,7 +325,7 @@
Dogwood is from which family of trees ?
- 27
+ 31simple_choice6
@@ -361,7 +361,7 @@
In which country did the bonsai technique develop ?
- 28
+ 32simple_choice6
@@ -397,7 +397,7 @@
Is the wood of a coniferous hard or soft ?
- 29
+ 33simple_choice6
@@ -424,7 +424,7 @@
From which continent is native the Scots pine (pinus sylvestris) ?
- 30
+ 34simple_choice
@@ -465,7 +465,7 @@
In the list below, select all the corniferous.
- 31
+ 35multiple_choice6
@@ -507,7 +507,7 @@
After watching this video, will you swear that you are not going to procrastinate to trim your hedge this year ?
- 32
+ 36simple_choice6
@@ -543,7 +543,7 @@
Your feeling
- 33
+ 40
@@ -551,7 +551,7 @@
- 34
+ 41What do you think about this survey ?If you don't like us, please try to be as objective as possible.simple_choice
diff --git a/addons/survey/static/src/img/burger_quiz_background.jpg b/addons/survey/static/src/img/burger_quiz_background.jpg
new file mode 100644
index 00000000000..b52eac68380
Binary files /dev/null and b/addons/survey/static/src/img/burger_quiz_background.jpg differ
diff --git a/addons/survey/static/src/img/burger_quiz_cubism_klein.jpg b/addons/survey/static/src/img/burger_quiz_cubism_klein.jpg
new file mode 100644
index 00000000000..95f588041da
Binary files /dev/null and b/addons/survey/static/src/img/burger_quiz_cubism_klein.jpg differ
diff --git a/addons/survey/static/src/img/burger_quiz_don_quixote.jpg b/addons/survey/static/src/img/burger_quiz_don_quixote.jpg
new file mode 100644
index 00000000000..616bc388aab
Binary files /dev/null and b/addons/survey/static/src/img/burger_quiz_don_quixote.jpg differ
diff --git a/addons/survey/static/src/img/burger_quiz_guernica.jpg b/addons/survey/static/src/img/burger_quiz_guernica.jpg
new file mode 100644
index 00000000000..3301982ca2f
Binary files /dev/null and b/addons/survey/static/src/img/burger_quiz_guernica.jpg differ
diff --git a/addons/survey/static/src/img/burger_quiz_self_portrait.jpg b/addons/survey/static/src/img/burger_quiz_self_portrait.jpg
new file mode 100644
index 00000000000..efd7e8330b2
Binary files /dev/null and b/addons/survey/static/src/img/burger_quiz_self_portrait.jpg differ