MDL-64506 grades: Fix regression of MDL-58428

ragusa87 · Apr 3, 2019 · b64bf2d · b64bf2d
1 parent a5a6df5
commit b64bf2d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 121 deletions.
diff --git a/grade/templates/edit_tree.mustache b/grade/templates/edit_tree.mustache
@@ -27,19 +27,17 @@
         {{{table}}}
         <div id="gradetreesubmit">
             {{#showsave}}
-                <input class="advanced" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
+                <input class="advanced btn btn-primary" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
             {{/showsave}}
             {{#showbulkmove}}
-                <br><br>
-                <input type="hidden" name="bulkmove" value="0" id="bulkmoveinput">
-                <label for="menumoveafter">{{#str}}moveselectedto, grades{{/str}}</label>
-                <select name="moveafter" id="menumoveafter" class="ignoredirty singleselect select">
-                    {{#bulkmoveoptions}}
-                        <option value="{{value}}">{{name}}</option>
-                    {{/bulkmoveoptions}}
-                </select>
-                <div id="noscriptgradetreeform" class="hiddenifjs">
-                    <input type="submit" name={{#quote}}{{#str}}go{{/str}}{{/quote}}>
+                <div class="form-inline mt-3">
+                    <input type="hidden" name="bulkmove" value="0" id="bulkmoveinput">
+                    <label for="menumoveafter">{{#str}}moveselectedto, grades{{/str}}</label>
+                    <select name="moveafter" id="menumoveafter" class="ignoredirty singleselect select form-control">
+                        {{#bulkmoveoptions}}
+                            <option value="{{value}}">{{name}}</option>
+                        {{/bulkmoveoptions}}
+                    </select>
                 </div>
             {{/showbulkmove}}
         </div>

diff --git a/grade/templates/weight_field.mustache b/grade/templates/weight_field.mustache
@@ -20,4 +20,4 @@
 <label class="accesshide" for="weight_{{id}}">
     {{#str}}extracreditvalue, grades, {{itemname}}{{/str}}
 </label>
-<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="6">
+<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" class="form-control">
diff --git a/grade/templates/weight_override_field.mustache b/grade/templates/weight_override_field.mustache
@@ -15,15 +15,17 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Weight override field.
+    Weight field.
 }}
-<label class="accesshide" for="weightoverride_{{id}}">
-    {{#str}}overrideweightofa, grades, {{itemname}}{{/str}}
-</label>
-<input type="hidden" name="weightoverride_{{id}}" value="0">
-<input type="checkbox" name="weightoverride_{{id}}" id="weightoverride_{{id}}" value="1" class="weightoverride" {{#checked}}checked{{/checked}}>
+<div class="form-inline">
+    <label class="accesshide" for="weightoverride_{{id}}">
+        {{#str}}overrideweightofa, grades, {{itemname}}{{/str}}
+    </label>
+    <input type="hidden" name="weightoverride_{{id}}" value="0">
+    <input type="checkbox" name="weightoverride_{{id}}" id="weightoverride_{{id}}" value="1" class="weightoverride" {{#checked}}checked{{/checked}}>
 
-<label class="accesshide" for="weight_{{id}}">
-    {{#str}}weightofa, grades, {{itemname}}{{/str}}
-</label>
-<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="6" {{#disabled}}disabled{{/disabled}}>
+    <label class="accesshide" for="weight_{{id}}">
+        {{#str}}weightofa, grades, {{itemname}}{{/str}}
+    </label>
+    <input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" {{#disabled}}disabled{{/disabled}} class="form-control">
+</div>
diff --git a/grades/templates/edit_tree.mustache b/grades/templates/edit_tree.mustache
diff --git a/grades/templates/weight_field.mustache b/grades/templates/weight_field.mustache
diff --git a/grades/templates/weight_override_field.mustache b/grades/templates/weight_override_field.mustache