MDL-58138 completion: Fixes for a number of small issues.

course/lib.php

@@ -3867,11 +3867,14 @@ function course_get_user_navigation_options($context, $course = null) {
 function course_get_user_administration_options($course, $context) {
     global $CFG;
     $isfrontpage = $course->id == SITEID;
+    $completionenabled = $CFG->enablecompletion && $course->enablecompletion;
+    $hascompletiontabs = count(core_completion\manager::get_available_completion_tabs($course, $context)) > 0;
 
     $options = new stdClass;
     $options->update = has_capability('moodle/course:update', $context);
-    $options->editcompletion = $CFG->enablecompletion && $course->enablecompletion &&
-        ($options->update || count(core_completion\manager::get_available_completion_tabs($course, $context)) > 0);
+    $options->editcompletion = $CFG->enablecompletion &&
+                               $course->enablecompletion &&
+                               ($options->update || $hascompletiontabs);
     $options->filters = has_capability('moodle/filter:manage', $context) &&
                         count(filter_get_available_in_context($context)) > 0;
     $options->reports = has_capability('moodle/site:viewreports', $context);

course/moodleform_mod.php

@@ -1078,7 +1078,7 @@ abstract class moodleform_mod extends moodleform {
      *
      * @param stdClass $data passed by reference
      */
-    public function data_postprocessing(&$data) {
+    public function data_postprocessing($data) {
     }
 
     /**

course/templates/activityinstance.mustache

@@ -34,20 +34,20 @@
 }}
 {{#activities}}
 <div class="row m-b-1 row-fluid">
-    <div class="activityinstance col-sm-6 span6">
+    <div class="activityinstance col-xs-6 span6">
         <div class="mod-indent-outer"></div>
         <div>
-                {{#canmanage}}
-                <label class="accesshide" for="selectactivity_{{cmid}}">Select {{modname}}</label>
-                <input type="checkbox" id="selectactivity_{{cmid}}" class="m-r-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{modname}}{{/str}}">
-                {{/canmanage}}
-                <a href="{{url}}">
-                <img src="{{icon}}" class="iconlarge activityicon" alt=" " role="presentation" />
-                <span class="instancename">{{modname}}</span>
-                </a>
+            {{#canmanage}}
+            <label class="accesshide" for="selectactivity_{{cmid}}">{{#str}}select, completion{{/str}} {{modname}}</label>
+            <input type="checkbox" id="selectactivity_{{cmid}}" class="m-r-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{modname}}{{/str}}">
+            {{/canmanage}}
+            <a href="{{url}}">
+            <img src="{{icon}}" class="iconlarge activityicon" alt=" " role="presentation" />
+            <span class="instancename">{{modname}}</span>
+            </a>
         </div>
     </div>
-    <div class="activity-completionstatus col-sm-6 span6" id="completionstatus_{{cmid}}">
+    <div class="activity-completionstatus col-xs-6 span6" id="completionstatus_{{cmid}}">
         <div class="col-sm-1 span1  p-l-0">
             {{#completionstatus.icon}}
                 {{{completionstatus.icon}}}

course/templates/bulkactivitycompletion.mustache

@@ -48,27 +48,29 @@
             <input type="submit" value="{{#str}}edit{{/str}}" class="btn btn-primary" name="submitbutton" aria-label="{{#str}}updateactivities, completion{{/str}}" disabled/>
         </div>
     </div>
-    <div class="top-section row m-b-1">
-        <div class="col-sm-6 span6">
+    <div class="row m-b-1">
+        <div class="col-xs-6 span6">
             <input type="checkbox" class="mastercheck m-r-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-sm-6">
+        <div class="col-xs-6 span6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>
     </div>
+    <hr class="row">
     <div class="topics">
         {{#sections}}
-                <div class="topic-section m-b-1">
-                    <div class="row m-b-1">
+                <div class="m-b-1">
+                    <div class="row m-b-1 row-fluid">
                         <div class="col-sm-12">
                             <input type="checkbox" data-section-master="{{sectionnumber}}" class="m-r-1" aria-label="{{#str}}checkallsection, completion, {{name}}{{/str}}">
-                            <h3>{{name}}</h3>
+                            <h3 class="d-inline-block">{{name}}</h3>
                         </div>
                     </div>
                     {{> core_course/activityinstance}}
                 </div>
+                <hr class="row">
         {{/sections}}
     </div>
     <input type="hidden" name="id" value="{{courseid}}" />

course/templates/defaultactivitycompletion.mustache

@@ -45,28 +45,29 @@
             <input type="submit" value="{{#str}}edit{{/str}}" class="btn btn-primary" name="submitbutton" aria-label="{{#str}}updateactivities, completion{{/str}}" disabled/>
         </div>
     </div>
-    <div class="top-section row m-b-1">
-        <div class="col-sm-6">
+    <div class="row m-b-1">
+        <div class="col-xs-6 span6">
             <input type="checkbox" class="mastercheck m-r-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-sm-6">
+        <div class="col-xs-6 span6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>
     </div>
+    <hr class="row">
     <div class="modules">
         {{#modules}}
             {{#canmanage}}
-             <div class="module-section m-b-1">
+             <div class="m-b-1">
                 <div class="row m-b-1 row-fluid">
-                    <div class="col-sm-6 span6">
-                        <label class="accesshide" for="modtype_{{id}}">Select {{formattedname}}</label>
+                    <div class="col-xs-6 span6">
+                        <label class="accesshide" for="modtype_{{id}}">{{#str}}select, core_completion{{/str}} {{formattedname}}</label>
                         <input id="modtype_{{id}}" type="checkbox" class="m-r-1" name="modids[]" value="{{id}}" aria-label="{{#str}}checkactivity, completion, {{formattedname}}{{/str}}">
                         <img src="{{icon}}" alt=" " role="presentation" />
                         <span>{{formattedname}}</span>
                     </div>
-                    <div class="activity-completionstatus col-sm-6 span6">
+                    <div class="activity-completionstatus col-xs-6 span6">
                         <div class="col-sm-1 span1 p-l-0">
                             {{#completionstatus.icon}}
                                 {{{completionstatus.icon}}}
@@ -81,6 +82,7 @@
                     </div>
                 </div>
             </div>
+            <hr class="row">
             {{/canmanage}}
         {{/modules}}
     </div>
@@ -88,7 +90,7 @@
     <input type="hidden" name="sesskey" value="{{sesskey}}" />
     <div class="row">
         <div class="col">
-            <input type="submit" value="{{#str}}edit{{/str}}" class="btn btn-primary" name="submitbutton" />
+            <input type="submit" value="{{#str}}edit{{/str}}" class="btn btn-primary" name="submitbutton" disabled/>
         </div>
     </div>
 </form>