From 1568bef6f7bc5c5811e3a906adc0500a491b35c5 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Mon, 28 Sep 2015 15:31:43 +0200
Subject: [PATCH] Dev: Apply Boostrap style to General Option in New question

---
 .../survey/Question/newQuestion_view.php      | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/application/views/admin/survey/Question/newQuestion_view.php b/application/views/admin/survey/Question/newQuestion_view.php
index 8eaabdf8f18..271c1efc66f 100644
--- a/application/views/admin/survey/Question/newQuestion_view.php
+++ b/application/views/admin/survey/Question/newQuestion_view.php
@@ -46,10 +46,7 @@
                                 <div class="panel-body">
                                     <div>
                                         <div  class="form-group">
-                                            <label for='question_type_button'>
-                                                <?php eT("Question Type:"); ?>
-                                            </label>
-                                            <br/>
+                                            <label class="col-sm-4 control-label" for='question_type_button'><?php eT("Question Type:"); ?></label>
                                             <?php if($selectormodeclass!="none"): ?>
                                                 <?php
                                                     foreach (getQuestionTypeList($eqrow['type'], 'array') as $key=> $questionType)
@@ -64,7 +61,7 @@
                                                 
                                                 <input type="hidden" id="question_type" name="type" value="<?php echo $eqrow['type']; ?>" />
                                                 
-                                                <div class="btn-group" id="question_type_button" style="z-index: 1000">
+                                                <div class="col-sm-8 btn-group" id="question_type_button" style="z-index: 1000">
                                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="z-index: 1000">
                                                         <?php foreach($groups as $name => $group):?>
                                                             <?php foreach($group as $type => $option):?>
@@ -112,31 +109,41 @@
                                         </div>
                                         
                                         <div  class="form-group">
-                                            <label for='gid'><?php eT("Question group:"); ?></label>
-                                            <select name='gid' id='gid' class="form-control">
-                                                <?php echo getGroupList3($eqrow['gid'],$surveyid); ?>
-                                            </select>
+                                            <label class="col-sm-4 control-label" for='gid'><?php eT("Question group:"); ?></label>
+                                            <div class="col-sm-8">
+                                                <select name='gid' id='gid' class="form-control">
+                                                    <?php echo getGroupList3($eqrow['gid'],$surveyid); ?>
+                                                </select>
+                                            </div>
                                         </div>
                                                     
                                         <div  class="form-group" id="OtherSelection">
-                                            <label><?php eT("Option 'Other':"); ?></label>
-                                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'optionother'));?>
+                                            <label class="col-sm-4 control-label"><?php eT("Option 'Other':"); ?></label>
+                                            <div class="col-sm-8">
+                                                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'optionother'));?>
+                                            </div>
                                         </div>
                                 
                                         <div id='MandatorySelection'  class="form-group">
-                                            <label><?php eT("Mandatory:"); ?></label>
+                                            <label class="col-sm-4 control-label"><?php eT("Mandatory:"); ?></label>
                                             <!--  'value'=>($eqrow['mandatory'] == "Y") -->
-                                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'mandatory', 'value'=> '0'  ));?>                                            
+                                            <div class="col-sm-8">
+                                                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'mandatory', 'value'=> '0'  ));?>
+                                            </div>
                                         </div>
                                         
                                         <div  class="form-group">
-                                            <label for='relevance'><?php eT("Relevance equation:"); ?></label>
-                                            <textarea cols='1' class="form-control" rows='1' id='relevance' name='relevance' ></textarea>
+                                            <label class="col-sm-4 control-label" for='relevance'><?php eT("Relevance equation:"); ?></label>
+                                            <div class="col-sm-8">
+                                                <textarea cols='1' class="form-control" rows='1' id='relevance' name='relevance' ></textarea>
+                                            </div>
                                         </div>
                                         
                                         <div id='Validation'  class="form-group">
-                                            <label for='preg'><?php eT("Validation:"); ?></label>
-                                            <input type='text' id='preg' name='preg' size='50' value="<?php echo $eqrow['preg']; ?>" />
+                                            <label class="col-sm-4 control-label" for='preg'><?php eT("Validation:"); ?></label>
+                                            <div class="col-sm-8">
+                                                <input type='text' id='preg' name='preg' size='50' value="<?php echo $eqrow['preg']; ?>" />
+                                            </div>
                                         </div>
                                     </div>     
                                 </div>