Fixed issue #10735: wider drop down menues in survey options

LimeSurvey · Mar 11, 2016 · 5d1b123 · 5d1b123
1 parent 4da239a
commit 5d1b123
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
@@ -149,15 +149,15 @@
     <!-- Date format -->
     <div class="form-group">
         <label class="col-sm-3 control-label" for='dateformat'><?php  eT("Date format:") ; ?></label>
-        <div class="col-sm-3">
+        <div class="col-sm-9">
             <?php echo CHtml::listBox('dateformat',$sDateFormatDefault, $aDateFormatData, array('id'=>'dateformat','size'=>'1', 'class'=>'form-control')); ?>
         </div>
     </div>
 
     <!-- Decimal mark -->
     <div class="form-group">
         <label class="col-sm-3 control-label" for='numberformat'><?php  eT("Decimal mark:"); ?></label>
-        <div class="col-sm-3">
+        <div class="col-sm-9">
             <?php echo CHtml::listBox('numberformat',$sRadixDefault, $aRadixPointData, array('id'=>'numberformat','size'=>'1', 'class'=>'form-control')); ?>
         </div>
     </div>

diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -31,7 +31,7 @@
     <div class="form-group">
         <label class="col-sm-6 control-label" for='startdate'><?php  eT("Start date/time:"); ?></label>
         <div class="col-sm-6">
-            <input type='text' class='form-control popupdatetime' id='startdate' size='20' name='startdate' value="<?php echo $startdate; ?>"  />
+            <input type='text' class='popupdatetime' id='startdate' size='20' name='startdate' value="<?php echo $startdate; ?>"  />
         </div>
     </div>
 

diff --git a/styles/Sea_Green/scripts/sidemenu.js b/styles/Sea_Green/scripts/sidemenu.js
@@ -359,7 +359,8 @@ $(document).ready(function(){
               windowswidth = window.innerWidth;
               sideBodyWidth = sideBody.width();
               //console.log('sideBodyWidth after: '+sideBodyWidth);
-              if( sideBodyWidth < 1520 )
+
+              if( sideBodyWidth < 1420 )
               {
                   if(accordionContainer.hasClass('col-md-6'))
                   {
@@ -370,7 +371,7 @@ $(document).ready(function(){
               {
                  if(accordionContainer.hasClass('col-md-12'))
                  {
-                    $('#accordion-container').removeClass('col-md-12').addClass('col-md-6'); 
+                    $('#accordion-container').removeClass('col-md-12').addClass('col-md-6');
                  }
               }
           });