summaryrefslogtreecommitdiff
path: root/addons/website_slides/static/src/xml
diff options
context:
space:
mode:
authorsri-odoo <sri@odoo.com>2019-03-18 14:13:11 +0000
committerThibault Delavallée <tde@odoo.com>2019-03-21 11:39:23 +0000
commit7d27a6d6bf66dff21d9f01f424d358fe0adedb2f (patch)
treecaf0bf64ea028824ff54f5005f17f630129a5bf4 /addons/website_slides/static/src/xml
parentde139a85087be942062157a196035a100ae0c79e (diff)
[FIX] website_slides: improve quiz and its success modal layout and design
Commit linked to task ID 1941250 and PR #31977
Diffstat (limited to 'addons/website_slides/static/src/xml')
-rw-r--r--addons/website_slides/static/src/xml/slide_quiz.xml115
1 files changed, 69 insertions, 46 deletions
diff --git a/addons/website_slides/static/src/xml/slide_quiz.xml b/addons/website_slides/static/src/xml/slide_quiz.xml
index c8b4bc66186..bb4316c3975 100644
--- a/addons/website_slides/static/src/xml/slide_quiz.xml
+++ b/addons/website_slides/static/src/xml/slide_quiz.xml
@@ -1,83 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates xml:space="preserve">
<t t-name="slide.slide.quiz">
- <div class="o_wslides_fs_quiz_container h-100 w-100">
- <div class="mx-5">
+ <div class="o_wslides_fs_quiz_container o_wslides_wrap h-100 w-100 overflow-auto pb-5">
+ <div class="container">
+ <div t-if="widget.slide.completed" class="row">
+ <div class="o_wslides_js_lesson_quiz_validation col py-2 bg-100 mb-2 border-bottom"/>
+ </div>
+
<div t-foreach="widget.quiz.questions" t-as="question"
- class="o_wslides_js_lesson_quiz_question mt-3" t-att-data-question-id="question.id" t-att-data-title="question.question">
- <div class="h3">
+ t-attf-class="o_wslides_js_lesson_quiz_question my-3 #{widget.slide.completed ? 'disabled' : ''}"
+ t-att-data-question-id="question.id" t-att-data-title="question.question">
+ <div class="h4">
<small class="text-muted"><span t-esc="question_index+1"/>. </small> <span t-esc="question.question"/>
</div>
- <ul class="bg-white list-unstyled">
+ <div class="list-group">
<t t-foreach="question.answers" t-as="answer">
- <li t-att-data-answer-id="answer.id"
+ <a t-att-data-answer-id="answer.id" href="#"
t-att-data-text="answer.text_value"
- class="o_wslides_quiz_answer pt-2 pb-2 border-bottom rounded d-flex align-items-center">
+ t-attf-class="o_wslides_quiz_answer list-group-item d-flex align-items-center #{widget.slide.completed ? 'disabled bg-transparent' : 'list-group-item-action' }">
- <label class="mb-0 d-flex align-items-center justify-content-center mr-3 ml-3">
+ <label class="my-0 d-flex align-items-center justify-content-center mr-2">
<input type="radio"
t-att-name="question.id"
t-att-value="answer.id"
class="d-none"/>
- <i class="fa fa-circle text-muted"></i>
+ <i class="fa fa-circle text-400"></i>
<i class="fa fa-times-circle text-danger d-none"></i>
<i class="fa fa-check-circle text-success d-none"></i>
</label>
<span t-esc="answer.text_value"/>
- </li>
+ </a>
</t>
- </ul>
+ </div>
</div>
- <div class="alert alert-danger o_wslides_js_lesson_quiz_error d-none" role="alert">
+ <div class="alert alert-danger o_wslides_js_lesson_quiz_error mt-2 d-none" role="alert">
<span></span>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
- <span aria-hidden="true">&amp;times;</span>
+ <span>&amp;times;</span>
</button>
</div>
- <div class="o_wslides_js_lesson_quiz_validation"/>
+ <div t-if="!widget.slide.completed" class="o_wslides_js_lesson_quiz_validation border-top pt-3"/>
</div>
</div>
</t>
<t t-name="slide.slide.quiz.validation">
- <t t-if="widget.readonly">
- <button class="btn btn-primary" role="button" title="Join" aria-label="Join" disabled="disabled">Join course to take quiz</button>
- <span role="button" title="Succeed and gain karma" aria-label="Succeed and gain karma"
- class="badge badge-pill badge-warning text-white font-weight-bold ml-3 px-2 py-1">+ <t t-esc="widget.quiz.quizKarmaGain"/> XP</span>
- </t>
- <t t-else="">
- <button t-if="! widget.slide.completed" role="button" title="Check answers" aria-label="Check answers"
- class="btn btn-primary text-uppercase font-weight-bold o_wslides_js_lesson_quiz_submit">Check your answers</button>
- <button t-if="widget.slide.completed" role="button" title="Quiz done" aria-label="Quiz done" disabled="disabled"
- class="btn btn-primary text-uppercase font-weight-bold">Done !</button>
- <span t-if="! widget.slide.completed" role="button" title="Succeed and gain karma" aria-label="Succeed and gain karma"
- class="badge badge-pill badge-warning text-white font-weight-bold ml-3 px-2 py-1">+ <t t-esc="widget.quiz.quizKarmaGain"/> XP</span>
- <span t-if="widget.slide.completed" role="button" title="Gained karma" aria-label="Gained karma"
- class="badge badge-pill badge-success text-white font-weight-bold ml-3 px-2 py-1">+ <t t-esc="widget.quiz.quizKarmaWon"/> XP</span>
- <button t-if="widget.slide.completed &amp;&amp; widget.slide.hasNext"
- class="btn btn-primary ml-3 o_wslides_quiz_continue">Continue</button>
- </t>
+ <div t-if="widget.readonly" class="alert alert-info">
+ <b>Join course to take quiz</b>
+ <span class="my-0 h4" style="line-height: 1">
+ <span title="Succeed and gain karma" aria-label="Succeed and gain karma" class="badge badge-pill badge-warning text-white font-weight-bold ml-3 px-2 py-1">
+ + <t t-esc="widget.quiz.quizKarmaGain"/> XP
+ </span>
+ </span>
+ </div>
+ <div t-else="" class="d-flex align-items-center justify-content-between">
+ <div t-att-class="'d-flex align-items-center' + (widget.slide.completed ? ' alert alert-success my-0 py-1 px-3' : '')">
+ <button t-if="! widget.slide.completed" role="button" title="Check answers" aria-label="Check answers"
+ class="btn btn-primary text-uppercase font-weight-bold o_wslides_js_lesson_quiz_submit">Check your answers</button>
+ <b t-else="" class="my-0 h5">Done !</b>
+ <span class="my-0 h5" style="line-height: 1">
+ <span role="button" title="Succeed and gain karma" aria-label="Succeed and gain karma" class="badge badge-pill badge-warning text-white font-weight-bold ml-3 px-2">
+ + <t t-esc="widget.quiz.quizKarmaGain"/> XP
+ </span>
+ </span>
+ </div>
+ <button t-if="widget.slide.completed &amp;&amp; widget.slide.hasNext" class="btn btn-primary o_wslides_quiz_continue">
+ Continue <i class="fa fa-chevron-right ml-1"/>
+ </button>
+ </div>
</t>
<t t-name="slide.slide.quiz.finish">
- <div class="modal o_wslides_quiz_modal" tabindex="-1" role="dialog" id="slides_quiz_modal">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
+ <div class="modal o_wslides_quiz_modal pt-5" tabindex="-1" role="dialog" id="slides_quiz_modal">
+ <div class="modal-backdrop show bg-white" style="z-index:0"/>
+ <div class="modal-dialog mt-5" role="document">
+ <div class="modal-content shadow-lg">
<div class="modal-body d-flex p-0">
- <div class="w-50 o_wslides_gradient"/>
- <div class="w-50 d-flex flex-column p-3">
- <h1>Amazing!</h1>
- <div class="pb-3">
- <span class="pb-2">You gained <span class="badge badge-pill badge-success text-white font-weight-bold"><t t-esc="widget.quiz.quizKarmaWon"/> XP !</span> !</span>
- <div class="progress">
- <div class="progress-bar" role="progressbar" t-att-aria-valuenow="widget.quiz.rankProgress.progress" aria-valuemin="0" aria-valuemax="100"
- t-attf-style="heigth: 8px; width: #{widget.quiz.rankProgress.progress}%"/>
+ <button type="button" class="close position-absolute" data-dismiss="modal" aria-label="Close" style="right: 5px">&#215;</button>
+ <div class="o_wslides_gradient rounded-left d-none d-md-flex flex-shrink-0" style="width: 42%">
+ <img class="o_wslides_quiz_modal_hero" src="/website_slides/static/src/img/quiz_modal_success.svg" alt=""/>
+ </div>
+ <div class="d-flex flex-column flex-grow-1 justify-content-between pl-md-5 p-3 overflow-auto">
+ <div>
+ <h1 class="mt-3 display-4 font-weight-bold">Amazing!</h1>
+ <div class="pb-3">
+ <h4 class="pb-2 d-flex">You gained <span class="badge badge-pill badge-success text-white font-weight-bold ml-2 mr-1"><t t-esc="widget.quiz.quizKarmaWon"/> XP</span> !</h4>
+ <div class="progress" style="height: 8px">
+ <div class="progress-bar" role="progressbar" t-att-aria-valuenow="widget.quiz.rankProgress.progress" aria-valuemin="0" aria-valuemax="100"
+ t-attf-style="width: #{widget.quiz.rankProgress.progress}%"/>
+ </div>
+ <small t-if="widget.quiz.rankProgress.lowerBound" class="float-left text-primary font-weight-bold"><t t-esc="widget.quiz.rankProgress.lowerBound"/></small>
+ <small t-if="widget.quiz.rankProgress.upperBound" class="float-right font-weight-bold"><t t-esc="widget.quiz.rankProgress.upperBound"/></small>
</div>
- <small t-if="widget.quiz.rankProgress.lowerBound" class="float-left"><t t-esc="widget.quiz.rankProgress.lowerBound"/></small>
- <small t-if="widget.quiz.rankProgress.upperBound" class="float-right"><t t-esc="widget.quiz.rankProgress.upperBound"/></small>
+ <div class="pb-3" t-raw="widget.quiz.rankProgress.motivational"/>
</div>
- <div class="pb-3" t-raw="widget.quiz.rankProgress.motivational"/>
- <button t-if="widget.slide.hasNext" type="button" class="btn btn-light o_wslides_quiz_btn align-self-end">Next <i class="fa fa-chevron-right"/></button>
+ <t t-if="widget.slide.hasNext">
+ <button type="button" class="btn btn-light border o_wslides_quiz_btn align-self-end">Next <i class="fa fa-chevron-right"/></button>
+ </t>
+ <t t-else="">
+ <!-- TODO: end course if no slide left -->
+ <a type="button" class="btn btn-light border align-self-end">End course</a>
+ </t>
</div>
</div>
</div>