Dev: moved welcome classes and id definition to surveyRuntime

LimeSurvey · Aug 18, 2017 · 7491ac7 · 7491ac7
1 parent 2f94e9c
commit 7491ac7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1734,8 +1734,21 @@ private function setGroup()
 
     private function setClassAndIds()
     {
+
+        // Welcome
+        $thissurvey['id']['welcomecontainer']     =  'welcome-container';
+        $thissurvey['class']['welcomecontainer']  = '';
+        $thissurvey['class']['surveyname']        = "survey-name text-center";
+        $thissurvey['class']['description']       = "text-info text-center survey-description";
+        $thissurvey['class']['welcome']           = "survey-welcome h4 text-primary";
+        $thissurvey['class']['questioncount']     = "number-of-questions text-muted";
+        $thissurvey['class']['questioncounttext'] = "question-count-text";
+
+        // Warnings
         $this->aSurveyInfo['class']['activealert'] = ' alert alert-warning alert-dismissible fade in alert-dismissible ';
         $this->aSurveyInfo['class']['errorHtml']   = ' fade in alert-dismissible ls-questions-have-errors alert alert-danger ';
+
+
     }
 
     private function fixMaxStep()

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -2093,18 +2093,6 @@ function display_first_page($thissurvey, $aSurveyInfo)
     LimeExpressionManager::FinishProcessingPage();
 
     $thissurvey['surveyUrl'] = Yii::app()->getController()->createUrl("survey/index",array("sid"=>$surveyid)); // For form action (will remove newtest)
-
-
-    // Id Class and other attributes for views
-    $thissurvey['id']['welcomecontainer'] =  'welcome-container';
-
-    $thissurvey['class']['welcomecontainer']  = '';
-    $thissurvey['class']['surveyname']        = "survey-name text-center";
-    $thissurvey['class']['description']       = "text-info text-center survey-description";
-    $thissurvey['class']['welcome']           = "survey-welcome h4 text-primary";
-    $thissurvey['class']['questioncount']     = "number-of-questions text-muted";
-    $thissurvey['class']['questioncounttext'] = "question-count-text";
-
     $thissurvey['attr']['welcomecontainer'] = $thissurvey['attr']['surveyname'] = $thissurvey['attr']['description'] = $thissurvey['attr']['welcome'] = $thissurvey['attr']['questioncount'] =  '';