Commit af3e9583 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

BUG: fix regression

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I276d7960423cf49c6d8edc4a05fb790d6f853299
parent 4739efeb
......@@ -118,7 +118,7 @@ $searchform = pieform(array(
),
'sortoption' => array(
'type' => 'select',
'class' => 'sortoption input-small',
'class' => 'sortoption input-small mrl',
'title' => get_string('sortedby'),
'multiple' => false,
'size' => 1,
......
......@@ -111,80 +111,6 @@ function getstylesheets($stylesheets){
/**
* Helper function to determine what css to include
* podclass app, setting up some variables.
*
* @param $strings A list of language strings required by the javascript code.
* @return array
*/
function getStyleSheets($stylesheets){
global $USER, $SESSION, $THEME, $HEADDATA, $langselectform;
// stylesheet set up - if we're in a plugin also get its stylesheet
$allstylesheets = $THEME->get_url('style/style.css', true);
// determine if we want to include the parent css
if(isset($THEME->overrideparentcss) && $THEME->overrideparentcss && $THEME->parent){
unset($allstylesheets[$THEME->parent]);
}
$stylesheets = array_merge($stylesheets, array_reverse(array_values($allstylesheets)));
if (defined('SECTION_PLUGINTYPE') && defined('SECTION_PLUGINNAME') && SECTION_PLUGINTYPE != 'core') {
if ($pluginsheets = $THEME->get_url('style/style.css', true, SECTION_PLUGINTYPE . '/' . SECTION_PLUGINNAME)) {
$stylesheets = array_merge($stylesheets, array_reverse($pluginsheets));
}
}
if ($adminsection = in_admin_section()) {
if ($adminsheets = $THEME->get_url('style/admin.css', true)) {
$stylesheets = array_merge($stylesheets, array_reverse($adminsheets));
}
}
if (get_config('developermode') & DEVMODE_DEBUGCSS) {
$stylesheets[] = get_config('wwwroot') . 'theme/debug.css';
}
// look for extra stylesheets
if (isset($extraconfig['stylesheets']) && is_array($extraconfig['stylesheets'])) {
foreach ($extraconfig['stylesheets'] as $extrasheet) {
if ($sheets = $THEME->get_url($extrasheet, true)) {
$stylesheets = array_merge($stylesheets, array_reverse(array_values($sheets)));
}
}
}
if ($sheets = $THEME->additional_stylesheets()) {
$stylesheets = array_merge($stylesheets, $sheets);
}
// Give the skin a chance to affect the page
if (!empty($extraconfig['skin'])) {
require_once(get_config('docroot').'/lib/skin.php');
$skinobj = new Skin($extraconfig['skin']['skinid']);
$viewid = isset($extraconfig['skin']['viewid']) ? $extraconfig['skin']['viewid'] : null;
$stylesheets = array_merge($stylesheets, $skinobj->get_stylesheets($viewid));
}
$langdirection = get_string('thisdirection', 'langconfig');
// Include rtl.css for right-to-left langs
if ($langdirection == 'rtl') {
$smarty->assign('LANGDIRECTION', 'rtl');
if ($rtlsheets = $THEME->get_url('style/rtl.css', true)) {
$stylesheets = array_merge($stylesheets, array_reverse($rtlsheets));
}
}
$stylesheets = append_version_number($stylesheets);
return $stylesheets;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment