mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 01:44:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Aparup Banerjee 2012-06-15 14:54:10 +08:00
commit a6c3aed35d
3 changed files with 4 additions and 1 deletions
theme/mymobile
config.php
javascript
jquery-noconflict.js
layout
embedded.php

3
theme/mymobile/config.php

@ -156,6 +156,7 @@ if ($thisdevice == "default" || $thisdevice == "tablet" || optional_param('mymob
// Add the required JavaScript to the page
$THEME->javascripts = array(
'jquery-1.6.4.min',
'jquery-noconflict',
'custom',
'jquery.mobile-1.0',
'scrollview',
@ -167,4 +168,4 @@ $THEME->rendererfactory = 'theme_overridden_renderer_factory';
// This theme doesn't support CSS optimisation. The JQuery CSS has already been optimised in a way that
// is not compatible with the CSS optimiser in Moodle.
$THEME->supportscssoptimisation = false;
$THEME->supportscssoptimisation = false;

1
theme/mymobile/javascript/jquery-noconflict.js vendored Normal file

@ -0,0 +1 @@
jQuery.noConflict();

1
theme/mymobile/layout/embedded.php

@ -36,6 +36,7 @@ if ($showswatch == "light") {
$databodytheme = 'c';
}
$mypagetype = $PAGE->pagetype;
$bodyclasses = array();
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes() ?>>