Merge branch 'MDL-59394-master-2' of git://github.com/ryanwyllie/moodle

diff --cc calendar/amd/build/calendar.min.js
index 2be6d36,5167149..9d29445
Binary files differ

diff --cc calendar/amd/src/calendar.js
Simple merge

diff --cc calendar/templates/month_detailed.mustache
index 4b782df,ec8cf9d..80005dc
--- 1/calendar/templates/month_detailed.mustache
--- 2/calendar/templates/month_detailed.mustache
+++ b/calendar/templates/month_detailed.mustache
@@@ -31,11 -31,10 +31,11 @@@
      {
      }
  }}
- <div id="month-detailed-{{uniqid}}" class="calendarwrapper" data-courseid="{{courseid}}" data-current-time="{{time}}">
+ <div class="calendarwrapper" data-courseid="{{courseid}}" data-current-time="{{time}}">
      {{> core_calendar/month_header }}
      {{> core_calendar/month_navigation }}
-     <table class="calendarmonth calendartable card-deck m-b-0">
 +    {{> core/overlay_loading}}
+     <table id="month-detailed-{{uniqid}}" class="calendarmonth calendartable card-deck m-b-0">
          <thead>
              <tr>
                  {{# daynames }}

diff --cc theme/bootstrapbase/less/moodle/calendar.less
Simple merge

diff --cc theme/bootstrapbase/less/moodle/core.less
index 69fef7b,7a4d53b..5457483
--- 1/theme/bootstrapbase/less/moodle/core.less
--- 2/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@@ -2386,24 -2386,6 +2386,28 @@@ h3.sectionname .inplaceeditable.inplace
      cursor: pointer;
  }
  
 +.overlay-icon-container {
 +    position: absolute;
 +    top: 0;
 +    left: 0;
 +    width: 100%;
 +    height: 100%;
 +    background-color: rgba(255, 255, 255, 0.6);
 +
 +    .loading-icon {
 +        position: absolute;
 +        top: 50%;
 +        left: 50%;
 +        transform: translate(-50%, -50%);
 +
 +        .icon {
 +            height: 40px;
 +            width: 40px;
 +
 +        }
 +    }
 +}
++
+ [data-drag-type="move"] {
+     cursor: move;
+ }

diff --cc theme/bootstrapbase/style/moodle.css
index 42d89c0,59154a6..65c23c7
--- 1/theme/bootstrapbase/style/moodle.css
--- 2/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@@ -4777,24 -4777,9 +4777,27 @@@ h3.sectionname .inplaceeditable.inplace
  .clickable {
    cursor: pointer;
  }
 +.overlay-icon-container {
 +  position: absolute;
 +  top: 0;
 +  left: 0;
 +  width: 100%;
 +  height: 100%;
 +  background-color: rgba(255, 255, 255, 0.6);
 +}
 +.overlay-icon-container .loading-icon {
 +  position: absolute;
 +  top: 50%;
 +  left: 50%;
 +  transform: translate(-50%, -50%);
 +}
 +.overlay-icon-container .loading-icon .icon {
 +  height: 40px;
 +  width: 40px;
 +}
+ [data-drag-type="move"] {
+   cursor: move;
+ }
  /* admin.less */
  .formtable tbody th {
    font-weight: normal;