From: soufiane <soufiane@cubedesigners.com>
Date: Wed, 4 Oct 2023 09:14:12 +0000 (+0200)
Subject: wait #6343
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=46c5a5c67cb71cc2803cdfcb5d73f9eb6307a9fd;p=fluidbook-toolbox-quiz.git

wait #6343
---

diff --git a/js/quiz.screens.js b/js/quiz.screens.js
index dc5a452..4964490 100644
--- a/js/quiz.screens.js
+++ b/js/quiz.screens.js
@@ -55,10 +55,6 @@ QuizScreens.prototype = {
                 $this.nextQuestion();
             }
         });
-
-        if(parseInt($this.quiz.question.current().countdown_enable)) {
-            $(".centerBtn").addClass("countdown")
-        }
     },
 
     instantReview: function (review) {
diff --git a/style/101-header-footer.sass b/style/101-header-footer.sass
index af64c6e..7197c78 100644
--- a/style/101-header-footer.sass
+++ b/style/101-header-footer.sass
@@ -53,7 +53,7 @@ header
     +flex-config(space-between,false,row,center)
     .btn.primary
         width: 100%
-        max-width: 400px
+        max-width: 450px
         position: absolute
         left: 50%
         bottom: 24px
diff --git a/views/footer.blade.php b/views/footer.blade.php
index 0d28233..a5bed57 100644
--- a/views/footer.blade.php
+++ b/views/footer.blade.php
@@ -5,7 +5,7 @@
             <span class="access">R</span>
         </a>
     @endisset
-    <a class="btn primary {{ isset($matchMaking) ? "confirmMatch" : "action validate" }} centerBtn"
+    <a class="btn primary {{ isset($matchMaking) ? "confirmMatch" : "action validate" }} {{ $countdown ? ' countdown' : ''  }}"
        aria-keyshortcuts="Space">
         <span class="text">
             @if(isset($matchMaking))
diff --git a/views/index.blade.php b/views/index.blade.php
index 4f085e3..c214473 100644
--- a/views/index.blade.php
+++ b/views/index.blade.php
@@ -20,7 +20,8 @@
         @include('components.background',['data'=>$data,'name'=>'mainBackground'])
         @include('screens.intro', ['data'=> $data])
         @foreach($data->questions as $key => $question)
-            @include('screens.question_'.$question['type'], ['theme' => $data->theme,'data'=> $data, 'question' => $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet])
+            @php($coundown_enabled = $question["countdown_enable"])
+            @include('screens.question_'.$question['type'], ['theme' => $data->theme,'data'=> $data, 'question' => $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet, 'countdown' => $coundown_enabled])
         @endforeach
         @include('screens.outro', ['data'=> $data])
         <div id="instantReviewAnimation"></div>
diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index 231272f..8243185 100644
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -17,5 +17,5 @@
         </div>
     </div>
     @include('screens.question_draganddrop_area',['area'=>2,'question'=>$question,'theme'=>$theme])
-    @include('footer', ['question' => $question,'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => true])
+    @include('footer', ['countdown' => $countdown,'question' => $question,'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => true])
 </div>
diff --git a/views/screens/question_match.blade.php b/views/screens/question_match.blade.php
index b04a69e..9f72d1f 100644
--- a/views/screens/question_match.blade.php
+++ b/views/screens/question_match.blade.php
@@ -45,5 +45,5 @@
         <img src="{{$theme->standardImage}}"/>
         <img class="mobile question-multiple" src="{{$theme->standardImageMobile}}"/>
     </div>
-    @include('footer', ['question' => $question, 'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => true, 'matchMaking' => true])
+    @include('footer', ['countdown' => $countdown,'question' => $question, 'data' => $data, 'reset' => true, 'text' => $__('Validate answer'), 'info' => true, 'matchMaking' => true])
 </div>
diff --git a/views/screens/question_multiple.blade.php b/views/screens/question_multiple.blade.php
index 898baa7..85c0c6c 100644
--- a/views/screens/question_multiple.blade.php
+++ b/views/screens/question_multiple.blade.php
@@ -24,5 +24,5 @@
         <img src="{{$theme->standardImage}}"/>
         <img class="mobile question-multiple" src="{{$theme->standardImageMobile}}"/>
     </div>
-    @include('footer', ['question' => $question, 'data' => $data, 'reset' => true, 'info' => true])
+    @include('footer', ['countdown' => $countdown,'question' => $question, 'data' => $data, 'reset' => true, 'info' => true])
 </div>