Browse Source

Fix selects inside inline forms see BT#15465

Julio 6 years ago
parent
commit
c16538f660
2 changed files with 5 additions and 9 deletions
  1. 4 8
      main/inc/lib/pear/HTML/QuickForm/select.php
  2. 1 1
      main/tracking/courseLog.php

+ 4 - 8
main/inc/lib/pear/HTML/QuickForm/select.php

@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Class to dynamically create an HTML SELECT
@@ -607,16 +606,13 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
         switch ($layout) {
             case FormValidator::LAYOUT_INLINE:
                 return '
-                <div class="input-group">
+                <div class="form-group {error_class}">
                     <label {label-for} >
                         <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                         {label}
-                    </label>     
-                </div>
-                <div class="input-group {error_class}">                               
-                    {element}                     
-                </div>
-                ';
+                    </label>                                          
+                    {element}   
+                </div>';
                 break;
             case FormValidator::LAYOUT_HORIZONTAL:
                 return '

+ 1 - 1
main/tracking/courseLog.php

@@ -445,7 +445,7 @@ if ($nbStudents > 0) {
         'since',
         Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
         $options,
-        ['class' => 'col-sm-3']
+        ['disable_js' => true]
     );
     $el->setSelected(7);