Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle

Conflicts:
	backup/util/ui/base_moodleform.class.php

backup/util/ui/base_moodleform.class.php

@@ -73,11 +73,14 @@ abstract class base_moodleform extends moodleform {
      */
     function __construct(base_ui_stage $uistage, $action=null, $customdata=null, $method='post', $target='', $attributes=null, $editable=true) {
         $this->uistage = $uistage;
-        $attributes = (array)$attributes;
+        // Add a class to the attributes to prevent the default collapsible behaviour.
+        if (!$attributes) {
+            $attributes = array();
+        }
+        $attributes['class'] = 'unresponsive';
         if (!isset($attributes['enctype'])) {
             $attributes['enctype'] = 'application/x-www-form-urlencoded'; // Enforce compatibility with our max_input_vars hack.
         }
-
         parent::__construct($action, $customdata, $method, $target, $attributes, $editable);
     }
     /**

theme/base/style/core.css

@@ -331,31 +331,31 @@ input#id_externalurl {direction:ltr;}
 /**
  * Show the labels above text editors and file managers except on wide screens.
  */
-#region-main .mform .fitem .fitemtitle label {
+#region-main .mform:not(.unresponsive) .fitem .fitemtitle label {
     font-weight: bold;
 }
 @media (max-width: 1199px) {
-    #region-main .mform .fitem .fitemtitle {
+    #region-main .mform:not(.unresponsive) .fitem .fitemtitle {
         display: block;
         margin-top: 4px;
         margin-bottom: 4px;
         text-align: left;
         width: 100%;
     }
-    #region-main .mform .femptylabel .fitemtitle {
+    #region-main .mform:not(.unresponsive) .femptylabel .fitemtitle {
         display: inline-block;
         width: auto;
         margin-right: 8px;
     }
-    .dir-rtl #region-main .mform .femptylabel .fitemtitle {
+    .dir-rtl #region-main .mform:not(.unresponsive) .femptylabel .fitemtitle {
         margin-right: 0px;
         margin-left: 8px;
     }
-    .dir-rtl #region-main .mform .fitem .fitemtitle {
+    .dir-rtl #region-main .mform:not(.unresponsive) .fitem .fitemtitle {
         text-align: right;
     }
 
-    #region-main .mform .fitem .felement {
+    #region-main .mform:not(.unresponsive) .fitem .felement {
         margin-left: 0;
         width: 100%;
         float: left;
@@ -363,29 +363,29 @@ input#id_externalurl {direction:ltr;}
         padding-left: 0;
         padding-right: 0;
     }
-    #region-main .mform .fitem .fstatic:empty {
+    #region-main .mform:not(.unresponsive) .fitem .fstatic:empty {
         display: none;
     }
-    #region-main .mform .femptylabel .felement {
+    #region-main .mform:not(.unresponsive) .femptylabel .felement {
         display: inline-block;
         margin-top: 4px;
         width: auto;
     }
-    .dir-rtl #region-main .mform .fitem .felement {
+    .dir-rtl #region-main .mform:not(.unresponsive) .fitem .felement {
         margin-right: 0;
         float: right;
         padding-right: 0;
         padding-left: 0;
     }
-    #region-main .mform .fitem_fcheckbox .fitemtitle,
-    #region-main .mform .fitem_fcheckbox .felement {
+    #region-main .mform:not(.unresponsive) .fitem_fcheckbox .fitemtitle,
+    #region-main .mform:not(.unresponsive) .fitem_fcheckbox .felement {
         display: inline-block;
         width: auto;
     }
-    .dir-rtl #region-main .mform .fitem_fcheckbox .felement {
+    .dir-rtl #region-main .mform:not(.unresponsive) .fitem_fcheckbox .felement {
         float: right;
     }
-    #region-main .mform .fitem_fcheckbox .felement {
+    #region-main .mform:not(.unresponsive) .fitem_fcheckbox .felement {
         padding: 6px;
     }
 }

theme/bootstrapbase/less/moodle/forms.less

@@ -386,11 +386,11 @@ fieldset.coursesearchbox label {
 /**
  * Show the labels above text editors and file managers except on wide screens.
  */
-#region-main .mform .fitem .fitemtitle label {
+#region-main .mform:not(.unresponsive) .fitem .fitemtitle label {
     font-weight: bold;
 }
 @media (max-width: 1199px) {
-    #region-main .mform {
+    #region-main .mform:not(.unresponsive) {
         .fitem {
             .fitemtitle {
                 display: block;
@@ -434,7 +434,7 @@ fieldset.coursesearchbox label {
             }
         }
     }
-    .dir-rtl #region-main .mform {
+    .dir-rtl #region-main .mform:not(.unresponsive) {
         .femptylabel .fitemtitle {
             margin-right: 0px;
             margin-left: 8px;