Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski
2012-11-06 16:03:40 +08:00
+5 -2
View File
@@ -948,13 +948,16 @@ class page_requirements_manager {
.$CFG->yui3version.'/build/cssfonts/fonts-min.css&'
.$CFG->yui3version.'/build/cssgrids/grids-min.css&'
.$CFG->yui3version.'/build/cssbase/base-min.css" />';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->comboBase.$CFG->yui3version.'/build/yui/yui-min.js"></script>';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->comboBase
.$CFG->yui3version.'/build/simpleyui/simpleyui-min.js&amp;'
.$CFG->yui3version.'/build/loader/loader-min.js"></script>';
} else {
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssreset/reset-min.css" />';
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssfonts/fonts-min.css" />';
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssgrids/grids-min.css" />';
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssbase/base-min.css" />';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'yui/yui-min.js"></script>';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'simpleyui/simpleyui-min.js"></script>';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'loader/loader-min.js"></script>';
}