Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 16 Oct 2017 04:28:59 +0000 (12:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 16 Oct 2017 04:28:59 +0000 (12:28 +0800)
1  2 
calendar/templates/month_detailed.mustache
theme/bootstrapbase/style/moodle.css

                                                  {{#canedit}}
                                                      draggable="true"
                                                      data-drag-type="move"
+                                                     {{#mindaytimestamp}}
+                                                         data-min-day-timestamp="{{.}}"
+                                                     {{/mindaytimestamp}}
+                                                     {{#mindayerror}}
+                                                         data-min-day-error="{{.}}"
+                                                     {{/mindayerror}}
+                                                     {{#maxdaytimestamp}}
+                                                         data-max-day-timestamp="{{.}}"
+                                                     {{/maxdaytimestamp}}
+                                                     {{#maxdayerror}}
+                                                         data-max-day-error="{{.}}"
+                                                     {{/maxdayerror}}
                                                  {{/canedit}}>
  
 -                                                <a data-action="view-event" data-event-id="{{id}}" href="{{url}}">{{name}}</a>
 +                                                <a data-action="view-event" data-event-id="{{id}}" href="{{url}}" title="{{name}}">
 +                                                    <span class="badge badge-circle calendar_event_{{calendareventtype}}">
 +                                                        &nbsp;
 +                                                    </span>
 +                                                    {{> core_calendar/event_icon}}
 +                                                    {{name}}
 +                                                </a>
                                              </li>
                                          {{/underway}}
                                          {{/events}}
Simple merge