mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-47915 theme: use id='page-content' rather than 'content'.

Browse Source 
Also added JS fallback for themes using copied layouts in scorm
This commit is contained in:
Mary Evans 2014-10-28 18:30:54 +00:00 committed by Dan Poltawski
parent af14ef657a
commit a263396486
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/scorm/module.js
View File

@ -802,6 +802,9 @@ M.mod_scorm.connectPrereqCallback = {
}
var el_new_tree = document.createElement('div');
var pagecontent = document.getElementById("page-content");
if (!pagecontent) {
pagecontent = document.getElementById("content");
}
el_new_tree.setAttribute('id','scormtree123');
el_new_tree.innerHTML = o.responseText;
// Make sure it does not show.

2
theme/base/layout/embedded.php
View File

@ -36,7 +36,7 @@ echo $OUTPUT->doctype(); ?>
<!-- END OF HEADER -->
<div id="content" class="clearfix">
<div id="page-content" class="clearfix">
<?php echo $OUTPUT->main_content() ?>
</div>

2
theme/base/style/core.css
View File

@ -1211,7 +1211,7 @@ x#fitem_id_availabilityconditionsjson input[type=text] {
audio.mediaplugin_html5audio {width: 300px}
/* TinyMCE moodle media preview frame should not have padding */
.core_media_preview.pagelayout-embedded #content {padding:0;}
.core_media_preview.pagelayout-embedded #page-content {padding:0;}
.core_media_preview.pagelayout-embedded #maincontent {height:0;}
.core_media_preview.pagelayout-embedded .mediaplugin {margin:0;}

2
theme/canvas/layout/embedded.php
View File

@ -36,7 +36,7 @@ echo $OUTPUT->doctype() ?>
<!-- END OF HEADER -->
<div id="content" class="clearfix">
<div id="page-content" class="clearfix">
<?php echo $OUTPUT->main_content() ?>
</div>

2
theme/canvas/style/core.css
View File

@ -473,7 +473,7 @@ body {
background-image: none;
}
.pagelayout-embedded #content {
.pagelayout-embedded #page-content {
padding-top: 30px;
}

3
theme/upgrade.txt
View File

@ -2,7 +2,8 @@ This files describes API changes in /theme/* themes,
information provided here is intended especially for theme designer.
=== 2.8 ===
* Themes Base and Canvas layout/embedded.php has changed.
The div id="content" has been changed to id="page-content" - see MDL-47915.
* All mod_assign CSS selectors have been qualified with ".path-mod-assign". This means any custom CSS
rules for mod_assign in a theme may need to be updated.
* The following render methods were renamed, if you have overridden any of these you will need to update your renderer: