wait #6343

diff --git a/js/quiz.screens.js b/js/quiz.screens.js
index dc5a45267167debb896af99120912818a2abe2f3..496449001896b7ce75ccd4cb2e873e6d210e28e1 100644 (file)
--- 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 af64c6eed3d0a7043bfa5256e533aeb447556280..7197c78d5799a91583088ce307525fbe74cbe6c3 100644 (file)
--- 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 0d28233b062e8f9d3d599b5d03ab3bcd5e06187e..a5bed57049fceabc79c7135b681590a564e719ab 100644 (file)
--- 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 4f085e302d820dda123d0d087164f7d0d526b274..c2144730a7129d800d88de959a0f640bbd6417a5 100644 (file)
--- 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 231272f6510ad508a11e1d63ae4e34c27e2ef762..8243185faaad7518016450a47a5dfd21e5154e34 100644 (file)
--- 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 b04a69efdbd5f041862c83f39e0db1dd47125de0..9f72d1ff7ee3259a8086e907c61b17babe3eaeba 100644 (file)
--- 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 898baa732d4102da2b0c1eed5e1b72d0b86e649a..85c0c6cbe8c71477b4fa44b6c43784a010f2cf57 100644 (file)
--- 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>