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

lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js

@@ -71,7 +71,7 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
          */
         store_initial_value: function(e) {
             var thisevent;
-            if (e.target.hasClass('ignoredirty')) {
+            if (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty')) {
                 // Don't warn on elements with the ignoredirty class
                 return;
             }
@@ -120,7 +120,7 @@ M.core_formchangechecker.stateinformation = [];
  * Set the form changed state to true
  */
 M.core_formchangechecker.set_form_changed = function(e) {
-    if (e && e.target && e.target.hasClass('ignoredirty')) {
+    if (e && e.target && (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty'))) {
         // Don't warn on elements with the ignoredirty class
         return;
     }

lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js

@@ -71,7 +71,7 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
          */
         store_initial_value: function(e) {
             var thisevent;
-            if (e.target.hasClass('ignoredirty')) {
+            if (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty')) {
                 // Don't warn on elements with the ignoredirty class
                 return;
             }
@@ -120,7 +120,7 @@ M.core_formchangechecker.stateinformation = [];
  * Set the form changed state to true
  */
 M.core_formchangechecker.set_form_changed = function(e) {
-    if (e && e.target && e.target.hasClass('ignoredirty')) {
+    if (e && e.target && (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty'))) {
         // Don't warn on elements with the ignoredirty class
         return;
     }

lib/yui/src/formchangechecker/js/formchangechecker.js

@@ -69,7 +69,7 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
          */
         store_initial_value: function(e) {
             var thisevent;
-            if (e.target.hasClass('ignoredirty')) {
+            if (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty')) {
                 // Don't warn on elements with the ignoredirty class
                 return;
             }
@@ -118,7 +118,7 @@ M.core_formchangechecker.stateinformation = [];
  * Set the form changed state to true
  */
 M.core_formchangechecker.set_form_changed = function(e) {
-    if (e && e.target && e.target.hasClass('ignoredirty')) {
+    if (e && e.target && (e.target.hasClass('ignoredirty') || e.target.ancestor('.ignoredirty'))) {
         // Don't warn on elements with the ignoredirty class
         return;
     }

mod/assign/styles.css

@@ -43,7 +43,7 @@
     font-weight: 900;
 }
 
-.path-mod-assign.jsenabled .gradingoptionsform .fsubmit {
+.path-mod-assign.jsenabled .gradingoptionsform [type=submit] {
     display: none;
 }
 

theme/boost/templates/core_form/element-advcheckbox-inline.mustache

@@ -1,4 +1,4 @@
-<label class="form-check-inline {{#error}}has-danger{{/error}}">
+<label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
 {{^element.hardfrozen}}
     {{^element.frozen}}
         <input type="hidden" name="{{element.name}}" value="{{element.deselectedvalue}}">

theme/boost/templates/core_form/element-advcheckbox.mustache

@@ -1,4 +1,4 @@
-<div class="form-group row {{#error}}has-danger{{/error}}">
+<div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
     <div class="col-md-9 push-md-3 checkbox">
         <label>
         {{^element.hardfrozen}}

theme/boost/templates/core_form/element-checkbox-inline.mustache

@@ -1,8 +1,5 @@
-<label class="form-check-inline {{#error}}has-danger{{/error}}">
+<label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
 {{^element.hardfrozen}}
-    {{^element.frozen}}
-        <input type="hidden" name="{{element.name}}" value="">
-    {{/element.frozen}}
     {{#element.frozen}}
         <input type="hidden" name="{{element.name}}" value="{{element.frozenvalue}}">
     {{/element.frozen}}

theme/boost/templates/core_form/element-checkbox.mustache

@@ -1,10 +1,7 @@
-<div class="form-group row {{#error}}has-danger{{/error}}">
+<div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
     <div class="col-md-9 push-md-3 checkbox">
         <label>
         {{^element.hardfrozen}}
-            {{^element.frozen}}
-                <input type="hidden" name="{{element.name}}" value="">
-            {{/element.frozen}}
             {{#element.frozen}}
                 <input type="hidden" name="{{element.name}}" value="{{element.frozenvalue}}">
             {{/element.frozen}}

theme/boost/templates/core_form/element-radio-inline.mustache

@@ -11,7 +11,7 @@
    }
 
 }}
-<label class="form-check-inline {{#error}}has-danger{{/error}}">
+<label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
 {{^element.frozen}}
 <input type="radio" name="{{element.name}}"
     id="{{element.id}}" value="{{element.value}}" size="{{element.size}}"

theme/boost/templates/core_form/element-radio.mustache

@@ -11,7 +11,7 @@
     }
 
 }}
-<div class="form-group row {{#error}}has-danger{{/error}}">
+<div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
     <div class="col-md-9 push-md-3 checkbox">
         <label>
         {{^element.frozen}}