Dev: frontend, various fixes

LimeSurvey · Feb 23, 2016 · bfaf274 · bfaf274
1 parent e5057dd
commit bfaf274
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -80,7 +80,7 @@
 $config['deleteblacklisted']     =  'N';            // Delete globally blacklisted participant from the database
 $config['allowunblacklist']     =  'N';             // Allow participant to unblacklist himself/herself
 $config['userideditable']     =  'N';               // Allow editing of user IDs
-$config['defaulttemplate']    =  'ubuntu_orange';         // This setting specifys the default theme used for the 'public list' of surveys
+$config['defaulttemplate']    =  'default';         // This setting specifys the default theme used for the 'public list' of surveys
 
 $config['allowedtemplateuploads'] = 'gif,ico,jpg,png,css,js,map,json,eot,svg,ttf,woff,txt,md';  // File types allowed to be uploaded in the templates section.
 

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -620,7 +620,7 @@ function return_timer_script($aQuestionAttributes, $ia, $disable=null)
             $iAction = '3';
         }
 
-        $output .=  Yii::app()->getController()->renderPartial('/survey/question_timer/timer_javascript', array('iAction'=>$iAction, 'disable_next'=>$disable_next, 'disable_prev'=>$disable_prev ), true);
+        $output .=  Yii::app()->getController()->renderPartial('/survey/question_timer/timer_javascript', array('iAction'=>$iAction, 'disable_next'=>$disable_next, 'disable_prev'=>$disable_prev, 'time_limit_countdown_message' =>$time_limit_countdown_message ), true);
 
     }
 
@@ -1302,7 +1302,8 @@ function do_list_dropdown($ia)
     $selectData = array(
         'name'=>$ia[1],
         'dropdownSize'=>$dropdownSize,
-        'checkconditionFunction'=>$checkconditionFunction
+        'checkconditionFunction'=>$checkconditionFunction,
+        'value'=>'',
     );
 
     if (isset($other) && $other=='Y')
@@ -3202,7 +3203,7 @@ function do_multiplenumeric($ia)
                 $dispVal = str_replace('.',$sSeparator,$dispVal);
             }
 
-            if($slider_middlestart!='')
+            if( isset($slider_middlestart) && $slider_middlestart!='')
             {
                 $slider_default = $slider_middlestart;
             }

diff --git a/application/views/survey/questions/multipleshorttext/item_textarea.php b/application/views/survey/questions/multipleshorttext/item_textarea.php
@@ -35,5 +35,6 @@ class="form-control  textarea <?php echo $kpclass;?>"
 <?php echo $dispVal;?>
 </textarea>
             <?php echo $suffix;?>
+        </div>
     </div>
 </div>