Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Mar 22, 2016 · e1b9160 · e1b9160
2 parents 66300bb + df56734
commit e1b9160
Show file tree

Hide file tree

Showing 22 changed files with 298 additions and 285 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2781,10 +2781,11 @@ function questionAttributes($returnByName=false)
         "types"=>"LM",
         'category'=>gT('Display'),
         'sortorder'=>100,
-        'inputtype'=>'integer',
-        'default'=>'1',
+        //'inputtype'=>'integer',
+        'inputtype'=>'columns',
+        'default'=>'6',
         'min'=>'1',
-        'max'=>'100',
+        'max'=>'12',
         "help"=>gT('The answer options will be distributed across the number of columns set here'),
         "caption"=>gT('Display columns'));
 
@@ -3582,9 +3583,13 @@ function questionAttributes($returnByName=false)
         "types"=>"KNSTUQ;",
         'category'=>gT('Display'),
         'sortorder'=>100,
-        'inputtype'=>'text',
-        "help"=>gT('Width of text input box'),
-        "caption"=>gT('Input box width'));
+        //'inputtype'=>'text',
+        'inputtype'=>'columns',
+        'default'=>'6',
+        'min'=>'1',
+        'max'=>'12',
+        "help"=>gT('Number of Bootstrap columns for the input box'),
+        "caption"=>gT('Input box columns'));
 
         $qattributes["text_input_columns"]=array(
         "types"=>"Q",