Dev: Fixed issue framework class for body

LimeSurvey · Dec 18, 2016 · 707a9f2 · 707a9f2
1 parent 40c7bb2
commit 707a9f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -35,6 +35,9 @@
             'css/bootstrap.css',/* Admin need it, not public */
             'css/yiistrap.css',
         ),
+        'js'=>array(
+            'js/bootstrap'.$minVersion.'.js'
+        ),
         'depends' => array(
             'jquery',
         )

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -195,16 +195,12 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     {
         $surveyformat = "";
     }
-    if( isset($oTemplate->config->engine->cssframework) && $oTemplate->config->engine->cssframework)
+    if( ! empty($oTemplate->cssFramework->name) )
     {
-        $aCssFramework = (array) $oTemplate->config->engine->cssframework;
-        if( ! empty($aCssFramework) )
-        {
-            $surveyformat .= " ".$oTemplate->config->engine->cssframework."-engine ";
-        }
-
+        $surveyformat .= " ".$oTemplate->cssFramework->name."-engine ";
     }
 
+
     if ((isset(Yii::app()->session['step']) && Yii::app()->session['step'] % 2) && $surveyformat!="allinone")
     {
         $surveyformat .= " page-odd";

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -146,6 +146,7 @@ public function setTemplateConfiguration($sTemplateName='', $iSurveyId='')
         $this->siteLogo                 = (isset($this->config->files->logo))                      ? $this->config->files->logo->filename                                                                                 : '';
         $this->filesPath                = (isset($this->config->engine->filesdirectory))           ? $this->path.DIRECTORY_SEPARATOR.$this->config->engine->filesdirectory.DIRECTORY_SEPARATOR                            : $this->path . '/files/';
         $this->cssFramework             = (isset($this->config->engine->cssframework))             ? $this->config->engine->cssframework                                                                                  : '';
+        $this->cssFramework->name       = (isset($this->config->engine->cssframework->name))       ? $this->config->engine->cssframework->name                                                                            : (string)$this->config->engine->cssframework;
         $this->packages                 = (isset($this->config->engine->packages))                 ? $this->config->engine->packages                                                                             : array();
 
         /* Add options/package according to apiVersion */