MDL-39047 forms: set the z-index of the calendar pop-up so that it re…

…nders above the filemanager
moodle · Apr 15, 2013 · 12cb45f · 12cb45f
1 parent b3661ab
commit 12cb45f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/lib/form/yui/dateselector/dateselector.js b/lib/form/yui/dateselector/dateselector.js
@@ -204,6 +204,7 @@ YUI.add('moodle-form-dateselector', function(Y) {
                 bodyContent : Y.Node.create('<div id="dateselector-calendar-content"></div>'),
                 id : 'dateselector-calendar-panel'
             });
+            this.panel.removeAttr('zIndex'); // z-index is set by the theme.
             this.panel.render(document.body);
             this.panel.on('heightChange', this.fix_position, this);
 

diff --git a/theme/base/style/core.css b/theme/base/style/core.css
@@ -1369,3 +1369,10 @@ div.badge .expireimage { width: 100px; height: 100px; left: 20px; top: 0px; }
 .statusbox.inactive { background-color: #FFEBA8; }
 .activatebadge { margin: 0px; text-align: left; vertical-align: middle; }
 .addcourse { float: right; }
+
+/**
+ * The date selector popup.
+ */
+ div#dateselector-calendar-panel {
+ 	z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
+ }
diff --git a/theme/bootstrap/less/moodle/forms.less b/theme/bootstrap/less/moodle/forms.less
@@ -316,3 +316,6 @@ input[type="checkbox"] {
 .felement.ffilepicker {
     margin-top: 5px;
 }
+div#dateselector-calendar-panel {
+    z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
+}
diff --git a/theme/bootstrap/style/generated.css b/theme/bootstrap/style/generated.css
diff --git a/theme/upgrade.txt b/theme/upgrade.txt
@@ -1,11 +1,6 @@
 This files describes API changes in /theme/* themes,
 information provided here is intended especially for theme designer.
 
-=== 2.6 ===
-* re-wrote the table for the course completion status block to use html_table - added some CSS classes to the table in the process.
-  MDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer
-
-
 === 2.5 ===
 
 required changes:
@@ -19,9 +14,13 @@ required changes:
 DOM changes:
 * changed the h1 title in the help popup to a h2.
 * new setting $THEME->yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase'); which
-  allows themes to use different CSS reset normalisers such as cssnormalize YUI module
+  allows themes to use different CSS reset normalisers such as cssnormalize YUI module.
 * Re-wrote the user profile views to definition lists.
+* Re-wrote the table for the course completion status block to use html_table - added some CSS classes to
+  the table in the process (see MDL-35608).
 * Cancel buttons have the class btn-cancel.
+* Added a z-index for the div#dateselector-calendar-panel so that the calendar pop-up renders above
+  the filemanager when they overlap, ie. the course settings page (see MDL-39047).
 
 Renderer changes:
 * Mymobile theme changed to support more verbose move-block-here descriptions.