Dev: switch not active in question edit

Dev: bootstrap.js not loaded for public template
LimeSurvey · Dec 28, 2016 · 6031f90 · 6031f90
1 parent 505d05f
commit 6031f90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -51,7 +51,7 @@ public function run()
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."survey_runtime.js");
 
 
-        if($oTemplate->cssFramework == 'bootstrap')
+        if($oTemplate->cssFramework->name == 'bootstrap')
         {
             // We now use the bootstrap package isntead of the Yiistrap TbApi::register() method
             // Then instead of using the composer dependency system for templates

diff --git a/application/views/admin/survey/Question/advanced_settings_view.php b/application/views/admin/survey/Question/advanced_settings_view.php
@@ -154,10 +154,11 @@
 <?php endforeach;?>
  </div></div></div></div>
 <?php
-//~ foreach (Yii::app()->clientScript->scripts as $index=>$script)
-//~ {
-    //~ echo CHtml::script(implode("\n",$script));
-//~ }
-//~ Yii::app()->clientScript->reset();
+/* Launch all needed script (here after load) needed for widget */
+foreach (Yii::app()->clientScript->scripts as $index=>$script)
+{
+    echo CHtml::script(implode("\n",$script));
+}
+Yii::app()->clientScript->reset();
 ?>
 <!-- end of Advanced Settings -->
diff --git a/application/views/layouts/public.php b/application/views/layouts/public.php
@@ -31,7 +31,7 @@
 <?php
     $oTemplate = Template::model()->getInstance($this->sTemplate);
     Yii::app()->clientScript->registerPackage('survey-template');
-    if($oTemplate->cssFramework == 'bootstrap')
+    if($oTemplate->cssFramework->name == 'bootstrap')
     {
         /* Why not add it for whole framework ? */
         Yii::app()->getClientScript()->registerMetaTag('width=device-width, initial-scale=1.0', 'viewport');