diff --git a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-debug.js b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-debug.js
index 33b011c7c4b..217fc4a5c7a 100644
--- a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-debug.js
+++ b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-debug.js
@@ -69,7 +69,8 @@ M.form.dateselector = {
         this.panel = new Y.Overlay({
             visible: false,
             bodyContent: Y.Node.create('<div id="dateselector-calendar-content"></div>'),
-            id: 'dateselector-calendar-panel'
+            id: 'dateselector-calendar-panel',
+            constrain: true // constrain panel to viewport.
         });
         this.panel.render(document.body);
         // zIndex is added by panel.render() and is set to 0.
@@ -131,7 +132,6 @@ M.form.dateselector = {
                 ];
             }
 
-
             this.panel.set('align', {
                 node: this.currentowner.get('node').one('select'),
                 points: alignpoints
diff --git a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-min.js b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-min.js
index 2b4e22a7a69..ca09d67e070 100644
--- a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-min.js
+++ b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-form-dateselector",function(e,t){e.mix(e.Node.prototype,{firstOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.one("option").get("value")},lastOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.all("option").item(this.optionSize()-1).get("value")},optionSize:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:parseInt(this.all("option").size(),10)},selectedOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.all("option").item(this.get("selectedIndex")).get("value")}}),M.form=M.form||{},M.form.dateselector={panel:null,calendar:null,currentowner:null,hidetimeout:null,repositiontimeout:null,init_date_selectors:function(t){this.panel===null&&this.initPanel(t),e.all(".fdate_time_selector").each(function(){t.node=this,new r(t)}),e.all(".fdate_selector").each(function(){t.node=this,new r(t)})},initPanel:function(t){this.panel=new e.Overlay({visible:!1,bodyContent:e.Node.create('<div id="dateselector-calendar-content"></div>'),id:"dateselector-calendar-panel"}),this.panel.render(document.body),e.one("#dateselector-calendar-panel").setStyle("zIndex",null),this.panel.on("heightChange",this.fix_position,this),e.one("#dateselector-calendar-panel").on("click",function(e){e.halt()}),e.one(document.body).on("click",this.document_click,this),this.calendar=new n({contentBox:"#dateselector-calendar-content",width:"300px",showPrevMonth:!0,showNextMonth:!0,firstdayofweek:parseInt(t.firstdayofweek,10),WEEKDAYS_MEDIUM:[t.sun,t.mon,t.tue,t.wed,t.thu,t.fri,t.sat]})},cancel_any_timeout:function(){this.hidetimeout&&(clearTimeout(this.hidetimeout),this.hidetimeout=null),this.repositiontimeout&&(clearTimeout(this.repositiontimeout),this.repositiontimeout=null)},delayed_reposition:function(){this.repositiontimeout&&(clearTimeout(this.repositiontimeout),this.repositiontimeout=null),this.repositiontimeout=setTimeout(this.fix_position,500)},fix_position:function(){if(this.currentowner){var t=[e.WidgetPositionAlign.BL,e.WidgetPositionAlign.TL];window.right_to_left()&&(t=[e.WidgetPositionAlign.BR,e.WidgetPositionAlign.TR]),this.panel.set("align",{node:this.currentowner.get("node").one("select"),points:t})}},document_click:function(e){this.currentowner&&(this.currentowner.get("node").ancestor("div").contains(e.target)?setTimeout(function(){M.form.dateselector.cancel_any_timeout()},100):this.currentowner.release_calendar(e))}};var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Calendar,{initializer:function(e){this.set("strings.very_short_weekdays",e.WEEKDAYS_MEDIUM),this.set("strings.first_weekday",e.firstdayofweek)}},{NAME:"Calendar",ATTRS:{}}),M.form_moodlecalendar=M.form_moodlecalendar||{},M.form_moodlecalendar.initializer=function(e){return new n(e)};var r=function(){r.superclass.constructor.apply(this,arguments)};r.prototype={panel:null,yearselect:null,monthselect:null,dayselect:null,calendarimage:null,enablecheckbox:null,closepopup:!0,initializer:function(){var e=this.get("node").all("select");e.each(function(e){e.get("name").match(/\[year\]/)?this.yearselect=e:e.get("name").match(/\[month\]/)?this.monthselect=e:e.get("name").match(/\[day\]/)&&(this.dayselect=e),e.after("change",this.handle_select_change,this)},this);var t=this.get("node").all("input, a");t.each(function(e){e.get("name").match(/\[calendar\]/)?(e.on("click",this.focus_event,this),this.calendarimage=e):(e.on("click",this.toggle_calendar_image,this),this.enablecheckbox=e),this.calendarimage&&this.enablecheckbox&&this.toggle_calendar_image()},this)},focus_event:function(e){M.form.dateselector.cancel_any_timeout(),M.form.dateselector.currentowner===this?this.release_calendar():(this.enablecheckbox===null||this.enablecheckbox.get("checked"))&&this.claim_calendar(),e.preventDefault()},handle_select_change:function(){this.closepopup=!1,this.set_date_from_selects(),this.closepopup=!0},claim_calendar:function(){M.form.dateselector.cancel_any_timeout();if(M.form.dateselector.currentowner===this)return;M.form.dateselector.currentowner&&M.form.dateselector.currentowner.release_calendar(),M.form.dateselector.currentowner!==this&&(this.connect_handlers(),this.set_date_from_selects()),M.form.dateselector.currentowner=this,M.form.dateselector.calendar.set("mindate",new Date(this.yearselect.firstOptionValue(),0,1)),M.form.dateselector.calendar.set("maxdate",new Date(this.yearselect.lastOptionValue(),11,31)),M.form.dateselector.panel.show(),M.form.dateselector.calendar.show(),M.form.dateselector.fix_position(),setTimeout(function(){M.form.dateselector.cancel_any_timeout()},100),M.form.dateselector.calendar.focus(),e.one(document.body).on("keyup",function(e){if(M.form.dateselector.currentowner===this&&!M.form.dateselector.calendar.get("focused")||e.keyCode===27&&M.form.dateselector.calendar.get("focused"))this.calendarimage.focus(),this.release_calendar()},this)},set_date_from_selects:function(){var e=parseInt(this.yearselect.get("value"),10),t=parseInt(this.monthselect.get("value"),10)-1,n=parseInt(this.dayselect.get("value"),10),r=new Date(e,t,n);M.form.dateselector.calendar.deselectDates(),M.form.dateselector.calendar.selectDates([r]),M.form.dateselector.calendar.set("date",r),M.form.dateselector.calendar.render(),r.getDate()!==n&&(this.dayselect.set("value",r.getDate()),this.monthselect.set("value",r.getMonth()+1))},set_selects_from_date:function(t){var n=t.newSelection[0],r=e.DataType.Date.format(n,{format:"%Y"}),i=r-this.yearselect.firstOptionValue();this.yearselect.set("selectedIndex",i),this.monthselect.set("selectedIndex",e.DataType.Date.format(n,{format:"%m"})-this.monthselect.firstOptionValue()),this.dayselect.set("selectedIndex",e.DataType.Date.format(n,{format:"%d"})-this.dayselect.firstOptionValue()),M.form.dateselector.currentowner&&this.closepopup&&this.release_calendar()},connect_handlers:function(){M.form.dateselector.calendar.on("selectionChange",this.set_selects_from_date,this,!0)},release_calendar
-:function(e){var t=M.form.dateselector.currentowner===this;M.form.dateselector.panel.hide(),M.form.dateselector.calendar.detach("selectionChange",this.set_selects_from_date),M.form.dateselector.calendar.hide(),M.form.dateselector.currentowner=null,t&&(e===null||typeof e=="undefined"||e.type!=="click")&&this.calendarimage.focus()},toggle_calendar_image:function(){this.enablecheckbox.get("checked")?(this.calendarimage.set("disabled",!1),this.calendarimage.setStyle("cursor",null)):(this.calendarimage.set("disabled","disabled"),this.calendarimage.setStyle("cursor","default"),this.release_calendar())}},e.extend(r,e.Base,r.prototype,{NAME:"Date Selector",ATTRS:{firstdayofweek:{validator:e.Lang.isString},node:{setter:function(t){return e.one(t)}}}})},"@VERSION@",{requires:["base","node","overlay","calendar"]});
+YUI.add("moodle-form-dateselector",function(e,t){e.mix(e.Node.prototype,{firstOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.one("option").get("value")},lastOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.all("option").item(this.optionSize()-1).get("value")},optionSize:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:parseInt(this.all("option").size(),10)},selectedOptionValue:function(){return this.get("nodeName").toLowerCase()!=="select"?!1:this.all("option").item(this.get("selectedIndex")).get("value")}}),M.form=M.form||{},M.form.dateselector={panel:null,calendar:null,currentowner:null,hidetimeout:null,repositiontimeout:null,init_date_selectors:function(t){this.panel===null&&this.initPanel(t),e.all(".fdate_time_selector").each(function(){t.node=this,new r(t)}),e.all(".fdate_selector").each(function(){t.node=this,new r(t)})},initPanel:function(t){this.panel=new e.Overlay({visible:!1,bodyContent:e.Node.create('<div id="dateselector-calendar-content"></div>'),id:"dateselector-calendar-panel",constrain:!0}),this.panel.render(document.body),e.one("#dateselector-calendar-panel").setStyle("zIndex",null),this.panel.on("heightChange",this.fix_position,this),e.one("#dateselector-calendar-panel").on("click",function(e){e.halt()}),e.one(document.body).on("click",this.document_click,this),this.calendar=new n({contentBox:"#dateselector-calendar-content",width:"300px",showPrevMonth:!0,showNextMonth:!0,firstdayofweek:parseInt(t.firstdayofweek,10),WEEKDAYS_MEDIUM:[t.sun,t.mon,t.tue,t.wed,t.thu,t.fri,t.sat]})},cancel_any_timeout:function(){this.hidetimeout&&(clearTimeout(this.hidetimeout),this.hidetimeout=null),this.repositiontimeout&&(clearTimeout(this.repositiontimeout),this.repositiontimeout=null)},delayed_reposition:function(){this.repositiontimeout&&(clearTimeout(this.repositiontimeout),this.repositiontimeout=null),this.repositiontimeout=setTimeout(this.fix_position,500)},fix_position:function(){if(this.currentowner){var t=[e.WidgetPositionAlign.BL,e.WidgetPositionAlign.TL];window.right_to_left()&&(t=[e.WidgetPositionAlign.BR,e.WidgetPositionAlign.TR]),this.panel.set("align",{node:this.currentowner.get("node").one("select"),points:t})}},document_click:function(e){this.currentowner&&(this.currentowner.get("node").ancestor("div").contains(e.target)?setTimeout(function(){M.form.dateselector.cancel_any_timeout()},100):this.currentowner.release_calendar(e))}};var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Calendar,{initializer:function(e){this.set("strings.very_short_weekdays",e.WEEKDAYS_MEDIUM),this.set("strings.first_weekday",e.firstdayofweek)}},{NAME:"Calendar",ATTRS:{}}),M.form_moodlecalendar=M.form_moodlecalendar||{},M.form_moodlecalendar.initializer=function(e){return new n(e)};var r=function(){r.superclass.constructor.apply(this,arguments)};r.prototype={panel:null,yearselect:null,monthselect:null,dayselect:null,calendarimage:null,enablecheckbox:null,closepopup:!0,initializer:function(){var e=this.get("node").all("select");e.each(function(e){e.get("name").match(/\[year\]/)?this.yearselect=e:e.get("name").match(/\[month\]/)?this.monthselect=e:e.get("name").match(/\[day\]/)&&(this.dayselect=e),e.after("change",this.handle_select_change,this)},this);var t=this.get("node").all("input, a");t.each(function(e){e.get("name").match(/\[calendar\]/)?(e.on("click",this.focus_event,this),this.calendarimage=e):(e.on("click",this.toggle_calendar_image,this),this.enablecheckbox=e),this.calendarimage&&this.enablecheckbox&&this.toggle_calendar_image()},this)},focus_event:function(e){M.form.dateselector.cancel_any_timeout(),M.form.dateselector.currentowner===this?this.release_calendar():(this.enablecheckbox===null||this.enablecheckbox.get("checked"))&&this.claim_calendar(),e.preventDefault()},handle_select_change:function(){this.closepopup=!1,this.set_date_from_selects(),this.closepopup=!0},claim_calendar:function(){M.form.dateselector.cancel_any_timeout();if(M.form.dateselector.currentowner===this)return;M.form.dateselector.currentowner&&M.form.dateselector.currentowner.release_calendar(),M.form.dateselector.currentowner!==this&&(this.connect_handlers(),this.set_date_from_selects()),M.form.dateselector.currentowner=this,M.form.dateselector.calendar.set("mindate",new Date(this.yearselect.firstOptionValue(),0,1)),M.form.dateselector.calendar.set("maxdate",new Date(this.yearselect.lastOptionValue(),11,31)),M.form.dateselector.panel.show(),M.form.dateselector.calendar.show(),M.form.dateselector.fix_position(),setTimeout(function(){M.form.dateselector.cancel_any_timeout()},100),M.form.dateselector.calendar.focus(),e.one(document.body).on("keyup",function(e){if(M.form.dateselector.currentowner===this&&!M.form.dateselector.calendar.get("focused")||e.keyCode===27&&M.form.dateselector.calendar.get("focused"))this.calendarimage.focus(),this.release_calendar()},this)},set_date_from_selects:function(){var e=parseInt(this.yearselect.get("value"),10),t=parseInt(this.monthselect.get("value"),10)-1,n=parseInt(this.dayselect.get("value"),10),r=new Date(e,t,n);M.form.dateselector.calendar.deselectDates(),M.form.dateselector.calendar.selectDates([r]),M.form.dateselector.calendar.set("date",r),M.form.dateselector.calendar.render(),r.getDate()!==n&&(this.dayselect.set("value",r.getDate()),this.monthselect.set("value",r.getMonth()+1))},set_selects_from_date:function(t){var n=t.newSelection[0],r=e.DataType.Date.format(n,{format:"%Y"}),i=r-this.yearselect.firstOptionValue();this.yearselect.set("selectedIndex",i),this.monthselect.set("selectedIndex",e.DataType.Date.format(n,{format:"%m"})-this.monthselect.firstOptionValue()),this.dayselect.set("selectedIndex",e.DataType.Date.format(n,{format:"%d"})-this.dayselect.firstOptionValue()),M.form.dateselector.currentowner&&this.closepopup&&this.release_calendar()},connect_handlers:function(){M.form.dateselector.calendar.on("selectionChange",this.set_selects_from_date,this,!0)},
+release_calendar:function(e){var t=M.form.dateselector.currentowner===this;M.form.dateselector.panel.hide(),M.form.dateselector.calendar.detach("selectionChange",this.set_selects_from_date),M.form.dateselector.calendar.hide(),M.form.dateselector.currentowner=null,t&&(e===null||typeof e=="undefined"||e.type!=="click")&&this.calendarimage.focus()},toggle_calendar_image:function(){this.enablecheckbox.get("checked")?(this.calendarimage.set("disabled",!1),this.calendarimage.setStyle("cursor",null)):(this.calendarimage.set("disabled","disabled"),this.calendarimage.setStyle("cursor","default"),this.release_calendar())}},e.extend(r,e.Base,r.prototype,{NAME:"Date Selector",ATTRS:{firstdayofweek:{validator:e.Lang.isString},node:{setter:function(t){return e.one(t)}}}})},"@VERSION@",{requires:["base","node","overlay","calendar"]});
diff --git a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector.js b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector.js
index 33b011c7c4b..217fc4a5c7a 100644
--- a/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector.js
+++ b/lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector.js
@@ -69,7 +69,8 @@ M.form.dateselector = {
         this.panel = new Y.Overlay({
             visible: false,
             bodyContent: Y.Node.create('<div id="dateselector-calendar-content"></div>'),
-            id: 'dateselector-calendar-panel'
+            id: 'dateselector-calendar-panel',
+            constrain: true // constrain panel to viewport.
         });
         this.panel.render(document.body);
         // zIndex is added by panel.render() and is set to 0.
@@ -131,7 +132,6 @@ M.form.dateselector = {
                 ];
             }
 
-
             this.panel.set('align', {
                 node: this.currentowner.get('node').one('select'),
                 points: alignpoints
diff --git a/lib/form/yui/src/dateselector/js/dateselector.js b/lib/form/yui/src/dateselector/js/dateselector.js
index 278e3522780..bf845318e79 100644
--- a/lib/form/yui/src/dateselector/js/dateselector.js
+++ b/lib/form/yui/src/dateselector/js/dateselector.js
@@ -67,7 +67,8 @@ M.form.dateselector = {
         this.panel = new Y.Overlay({
             visible: false,
             bodyContent: Y.Node.create('<div id="dateselector-calendar-content"></div>'),
-            id: 'dateselector-calendar-panel'
+            id: 'dateselector-calendar-panel',
+            constrain: true // constrain panel to viewport.
         });
         this.panel.render(document.body);
         // zIndex is added by panel.render() and is set to 0.
@@ -129,7 +130,6 @@ M.form.dateselector = {
                 ];
             }
 
-
             this.panel.set('align', {
                 node: this.currentowner.get('node').one('select'),
                 points: alignpoints